Remove bitmap_byte_length member from zint_symbol

(was only set on BMP output to length of BMP pixel array)
EXCODE39: change to display check digit in HRT by default
CODE39/EXCODE39/LOGMARS: new hidden check digit option
  (`option_2 = 2`)
qr.c: suppress bogus gcc-13 warning (only appears on optimize)
GUI: move some symbology-specific options into Data Tab so
  separate tab unnecessary (those with few options and no
  Composite/ECI), namely: all C25XXX, CODE39/EXCODE39/LOGMARS,
  MSI_PLESSEY, CODABAR, DAFT, DPD, MAILMARK_2D, ITF-14, PZN,
  UPNQR, CHANNEL, CODE93 and VIN, adjusting grp uis.
  change Data dialog button (ellipsis) QToolButton -> QPushButton
  & vice versa zap/clear/eye/swap/scale buttons QPushButton ->
  QToolButton for better mac compat (also makes sense);
  remove some mac hacks that no longer seem necessary;
  use folder icon for Export dialog directory button
manual: document new Symbology-specific groupbox & CODE39/etc
  hidden check digit option; add annexes on Qt and Tcl backends;
  narrow some tables for better txt output;
  remove echoed image tags in txt (pandoc 3.1.5 regression?);
  add one-page HTML output to Makefile; also tex output (debug);
  add class attributes to images to aid HTML styling;
  various other fiddlings

docs/Makefile

@@ -1,5 +1,5 @@
-# Makefile for generating "manual.txt" and "manual.pdf" from "manual.pmd" using pandoc
-# Copyright (C) 2022 <rstuart114@gmail.com>
+# Makefile for generating "manual.txt" and "manual.pdf" from "manual.pmd" and "zint.1" from "zint.1.pmd" using pandoc
+# Copyright (C) 2022-2023 <rstuart114@gmail.com>
 #
 # Requires a recent version of pandoc, plus pandoc-tablenos, xelatex and various other packages - see "README"
 # .svg images generated by "zint_images.sh"
@@ -9,7 +9,6 @@ OUT_PDF = manual.pdf
 OUT_TXT = manual.txt
 INC_HEADER_PDF = inc_header_pdf.tex
 INC_BEFORE_BODY_PDF = inc_before_body_pdf.tex
-INCLUDES_PDF = $(INC_HEADER_PDF) $(INC_BEFORE_BODY_PDF)
 INC_PDF = --include-in-header $(INC_HEADER_PDF) --include-before-body $(INC_BEFORE_BODY_PDF)
 INCLUDES_TXT = inc_header_txt.tex
 INC_TXT = --include-in-header $(INCLUDES_TXT)
@@ -24,6 +23,7 @@ IMAGES = \
 	images/gui_menus.png \
 	images/gui_composite.png \
 	images/gui_segs.png \
+	images/gui_c25inter.png \
 	images/gui_aztec.png \
 	images/gui_appearance.png \
 	images/gui_scaling.png \
@@ -36,6 +36,7 @@ IMAGES = \
 	images/gui_sequence.png \
 	images/gui_export.png \
 	images/gui_cli_equivalent.png \
+	images/tcl_demo.png \
 	images/pdf417_heightperrow.svg \
 	images/code128_box.svg \
 	images/qrcode_box.svg \
@@ -149,7 +150,7 @@ MAN_PAGE_OPTS = -s -t man
 
 all : $(OUT_PDF) $(OUT_TXT) $(OUT_MAN_PAGE)
 
-$(OUT_PDF) : $(SOURCE) $(SOURCE_MAN_PAGE) $(HIGHLIGHT_THEME) $(INC_HEADER_PDF) $(INC_BEFORE_BODY_PDF) $(IMAGES) Makefile
+$(OUT_PDF) : $(SOURCE) $(SOURCE_MAN_PAGE) $(INC_HEADER_PDF) $(INC_BEFORE_BODY_PDF) $(IMAGES) Makefile
 	pandoc $(SOURCE_MAN_PAGE) -f markdown \
 			$(PDF_OPTS) \
 			-o $(TEX_MAN_PAGE)
