1
0
mirror of https://git.code.sf.net/p/zint/code synced 2025-12-18 10:27:09 +00:00

EAN/UPC: add quiet zone indicators option (API output_options

`EANUPC_GUARD_WHITESPACE`, CLI `--guardwhitespace`) (ticket #287)
EAN-2/EAN-5: HRT now at top instead of at bottom for standalones,
  following BWIPP
CLI: batch mode: don't close input if stdin
EAN/UPC: fix excess 1X to right of add-ons
Composites: fix excess whitespace; fix quiet zone calcs to allow
  for linear shifting
CLI: use own (Wine) version of `CommandLineToArgvW()` to avoid
  loading "shell32.dll"
Move "font.h" -> "raster_font.h"
EPS/SVG: use new `out_putsf()` func to output floats, avoiding
  trailing zeroes & locale dependency
EPS: simplify "TR" formula
SVG: change font from "Helvetica, sans serif" to "OCR-B, monospace";
  use single "<path>" instead of multiple "<rect>"s to draw boxes
  (reduces file size)
Add `EMBED_VECTOR_FONT` to `output_options` (CLI `--embedfont`) to
  enable embedding of font in vector output - currently only for
  SVG output of EAN/UPC
GUI: use "OCR-B" font for EAN/UPC and "Arimo" for all others (was
  "Helvetica" for both); paint background of screen preview light
  grey so as contrasts with whitespace and quiet zones
EMF: prefix funcs with `emf_`; simplify string `halign` handling
large: rename `large_int` -> `large_uint`
CODE128/common: move `c128_hrt_cpy_iso8859_1()` to
  `hrt_cpy_iso8859_1()` and add `ZINT_WARN_HRT_TRUNCATED` warning
  (for future use)
Various symbologies: replace `printf()` with `fputs()`
  (symbol->debug)
QRCODE: better assert(), removing a NOLINT (2 left)
CLI: add some more barcode synonyms for DBAR
common: various fiddlings
CMake: don't include png.c unless ZINT_USE_PNG (avoids clang
  warning)
This commit is contained in:
gitlost
2023-06-12 01:25:55 +01:00
parent 6d015d6a8f
commit 607e4ed33a
395 changed files with 11528 additions and 23016 deletions

View File

@@ -1,7 +1,7 @@
/* codablock.c - Handles Codablock-F */
/*
libzint - the open source barcode library
Copyright (C) 2016-2022 Harald Oehlmann
Copyright (C) 2016-2023 Harald Oehlmann
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -645,10 +645,10 @@ INTERNAL int codablockf(struct zint_symbol *symbol, unsigned char source[], int
if (symbol->debug & ZINT_DEBUG_PRINT) { /* start a new level of local variables */
int DPos;
printf("\nData:");
fputs("\nData:", stdout);
for (DPos = 0; DPos < dataLength; DPos++)
fputc(data[DPos], stdout);
printf("\n Set:");
fputs("\n Set:", stdout);
for (DPos = 0; DPos < dataLength; DPos++) {
switch (pSet[DPos] & (CodeA + CodeB + CodeC)) {
case CodeA: fputc('A', stdout); break;
@@ -657,16 +657,16 @@ INTERNAL int codablockf(struct zint_symbol *symbol, unsigned char source[], int
default: fputc('.', stdout); break;
}
}
printf("\nFNC1:");
fputs("\nFNC1:", stdout);
for (DPos = 0; DPos < dataLength; DPos++)
fputc((pSet[DPos] & CodeFNC1) == 0 ? '.' : 'X', stdout);
printf("\n END:");
fputs("\n END:", stdout);
for (DPos = 0; DPos < dataLength; DPos++)
fputc((pSet[DPos] & CEnd) == 0 ? '.' : 'X', stdout);
printf("\nShif:");
fputs("\nShif:", stdout);
for (DPos = 0; DPos < dataLength; DPos++)
fputc((pSet[DPos] & CShift) == 0 ? '.' : 'X', stdout);
printf("\nFILL:");
fputs("\nFILL:", stdout);
for (DPos = 0; DPos < dataLength; DPos++)
fputc((pSet[DPos] & CFill) == 0 ? '.' : 'X', stdout);
fputc('\n', stdout);
@@ -831,14 +831,14 @@ INTERNAL int codablockf(struct zint_symbol *symbol, unsigned char source[], int
if (symbol->debug & ZINT_DEBUG_PRINT) {
/* Dump the output to the screen
*/
printf("\nCode 128 Code Numbers:\n");
fputs("\nCode 128 Code Numbers:\n", stdout);
{ /* start a new level of local variables */
int DPos, DPos2;
for (DPos = 0; DPos < rows; DPos++) {
for (DPos2 = 0; DPos2 < columns; DPos2++) {
printf("%3d ", (int) (pOutput[DPos * columns + DPos2]));
}
printf("\n");
fputc('\n', stdout);
}
}
printf("rows=%d columns=%d (%d data) fillings=%d\n", rows, columns, columns - 5, fillings);