mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-05-27 21:44:13 -04:00
Code Issues Projects Releases Packages Wiki Activity

Actually change SVG font to "Arimo, Arial, sans-serif" ([607e4ed])

Browse source 
Allow `--embedfont` for non-EAN/UPC SVG also (& update GUI)
SVG: add "fonts/normal_woff2.h"; use array syntax for it &
  "fonts/upcean_woff2.h" to avoid large strings
GUI: embed Arimo (via "fonts/normal_ttf.h"), same as OCRB
Change textgap max 5X -> 10X
README: make list of barcodes 2-col table for readability
win32/README: note Visual Studio 2022 re CMake
This commit is contained in:
gitlost 2023-06-13 18:12:20 +01:00
parent 55458cf659
commit acd52ac489
84 changed files with 2951 additions and 308 deletions
Download patch file Download diff file Expand all files Collapse all files

11
backend/svg.c
View file

@ -36,6 +36,7 @@
#include "common.h"
#include "output.h"
#include "fonts/normal_woff2.h"
#include "fonts/upcean_woff2.h"
/* Convert Ultracode rectangle colour to RGB */
@ -111,7 +112,7 @@ static void svg_put_opacity_close(const unsigned char alpha, const float val, co
}
INTERNAL int svg_plot(struct zint_symbol *symbol) {
static const char font_family[] = "Helvetica, sans-serif";
static const char normal_font_family[] = "Arimo, Arial, sans-serif";
static const char upcean_font_family[] = "OCRB, monospace";
FILE *fsvg;
int error_number = 0;
@ -190,9 +191,9 @@ INTERNAL int svg_plot(struct zint_symbol *symbol) {
fprintf(fsvg, "<svg width=\"%d\" height=\"%d\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\">\n",
(int) ceilf(symbol->vector->width), (int) ceilf(symbol->vector->height));
fputs(" <desc>Zint Generated Symbol</desc>\n", fsvg);
if ((symbol->output_options & EMBED_VECTOR_FONT) && extendable && symbol->vector->strings) {
fprintf(fsvg, " <style>@font-face {font-family:\"OCRB\"; src:url(data:font/woff2;base64,%s);}</style>\n",
upcean_woff2);
if ((symbol->output_options & EMBED_VECTOR_FONT) && symbol->vector->strings) {
fprintf(fsvg, " <style>@font-face {font-family:\"%s\"; src:url(data:font/woff2;base64,%s);}</style>\n",
extendable ? "OCRB" : "Arimo", extendable ? upcean_woff2 : normal_woff2);
}
fprintf(fsvg, " <g id=\"barcode\" fill=\"#%s\">\n", fgcolour_string);
@ -319,7 +320,7 @@ INTERNAL int svg_plot(struct zint_symbol *symbol) {
svg_put_fattrib(" x=\"", 2, string->x, fsvg);
svg_put_fattrib(" y=\"", 2, string->y, fsvg);
fprintf(fsvg, " text-anchor=\"%s\"", halign);
fprintf(fsvg, " font-family=\"%s\"", extendable ? upcean_font_family : font_family);
fprintf(fsvg, " font-family=\"%s\"", extendable ? upcean_font_family : normal_font_family);
svg_put_fattrib(" font-size=\"", 1, string->fsize, fsvg);
if (bold) {
fputs(" font-weight=\"bold\"", fsvg);