@@ -165,13 +166,52 @@ $(OUT_TXT) : $(SOURCE) $(SOURCE_MAN_PAGE) $(INCLUDES_TXT) Makefile
 			-V $(MAIN_FONT) -V $(MONO_FONT) -V $(CJK_FONT) \
 			$(TXT_OPTS) \
 			-o $(OUT_TXT)
-	# Indent Man Page sections in TOC and remove trailing spaces
+	# Indent Man Page sections in TOC, remove trailing spaces and echoed image tags
 	sed -i \
 		-e 's/^\(-   [A-Z][A-Z ]*\)$$/    \1/' \
 		-e 's/  *$$//' \
+		-e '/^\[.*\]$$/{N;N;s/\[\(.*\)\]\n\n\1/[\1]/;p;d}' \
 		$(OUT_TXT)
+	# Wrap
+	sed -i '/.\{81\}/{s/.\{80\}/&\n/}' $(OUT_TXT)
 
 $(OUT_MAN_PAGE) : $(SOURCE_MAN_PAGE) Makefile
 	pandoc $(SOURCE_MAN_PAGE) -f markdown \
 			$(MAN_PAGE_OPTS) \
 			-o $(OUT_MAN_PAGE)
+
+# For debugging
+
+manual.tex : $(SOURCE) $(SOURCE_MAN_PAGE) $(INC_HEADER_PDF) $(INC_BEFORE_BODY_PDF) $(IMAGES) Makefile
+	pandoc $(SOURCE_MAN_PAGE) -f markdown \
+			$(PDF_OPTS) \
+			-o $(TEX_MAN_PAGE)
+	sed -i -e 's/section{/subsection{/' $(TEX_MAN_PAGE) # Convert man page sections to subsections
+	pandoc $(SOURCE) -f markdown $(INC_PDF) --toc --toc-depth=4 \
+			-V $(MAIN_FONT) -V $(MONO_FONT) -V $(CJK_FONT) -V block-headings \
+			$(PDF_OPTS) \
+			--include-after-body $(TEX_MAN_PAGE) \
+			-s -o manual.tex
+
+# HTML one-page (uses modified "templates/styles.html", unchanged "templates/default.html")
+
+OUT_HTML = manual.html
+HTML_OPTS = --filter pandoc-tablenos -M tablenos-warning-level=0 --highlight-style=haddock \
+			--template=templates/default.html --eol=lf -s -t html
+INC_BEFORE_BODY_HTML = inc_before_body_html.html
+INC_HTML = --include-before-body $(INC_BEFORE_BODY_HTML)
+TEMPLATES_HTML = templates/default.html templates/styles.html
+
+$(OUT_HTML) : $(SOURCE) $(SOURCE_MAN_PAGE) $(INC_BEFORE_BODY_HTML) $(TEMPLATES_HTML) Makefile
+	pandoc $(SOURCE) $(SOURCE_MAN_PAGE) -f markdown+link_attributes $(INC_HTML) --toc --toc-depth=4 \
+			-V $(MAIN_FONT) -V $(MONO_FONT) -V $(CJK_FONT) \
+			$(HTML_OPTS) \
+			-o $(OUT_HTML)
+	# Indent Man Page sections in TOC, change Man Page sections h1 -> h2, remove Man Page meta, fix Table captions
+	sed -i \
+		-e 's/\(Man Page ZINT(1)<\/a>\)<\/li>/\1<ul>/' \
+		-e 's/\(AUTHORS<\/a><\/li>\)/\1<\/ul><\/li>/' \
+		-e 's/^<h1\([^>]*>[A-Z][A-Z ]*<\/\)h1>$$/<h2\1h2>/' \
+		-e 's/^<p>% ZINT(1)[^<]*<\/p>//' \
+		-e 's/<caption><span>Table\(.:[^:]*\):/<caption><span>Table\1/' \
+		$(OUT_HTML)

docs/README

@@ -2,8 +2,8 @@ For generation of "docs/manual.pdf" and "docs/manual.txt" from "manual.pmd" usin
 
 On Ubuntu/Debian (tested on Ubuntu 22.04)
 
