diff --git a/backend/tests/tools/bwipp_dump.ps.tar.xz b/backend/tests/tools/bwipp_dump.ps.tar.xz index d8202c3a..9a661f3c 100644 Binary files a/backend/tests/tools/bwipp_dump.ps.tar.xz and b/backend/tests/tools/bwipp_dump.ps.tar.xz differ diff --git a/docs/manual.html b/docs/manual.html index 5f7447d3..bf669079 100644 --- a/docs/manual.html +++ b/docs/manual.html @@ -9469,10 +9469,14 @@ non-ASCII data.

--gs1
-

Treat input as GS1 compatible data. Application Identifiers (AIs) -should be placed in square brackets "[]" (but see ---gs1parens). Also accepts GS1 Digital Link URIs -(unverified) for matrix symbologies.

+

Treat input as GS1 compatible data. A number of input formats are +available. Application Identifiers (AIs) may be placed in square +brackets "[]". Alternatively the GS1 Syntax Engine +“Unbracketed AI” format may be used, which starts with a caret +(^) and uses carets to indicate required +FNC1s. For matrix symbologies, GS1 Digital Link URIs +(unverified) may be given. Further input options are available with +--gs1parens and --gs1raw.

--gs1nocheck
diff --git a/docs/manual.txt b/docs/manual.txt index 48f41f83..329d0619 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -5495,9 +5495,12 @@ OPTIONS --gs1 - Treat input as GS1 compatible data. Application Identifiers (AIs) should be - placed in square brackets "[]" (but see --gs1parens). Also accepts GS1 - Digital Link URIs (unverified) for matrix symbologies. + Treat input as GS1 compatible data. A number of input formats are available. + Application Identifiers (AIs) may be placed in square brackets "[]". + Alternatively the GS1 Syntax Engine “Unbracketed AI” format may be used, + which starts with a caret (^) and uses carets to indicate required FNC1s. + For matrix symbologies, GS1 Digital Link URIs (unverified) may be given. + Further input options are available with --gs1parens and --gs1raw. --gs1nocheck diff --git a/docs/zint.1 b/docs/zint.1 index 0ad2ba31..753ccd58 100644 --- a/docs/zint.1 +++ b/docs/zint.1 @@ -245,9 +245,15 @@ non\-ASCII data. .TP \f[CR]\-\-gs1\f[R] Treat input as GS1 compatible data. -Application Identifiers (AIs) should be placed in square brackets -\f[CR]\(dq[]\(dq\f[R] (but see \f[CR]\-\-gs1parens\f[R]). -Also accepts GS1 Digital Link URIs (unverified) for matrix symbologies. +A number of input formats are available. +Application Identifiers (AIs) may be placed in square brackets +\f[CR]\(dq[]\(dq\f[R]. +Alternatively the GS1 Syntax Engine \(lqUnbracketed AI\(rq format may be +used, which starts with a caret (\f[CR]\(ha\f[R]) and uses carets to +indicate required \f[CR]FNC1\f[R]s. +For matrix symbologies, GS1 Digital Link URIs (unverified) may be given. +Further input options are available with \f[CR]\-\-gs1parens\f[R] and +\f[CR]\-\-gs1raw\f[R]. .TP \f[CR]\-\-gs1nocheck\f[R] Treat input as GS1 compatible data (as \f[CR]\-\-gs1\f[R]) but do not diff --git a/docs/zint.1.pmd b/docs/zint.1.pmd index be987f09..87d4bf11 100644 --- a/docs/zint.1.pmd +++ b/docs/zint.1.pmd @@ -218,8 +218,10 @@ Paintbrush (`PCX`), Portable Network Format (`PNG`), Scalable Vector Graphic (`S `--gs1` -: Treat input as GS1 compatible data. Application Identifiers (AIs) should be placed in square brackets `"[]"` (but - see `--gs1parens`). Also accepts GS1 Digital Link URIs (unverified) for matrix symbologies. +: Treat input as GS1 compatible data. A number of input formats are available. Application Identifiers (AIs) may be + placed in square brackets `"[]"`. Alternatively the GS1 Syntax Engine "Unbracketed AI" format may be used, which + starts with a caret (`^`) and uses carets to indicate required `FNC1`s. For matrix symbologies, GS1 Digital Link + URIs (unverified) may be given. Further input options are available with `--gs1parens` and `--gs1raw`. `--gs1nocheck` diff --git a/frontend/main.c b/frontend/main.c index 815c5292..73cb7d54 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -185,7 +185,7 @@ static void usage(const int no_png, const int have_gs1syntaxengine) { " -d, --data=DATA Set the symbol data content (segment 0)\n", stdout); fputs( " --direct Send output to stdout\n" " --dmb256=INTEGER Start Data Matrix in Base 256 for given length (0 all)\n" - " --dmc40=INTERGER Start Data Matrix in C40 mode for given length (0 all)\n" + " --dmc40=INTEGER Start Data Matrix in C40 mode for given length (0 all)\n" " --dmiso144 Use ISO format for 144x144 Data Matrix symbols\n" " --dmre Allow Data Matrix Rectangular Extended\n", stdout); fputs( " --dotsize=NUMBER Set radius of dots in dotty mode\n"