diff --git a/ChangeLog b/ChangeLog index 75501dab..b9f722e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,7 +19,7 @@ Changes add `ZINT_TEST`-only "--test" option to do various internal tests - GS1SE: exclude GS1_128 from requisite AIs check as may be spread across more than one barcode (ticket #348, props Harald Oehlmann and Terry Burton) -- AZTEC: add almost optimal encoding algorithm, previous algoritm available via +- AZTEC: add improved encoding algorithm, previous algorithm available via "--fast" (input_mode |= FAST_MODE) - AZTEC: add new option "--azfull" (option_3 = ZINT_AZTEC_FULL) to only consider Full symbols (not Compact ones) on automatic sizing @@ -233,7 +233,7 @@ Bugs - library: need to check for valid UTF-8 after de-escaping - MAXICODE: maintain current set between segments - MSYS2: fix stdout output on Windows under MSYS2 (mailing list, props Frank) -- DATAMATRIX: fix mis-encodation by only doing special end-of-data processing +- DATAMATRIX: fix misencodation by only doing special end-of-data processing on last segment @@ -649,9 +649,9 @@ Bugs - raster.c: fix possible blank rows appearing in CODE16K, CODE49, PHARMA_TWO, PDF417 & CODABLOCKF due to height/scale rounding, props codemonkey82 (#204) - library.c: check for stacking symbols >= 200 -- DATAMATRIX: fix mis-encoding of non-encodables in X12 and EDIFACT modes, +- DATAMATRIX: fix misencoding of non-encodables in X12 and EDIFACT modes, props Alex Geller -- DATAMATRIX: fix mis-encoding of FNC1/GS in EDIFACT in GS1 mode +- DATAMATRIX: fix misencoding of FNC1/GS in EDIFACT in GS1 mode - Allow for dot overspill in height of vertical box sides (dotty mode) - HANXIN: fix gate-posts on codeword limits - GUI: cater for HiDPI display, props bitaround (#257) @@ -1170,7 +1170,7 @@ Unicode handling into backend and added input_mode option, added size options to Data Matrix ECC200, added NULL character handling for Codablock-F, Code 128, Code 16k, Extended Code 39, Code 93, Telepen, Maxicode, Data Matrix ECC200 ECC 200, PDF417 and MicroPDF417. Added GS1 support for Code 16k, Codablock-F and -Aztec Code. Added scale and direct to stdout options. Rebult Data Matrix ECC200 +Aztec Code. Added scale and direct to stdout options. Rebuilt Data Matrix ECC200 ECC 200 encoding algorithms to support NULL encoding and GS1 data encoding. diff --git a/_typos.toml b/_typos.toml new file mode 100644 index 00000000..848b4613 --- /dev/null +++ b/_typos.toml @@ -0,0 +1,77 @@ +# vim: set ts=4 sw=4 et : +[files] +extend-exclude = [ + "backend_tcl/tclconfig/install-sh", + "backend_tcl/configure", + "backend_tcl/win/rules.vc", + "backend_tcl/tclconfig/tcl.m4", + "docs/manual.html", + "docs/pandoc-lua-crossrefs", + "docs/zint_org_uk.py", + "frontend/isotest.sh", + "frontend_qt/*.ui", + "win32/zint_dll_vc6/zint_dll_vc6.dsp", + "win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp", +] + +[default.extend-identifiers] +015PN4 = "015PN4" +7041BA = "7041BA" +7041FO = "7041FO" +7041HPE = "7041HPE" +1234567890ABL = "1234567890ABL" +AIMD = "AIMD" +AIMD013 = "AIMD013" +AIMD014 = "AIMD014" +ABL = "ABL" +ACI = "ACI" +alog = "alog" +alog_ = "alog_" +alog_0x13 = "alog_0x13" +alog_0x25 = "alog_0x25" +alog_0x43 = "alog_0x43" +alog_0x89 = "alog_0x89" +alog_0x11d = "alog_0x11d" +alog_0x12d = "alog_0x12d" +alog_0x163 = "alog_0x163" +BA = "BA" +Ba = "Ba" +ba = "ba" +byt = "byt" +BYT = "BYT" +BYTE = "BYTE" +BYTEs = "BYTEs" +CAF = "CAF" +combins = "combins" +dbar_combins = "dbar_combins" +E0BA81 = "E0BA81" +E4BA8D = "E4BA8D" +fnd_dir = "fnd_dir" +FO = "FO" +Fo = "Fo" +GTIN = "GTIN" +GTINs = "GTINs" +HPE = "HPE" +IS_UE__F = "IS_UE__F" +JOD = "JOD" +KarTrak = "KarTrak" +LSO = "LSO" +NAM = "NAM" +ND = "ND" +nd = "nd" +noet = "noet" +optin = "optin" +PDF_BYT = "PDF_BYT" +PN = "PN" +PNTable = "PNTable" +Produkt = "Produkt" +shs = "shs" +SOM = "SOM" +SUR = "SUR" +somes = "somes" +THA = "THA" +thi = "thi" +thi0 = "thi0" +thi1 = "thi1" +TTO = "TTO" +wnet = "wnet" diff --git a/backend/tests/test_eci.c b/backend/tests/test_eci.c index 1fba1ece..b4f9c9a8 100644 --- a/backend/tests/test_eci.c +++ b/backend/tests/test_eci.c @@ -1,6 +1,6 @@ /* libzint - the open source barcode library - Copyright (C) 2019-2025 Robin Stuart + Copyright (C) 2019-2026 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -1091,7 +1091,7 @@ static void test_utf8_to_eci_sjis(const testCtx *const p_ctx) { /* 1*/ { " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}\177", 95, 0, 95 + 1 }, /* Backslash goes to 2 byte */ /* 2*/ { "~", -1, ZINT_ERROR_INVALID_DATA, -1 }, /* No mapping for tilde */ /* 3*/ { "\302\200", -1, ZINT_ERROR_INVALID_DATA, -1 }, /* No mapping for U+0080 */ - /* 4*/ { "\302\241", -1, ZINT_ERROR_INVALID_DATA, -1 }, /* No mapping for U+00A1 Inverted exclaimation mark */ + /* 4*/ { "\302\241", -1, ZINT_ERROR_INVALID_DATA, -1 }, /* No mapping for U+00A1 Inverted exclamation mark */ /* 5*/ { "\302\245", -1, 0, 1 }, /* U+00A5 Yen goes to backslash */ /* 6*/ { "\302\277", -1, ZINT_ERROR_INVALID_DATA, -1 }, /* No mapping for U+00BF Inverted question mark */ /* 7*/ { "\303\200", -1, ZINT_ERROR_INVALID_DATA, -1 }, /* No mapping for U+00C0 À */ diff --git a/backend/ultra.c b/backend/ultra.c index f7257de5..d4fea99b 100644 --- a/backend/ultra.c +++ b/backend/ultra.c @@ -1,7 +1,7 @@ /* ultra.c - Ultracode */ /* libzint - the open source barcode library - Copyright (C) 2020-2025 Robin Stuart + Copyright (C) 2020-2026 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -456,7 +456,7 @@ static float ult_look_ahead_c43(const unsigned char source[], const int length, int *subcw = (int *) z_alloca(sizeof(int) * (length + 3) * 2); if (current_mode == ULT_EIGHTBIT_MODE) { - /* Check for permissable URL C43 macro sequences, otherwise encode directly */ + /* Check for permissible URL C43 macro sequences, otherwise encode directly */ fragno = ult_find_fragment(source, length, sublocn); if (fragno == 2 || fragno == 3) { diff --git a/debian/changelog b/debian/changelog index 764f1cc8..e3e78c38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ zint (2.6.0) stable; urgency=medium * Update to Qt5 - * Ouput to EMF and TIF + * Output to EMF and TIF -- Robin Stuart Fri, 12 May 2017 09:00:00 +0000 @@ -11,7 +11,7 @@ zint (2.5.1) UNRELEASED; urgency=medium * Include support for Han Xin (Chinese Sensible) code. * Reinstate Codablock-F support. * Automated ECI pre-processing. - * Ouput to BMP, GIF and PCX. + * Output to BMP, GIF and PCX. * Huge code review and numerous bugfixes * DMRE support and DataMatrix bugfixes diff --git a/docs/manual.html b/docs/manual.html index a1c876d6..18e6362a 100644 --- a/docs/manual.html +++ b/docs/manual.html @@ -7477,7 +7477,7 @@ alt="zint -b AZTEC -d "123456789012"" /> Code) as well as ‘full-range’ Aztec Code symbols and by default will automatically select symbol type and size dependent on the length of the data to be encoded. Error correction codewords will normally be -generated to fill at least 23% of the symbol. Two options, mutally +generated to fill at least 23% of the symbol. Two options, mutually exclusive, are available to change this behaviour:

  1. The size of the symbol can be specified using the diff --git a/docs/manual.pmd b/docs/manual.pmd index b17dc689..f0bcc006 100644 --- a/docs/manual.pmd +++ b/docs/manual.pmd @@ -4764,7 +4764,7 @@ Zint can generate Compact Aztec Code (sometimes called Small Aztec Code) as well as 'full-range' Aztec Code symbols and by default will automatically select symbol type and size dependent on the length of the data to be encoded. Error correction codewords will normally be generated to fill at least 23% of the -symbol. Two options, mutally exclusive, are available to change this behaviour: +symbol. Two options, mutually exclusive, are available to change this behaviour: 1) The size of the symbol can be specified using the `--vers` option (API `option_2`) to a value between 1 and 36 according to the following table. The diff --git a/docs/manual.txt b/docs/manual.txt index fcbb791b..98cb1256 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -4546,7 +4546,7 @@ Zint can generate Compact Aztec Code (sometimes called Small Aztec Code) as well as ‘full-range’ Aztec Code symbols and by default will automatically select symbol type and size dependent on the length of the data to be encoded. Error correction codewords will normally be generated to fill at least 23% of the -symbol. Two options, mutally exclusive, are available to change this behaviour: +symbol. Two options, mutually exclusive, are available to change this behaviour: 1) The size of the symbol can be specified using the --vers option (API option_2) to a value between 1 and 36 according to the following table. The diff --git a/docs/zint_images.sh b/docs/zint_images.sh index c74afbd8..075b2c32 100755 --- a/docs/zint_images.sh +++ b/docs/zint_images.sh @@ -15,7 +15,7 @@ SCALE_ULTRA=2 SCALE_UPCEAN=0.5 # Depending on platform and versions of installed components, may need to adjust the scales -# Multipying by 4 now seems necessary on Ubuntu 22.04 with pandoc 2.19 +# Multiplying by 4 now seems necessary on Ubuntu 22.04 with pandoc 2.19 scales=( SCALE_LINEAR SCALE_2D SCALE_2D_BIGGER SCALE_TRACK SCALE_DOTTY SCALE_ULTRA SCALE_UPCEAN ) for scale in "${scales[@]}" ; do eval $scale=$(echo "${!scale} * 4" | bc) diff --git a/extras/cuecat.c b/extras/cuecat.c index 1625a408..8b412355 100644 --- a/extras/cuecat.c +++ b/extras/cuecat.c @@ -163,7 +163,7 @@ int main(int argc, char** argv) { strcat(pattern, C128Table[106]); // Stop - /* Start ouputting SVG file */ + /* Start outputting SVG file */ print_head(cat_number); print_cue(); print_data(pattern); diff --git a/extras/stroke.c b/extras/stroke.c index 4f7bacc9..a1ee82c3 100644 --- a/extras/stroke.c +++ b/extras/stroke.c @@ -7,7 +7,7 @@ * * The same code can also be used to resolve PDF417 symbols with the * StrokeScribe 417 font and linear symbols with the StrokeScribe 1D - * font, all of which are available from the same souce. + * font, all of which are available from the same source. * * This code can be compiled with: * diff --git a/tools/update_version.php b/tools/update_version.php index 92946790..df06254f 100644 --- a/tools/update_version.php +++ b/tools/update_version.php @@ -2,7 +2,7 @@ /* Update Zint version number in various files */ /* libzint - the open source barcode library - Copyright (C) 2020-2025 Robin Stuart + Copyright (C) 2020-2026 Robin Stuart */ /* SPDX-License-Identifier: BSD-3-Clause */ @@ -56,7 +56,7 @@ $rc_str2 = "$major.$minor.$release.$build"; $year = date("Y"); -/* Ouput error message and exit */ +/* Output error message and exit */ function err_exit($line_no, $msg) { global $basename; diff --git a/zint.nsi b/zint.nsi index 3ba2dd5a..85d52773 100644 --- a/zint.nsi +++ b/zint.nsi @@ -58,7 +58,7 @@ Var ICONS_GROUP ; Welcome page !insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_LICENSE "gpl-3.0.txt" -; Mixed mode instalation page +; Mixed mode installation page !insertmacro MULTIUSER_PAGE_INSTALLMODE ; Components page ; !insertmacro MUI_PAGE_COMPONENTS diff --git a/zint.spec b/zint.spec index ec55be4e..72dc5970 100644 --- a/zint.spec +++ b/zint.spec @@ -153,7 +153,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Feb 15 2018 Robin Stuart - 2.6.3 - Version -> 2.6.3 -* Sun Oct 22 2017 Robin Stuat - 2.6.2 +* Sun Oct 22 2017 Robin Stuart - 2.6.2 - Version -> 2.6.2 * Sun Aug 27 2017 Robin Stuart - 2.6.1