-    wget https://github.com/jgm/pandoc/releases/download/3.1.4/pandoc-3.1.4-1-amd64.deb
-    sudo dpkg -i pandoc-3.1.4-1-amd64.deb
+    wget https://github.com/jgm/pandoc/releases/download/3.1.5/pandoc-3.1.5-1-amd64.deb
+    sudo dpkg -i pandoc-3.1.5-1-amd64.deb
     sudo apt install python3-pip
     pip install pandoc-tablenos --user
     export PATH=~/.local/bin:"$PATH"
@@ -18,9 +18,9 @@ On Ubuntu/Debian (tested on Ubuntu 22.04)
 
 On Fedora (tested on Fedora Linux 38 (Workstation Edition))
 
-    wget https://github.com/jgm/pandoc/releases/download/3.1.4/pandoc-3.1.4-linux-amd64.tar.gz
-    tar xf pandoc-3.1.4-linux-amd64.tar.gz
-    sudo mv -i pandoc-3.1.4/bin/pandoc /usr/local/bin
+    wget https://github.com/jgm/pandoc/releases/download/3.1.5/pandoc-3.1.5-linux-amd64.tar.gz
+    tar xf pandoc-3.1.5-linux-amd64.tar.gz
+    sudo mv -i pandoc-3.1.5/bin/pandoc /usr/local/bin
     sudo dnf install python3-pip
     pip install pandoc-tablenos --user
     export PATH=~/.local/bin:"$PATH"

docs/inc_before_body_html.html

@@ -0,0 +1,4 @@
+<div id="banner">
+<img src="images/zint.png" class="img_hdr">
+<img src="images/zint-qt.png" class="img_hdr">
+</div>

docs/inc_header_pdf.tex

@@ -20,7 +20,6 @@
 
 %% Text and background color for inline code
 \usepackage{xcolor}
