DBAR_STK/DBAR_OMNSTK/DBAR_EXPSTK (including composites): output HRT

if `BARCODE_RAW_TEXT`
manual: default to always making html
This commit is contained in:
gitlost 2025-03-10 01:22:52 +00:00
parent 64fd01c73f
commit e12c5ed3ba
11 changed files with 56 additions and 38 deletions

View file

@ -291,6 +291,7 @@ INTERNAL int dbar_omn_cc(struct zint_symbol *symbol, unsigned char source[], int
int latch;
int separator_row;
int widths[4];
const int raw_text = symbol->output_options & BARCODE_RAW_TEXT;
separator_row = 0;
@ -547,6 +548,10 @@ INTERNAL int dbar_omn_cc(struct zint_symbol *symbol, unsigned char source[], int
symbol->width = 50;
}
if (raw_text) {
dbar_set_gtin14_hrt(symbol, source, length);
}
if (symbol->symbology != BARCODE_DBAR_STK_CC) { /* Composite calls dbar_omnstk_set_height() itself */
error_number = dbar_omnstk_set_height(symbol, 0 /*first_row*/);
}
@ -595,6 +600,10 @@ INTERNAL int dbar_omn_cc(struct zint_symbol *symbol, unsigned char source[], int
}
symbol->rows = symbol->rows + 1;
if (raw_text) {
dbar_set_gtin14_hrt(symbol, source, length);
}
/* ISO/IEC 24724:2011 5.3.2.2 minimum 33X height per row */
if (symbol->symbology == BARCODE_DBAR_OMNSTK_CC) {
symbol->height = symbol->height ? 33.0f : 66.0f; /* Pass back min row or default height */
@ -1583,6 +1592,10 @@ INTERNAL int dbar_exp_cc(struct zint_symbol *symbol, unsigned char source[], int
symbol->rows = symbol->rows + 4;
}
symbol->rows = symbol->rows - 3;
if (raw_text) {
hrt_cpy_nochk(symbol, reduced, reduced_length);
}
}
if (symbol->symbology == BARCODE_DBAR_EXP_CC || symbol->symbology == BARCODE_DBAR_EXPSTK_CC) {