-\usepackage{fvextra}
 \definecolor{icfg}{HTML}{331a33}
 \let\oldtexttt\texttt
 \renewcommand{\texttt}[1]{\textcolor{icfg}{\oldtexttt{#1}}}

docs/templates/default.html

@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="$lang$" xml:lang="$lang$"$if(dir)$ dir="$dir$"$endif$>
+<head>
+  <meta charset="utf-8" />
+  <meta name="generator" content="pandoc" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
+$for(author-meta)$
+  <meta name="author" content="$author-meta$" />
+$endfor$
+$if(date-meta)$
+  <meta name="dcterms.date" content="$date-meta$" />
+$endif$
+$if(keywords)$
+  <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
+$endif$
+$if(description-meta)$
+  <meta name="description" content="$description-meta$" />
+$endif$
+  <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
+  <style>
+    $styles.html()$
+  </style>
+$for(css)$
+  <link rel="stylesheet" href="$css$" />
+$endfor$
+$for(header-includes)$
+  $header-includes$
+$endfor$
+$if(math)$
+$if(mathjax)$
+  <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
+$endif$
+  $math$
+$endif$
+  <!--[if lt IE 9]>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
+  <![endif]-->
+</head>
+<body>
+$for(include-before)$
+$include-before$
+$endfor$
+$if(title)$
+<header id="title-block-header">
+<h1 class="title">$title$</h1>
+$if(subtitle)$
+<p class="subtitle">$subtitle$</p>
+$endif$
+$for(author)$
+<p class="author">$author$</p>
+$endfor$
+$if(date)$
+<p class="date">$date$</p>
+$endif$
+$if(abstract)$
+<div class="abstract">
+<div class="abstract-title">$abstract-title$</div>
+$abstract$
+</div>
+$endif$
+</header>
+$endif$
+$if(toc)$
+<nav id="$idprefix$TOC" role="doc-toc">
+$if(toc-title)$
+<h2 id="$idprefix$toc-title">$toc-title$</h2>
+$endif$
+$table-of-contents$
+</nav>
+$endif$
+$body$
+$for(include-after)$
+$include-after$
+$endfor$
+</body>
+</html>

docs/templates/styles.html

@@ -0,0 +1,291 @@
+$if(document-css)$
+html {
+$if(mainfont)$
+  font-family: $mainfont$;
+$endif$
+$if(fontsize)$
+  font-size: $fontsize$;
+$endif$
+$if(linestretch)$
+  line-height: $linestretch$;
+$endif$
+  color: $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
+  background-color: $if(backgroundcolor)$$backgroundcolor$$else$#fdfdfd$endif$;
+}
+body {
+  margin: 0 auto;
+  max-width: $if(maxwidth)$$maxwidth$$else$50em$endif$;
+  padding-left: $if(margin-left)$$margin-left$$else$50px$endif$;
+  padding-right: $if(margin-right)$$margin-right$$else$50px$endif$;
+  padding-top: $if(margin-top)$$margin-top$$else$50px$endif$;
+  padding-bottom: $if(margin-bottom)$$margin-bottom$$else$50px$endif$;
+  hyphens: auto;
+  overflow-wrap: break-word;
+  text-rendering: optimizeLegibility;
+  font-kerning: normal;
+}
+@media (max-width: 600px) {
+  body {
+    font-size: 0.9em;
+    padding: 12px;
+  }
+  h1 {
+    font-size: 1.8em;
+  }
+}
+@media print {
+  html {
+    background-color: $if(backgroundcolor)$$backgroundcolor$$else$white$endif$;
+  }
+  body {
+    background-color: transparent;
+    color: black;
+    font-size: 12pt;
+  }
+  p, h2, h3 {
+    orphans: 3;
+    widows: 3;
+  }
+  h2, h3, h4 {
+    page-break-after: avoid;
+  }
+}
+p {
+  margin: 1em 0;
+}
+a {
+  color: $if(linkcolor)$$linkcolor$$else$#800000$endif$;
+}
+a:visited {
+  color: $if(linkcolor)$$linkcolor$$else$#800000$endif$;
+}
+a:not(:hover) {
+  text-decoration: none;
+}
+figure {
+  margin-left: 0;
+  margin-right: 0;
+  text-align: center;
+}
+img {
+  max-width: 100%;
+}
+img.btn {
+  height: 0.9em;
+}
+img.win {
+  max-width: 80%;
+}
+img.pop {
+  max-width: 60%;
+}
+img[src*="gui_set_printing_scale.png"] {
+  max-width: 50%;
+}
+img.lin {
+  max-height: 10em;
+}
+img[src*="code128_rotate90.svg"] {
+  max-height: 20em;
+}
+img.i2d {
+  max-height: 10em;
+}
+img[src*="upnqr.svg"] {
+  max-height: 20em;
+}
+img.i2dbig {
+}
+img.trk {
+  max-height: 3em;
+}
+img[src*="fim.svg"] {
+  max-height: 10em;
+}
+img.dotty {
+  max-height: 7em;
+}
+img.ultra {
+  max-height: 12em;
+}
+img.upcean {
+  max-height: 12em;
+}
+h1, h2, h3, h4, h5, h6 {
+  margin-top: 1.4em;
+}
+h5, h6 {
+  font-size: 1em;
+  font-style: italic;
+}
+h6 {
+  font-weight: normal;
+}
+ol, ul {
+  padding-left: 1.7em;
+  margin-top: 1em;
+}
+li > ol, li > ul {
+  margin-top: 0;
+}
+dt {
+  font-weight:bold;
+}
+blockquote {
+  margin: 1em 0 1em 1.7em;
+  padding-left: 1em;
+  border-left: 2px solid #e6e6e6;
+  color: #606060;
+}
+$if(abstract)$
+div.abstract {
+  margin: 2em 2em 2em 2em;
+  text-align: left;
+  font-size: 85%;
+}
+div.abstract-title {
+  font-weight: bold;
+  text-align: center;
+  padding: 0;
+  margin-bottom: 0.5em;
+}
+$endif$
+code {
+  font-family: $if(monofont)$$monofont$$else$Menlo, Monaco, Consolas, 'Lucida Console', monospace$endif$;
+$if(monobackgroundcolor)$
+  background-color: $monobackgroundcolor$;
+  padding: .2em .4em;
+$endif$
+  font-size: 90%;
+  margin: 0;
+  hyphens: manual;
+  color: #000000;
+}
+pre {
+  margin: 1em 0;
+$if(monobackgroundcolor)$
+  background-color: $monobackgroundcolor$;
+  padding: 1em;
+$endif$
+  overflow: auto;
+}
+pre code {
+  padding: 0;
+  overflow: visible;
+  overflow-wrap: normal;
+}
+.sourceCode {
+ background-color: transparent;
+ overflow: visible;
+}
+div.sourceCode {
+  background-color: #f5f5f5;
+  padding: 0.3em 0;
+}
+aside.footnotes {
+  font-size:90%;
+}
+hr {
+  background-color: #1a1a1a;
+  border: none;
+  height: 1px;
+  margin: 1em 0;
+}
+table {
+  margin: 0 auto 0.4em auto;
+  border-collapse: collapse;
+  overflow-x: auto;
+  font-variant-numeric: lining-nums tabular-nums;
+}
+#tbl\:gridmatrix_eccs {
+  margin-top: 1em;
+}
+table caption {
+  margin-bottom: 0.75em;
+}
+tbody {
+  margin-top: 0.5em;
+  border-top: 1px solid $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
+  border-bottom: 1px solid $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
+}
+th {
+  border-top: 1px solid $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
+  padding: 0.25em 0.5em 0.25em 0.5em;
+}
+td {
+  padding: 0.125em 0.5em 0.25em 0.5em;
+  vertical-align: top;
+}
+header {
+  margin-bottom: 4em;
+  text-align: center;
+}
+#banner {
+  text-align: center;
+}
+#banner img.img_hdr {
+  height: 7em;
+}
+#TOC {
+  font-size: 115%;
+}
+#TOC li {
+  list-style: none;
+  margin-bottom: 0.1em;
+  margin-top: 0.2em;
+}
+#TOC ul {
+  padding-left: 1.3em;
+}
+#TOC > ul {
+  padding-left: 0;
+}
+#TOC > ul > li {
+  margin-top: 0.5em;
+}
+#TOC > ul > li > a {
+  font-weight: bold;
+}
+#TOC a:not(:hover) {
+  color: #1a1a1a;
+  text-decoration: none;
+}
+dd > p {
+  margin-bottom:1.5em;
+  margin-top:0.5em;
+}
+#exit-status + dl > dt {
+  float: left;
+}
+#exit-status + dl > dd {
+  margin-bottom: 1em;
+}
+
+$endif$
+code{white-space: pre-wrap;}
+span.smallcaps{font-variant: small-caps;}
+div.columns{display: flex; gap: min(4vw, 1.5em);}
+div.column{flex: auto; overflow-x: auto;}
+div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
+/* The extra [class] is a hack that increases specificity enough to
+   override a similar rule in reveal.js */
+ul.task-list[class]{list-style: none;}
+ul.task-list li input[type="checkbox"] {
+  font-size: inherit;
+  width: 0.8em;
+  margin: 0 0.8em 0.2em -1.6em;
+  vertical-align: middle;
+}
+$if(quotes)$
+q { quotes: "“" "”" "‘" "’"; }
+$endif$
+$if(displaymath-css)$
+.display.math{display: block; text-align: center; margin: 0.5rem auto;}
+$endif$
+$if(highlighting-css)$
+/* CSS for syntax highlighting */
+$highlighting-css$
+$endif$
+$if(csl-css)$
+$styles.citations.html()$
+$endif$

docs/zint.1

@@ -1,4 +1,4 @@
-.\" Automatically generated by Pandoc 3.1.4
+.\" Automatically generated by Pandoc 3.1.5
 .\"
 .\" Define V font for inline verbatim, using C font in formats
 .\" that render this, and otherwise B font.
@@ -497,10 +497,10 @@ Code 11         0 to 2 (2 visible check digits to none)
                 0      (default 2 visible check digits)
                 1      (1 visible check digit)
                 2      (no check digits)
-Code 39         1      (add visible check digit)
+Code 39         1 or 2 (add visible or hidden check digit)
 Code 93         1      (hide the default check characters)
-EXCODE39        1      (add visible check digit)
-LOGMARS         1      (add visible check digit)
+EXCODE39        1 or 2 (add visible or hidden check digit)
+LOGMARS         1 or 2 (add visible or hidden check digit)
 MSI Plessey     0 to 6 (none to various visible options)
                 1, 2   (mod-10, mod-10 + mod-10)
                 3, 4   (mod-11 IBM, mod-11 IBM + mod-10)

docs/zint.1.pmd

@@ -27,54 +27,67 @@ Paintbrush (`PCX`), Portable Network Format (`PNG`), Scalable Vector Graphic (`S
 # OPTIONS
 
 `-h`, `--help`
+
 :   Print usage information summarizing command line options.
 
 `-b TYPE`, `--barcode=TYPE`
+
 :   Set the barcode symbology that will be used to encode the data. *TYPE* is the number or name of the barcode
     symbology. If not given, the symbology defaults to 20 (Code 128). To see what types are available, use the `-t` |
     `--types` option. Type names are case-insensitive, and non-alphanumerics are ignored.
 
 `--addongap=INTEGER`
+
 :   For EAN/UPC symbologies, set the gap between the main data and the add-on. *INTEGER* is in integral multiples of
     the X-dimension. The maximum gap that can be set is 12. The minimum is 7, except for UPC-A, when the minimum is 9.
 
 `--batch`
+
 :   Treat each line of an input file specified with `-i` | `--input` as a separate data set and produce a barcode
     image for each one. The barcode images are outputted by default to numbered filenames starting with "00001.png",
     "00002.png" etc., which can be changed by using the `-o` | `--output` option.
 
 `--bg=COLOUR`
+
 :   Specify a background (paper) colour where *COLOUR* is in hexadecimal `RRGGBB` or `RRGGBBAA` format or in decimal
     `C,M,Y,K` percentages format.
 
 `--binary`
+
 :   Treat input data as raw 8-bit binary data instead of the default UTF-8. Automatic code page translation to an ECI
     page is disabled, and no validation of the data's character encoding takes place.
 
 `--bind`
+
 :   Add horizontal boundary bars (also known as bearer bars) to the symbol. The width of the boundary bars is
     specified by the `--border` option.  `--bind` can also be used to add row separator bars to symbols stacked with
     multiple `-d` | `--data` inputs, in which case the width of the separator bars is specified with the `--separator`
     option.
 
 `--bindtop`
+
 :   Add a horizontal boundary bar to the top of the symbol. The width of the boundary bar is specified by the
     `--border` option.
 
 `--bold`
+
 :   Use bold text for the Human Readable Text (HRT).
 
 `--border=INTEGER`
+
 :   Set the width of boundary bars (`--bind` or `--bindtop`) or box borders (`--box`), where *INTEGER* is in integral
     multiples of the X-dimension. The default is zero.
 
 `--box`
+
 :   Add a box around the symbol. The width of the borders is specified by the `--border` option.
 
 `--cmyk`
+
 :   Use the CMYK colour space when outputting to Encapsulated PostScript (EPS) or TIF files.
 
 `--cols=INTEGER`
+
 :   Set the number of data columns in the symbol to *INTEGER*. Affects Codablock-F, DotCode, GS1 DataBar Expanded
     Stacked (DBAR_EXPSTK), MicroPDF417 and PDF417 symbols.
 
@@ -394,10 +407,10 @@ Paintbrush (`PCX`), Portable Network Format (`PNG`), Scalable Vector Graphic (`S
                         0      (default 2 visible check digits)
                         1      (1 visible check digit)
                         2      (no check digits)
-        Code 39         1      (add visible check digit)
+        Code 39         1 or 2 (add visible or hidden check digit)
         Code 93         1      (hide the default check characters)
-        EXCODE39        1      (add visible check digit)
-        LOGMARS         1      (add visible check digit)
+        EXCODE39        1 or 2 (add visible or hidden check digit)
+        LOGMARS         1 or 2 (add visible or hidden check digit)
         MSI Plessey     0 to 6 (none to various visible options)
                         1, 2   (mod-10, mod-10 + mod-10)
                         3, 4   (mod-11 IBM, mod-11 IBM + mod-10)