diff --git a/backend/library.c b/backend/library.c index 78f24e01..e9bdb057 100644 --- a/backend/library.c +++ b/backend/library.c @@ -578,11 +578,11 @@ static const barcode_src_func_t barcode_src_funcs[BARCODE_LAST + 1] = { NULL, NULL, NULL, NULL, NULL, /*110-114*/ NULL, NULL, NULL, NULL, mailmark_2d, /*115-119*/ upu_s10, mailmark_4s, NULL, NULL, NULL, /*120-124*/ - NULL, NULL, dxfilmedge, azrune, code32, /*125-129*/ + NULL, NULL, NULL, azrune, code32, /*125-129*/ composite, composite, composite, composite, composite, /*130-134*/ composite, composite, composite, composite, composite, /*135-139*/ channel, NULL, NULL, upnqr, NULL, /*140-144*/ - NULL, bc412, /*145-146*/ + NULL, bc412, dxfilmedge, /*145-147*/ }; #define LIB_SEG_FUNCS_START 55 @@ -1638,11 +1638,11 @@ int ZBarcode_BarcodeName(int symbol_id, char name[32]) { "HIBC_BLOCKF", "", "HIBC_AZTEC", "", "", /*110-114*/ "DOTCODE", "HANXIN", "", "", "MAILMARK_2D", /*115-119*/ "UPU_S10", "MAILMARK_4S", "", "", "", /*120-124*/ - "", "", "DXFILMEDGE", "AZRUNE", "CODE32", /*125-129*/ + "", "", "", "AZRUNE", "CODE32", /*125-129*/ "EANX_CC", "GS1_128_CC", "DBAR_OMN_CC", "DBAR_LTD_CC", "DBAR_EXP_CC", /*130-134*/ "UPCA_CC", "UPCE_CC", "DBAR_STK_CC", "DBAR_OMNSTK_CC", "DBAR_EXPSTK_CC", /*135-139*/ "CHANNEL", "CODEONE", "GRIDMATRIX", "UPNQR", "ULTRA", /*140-144*/ - "RMQR", "BC412", /*145-146*/ + "RMQR", "BC412", "DXFILMEDGE", /*145-147*/ }; name[0] = '\0'; diff --git a/backend/tests/test_library.c b/backend/tests/test_library.c index 9bf65927..eb41ff03 100644 --- a/backend/tests/test_library.c +++ b/backend/tests/test_library.c @@ -189,30 +189,32 @@ static void test_checks(const testCtx *const p_ctx) { /*125*/ { 125, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 }, /*126*/ { 126, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 }, /*127*/ { 126, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 }, - /*128*/ { 147, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 }, - /*129*/ { 147, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 }, - /*130*/ { BARCODE_LAST + 1, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 }, - /*131*/ { BARCODE_LAST + 1, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 }, - /*132*/ { BARCODE_CODE128, -1, "\200", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 245: Invalid UTF-8 in input", -1 }, - /*133*/ { BARCODE_CODE128, -1, "\\o200", -1, UNICODE_MODE | ESCAPE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 245: Invalid UTF-8 in input", -1 }, - /*134*/ { BARCODE_MAXICODE, -1, "\200", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 245: Invalid UTF-8 in input", -1 }, - /*135*/ { BARCODE_MAXICODE, -1, "\\o200", -1, UNICODE_MODE | ESCAPE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 245: Invalid UTF-8 in input", -1 }, - /*136*/ { BARCODE_GS1_128, -1, "[01]12345678901234", -1, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_NONCOMPLIANT, "Warning 261: AI (01) position 14: Bad checksum '4', expected '1'", -1 }, - /*137*/ { BARCODE_GS1_128, -1, "[01]12345678901234", -1, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_NONCOMPLIANT, "Error 261: AI (01) position 14: Bad checksum '4', expected '1'", -1 }, - /*138*/ { BARCODE_QRCODE, -1, "ก", -1, UNICODE_MODE, 13, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", -1 }, - /*139*/ { BARCODE_QRCODE, -1, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_USES_ECI, "Warning 222: Encoded data includes ECI 13", -1 }, - /*140*/ { BARCODE_QRCODE, -1, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_USES_ECI, "Error 222: Encoded data includes ECI 13", -1 }, - /*141*/ { BARCODE_CODEONE, -1, "[01]12345678901231", -1, GS1_MODE, 3, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 512: ECI ignored for GS1 mode", -1 }, - /*142*/ { BARCODE_CODEONE, -1, "[01]12345678901231", -1, GS1_MODE, 3, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 512: ECI ignored for GS1 mode", -1 }, - /*143*/ { BARCODE_CODEONE, -1, "[01]12345678901234", -1, GS1_MODE, 3, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 512: ECI ignored for GS1 mode", -1 }, /* Warning in encoder overrides library warnings */ - /*144*/ { BARCODE_CODEONE, -1, "[01]12345678901234", -1, GS1_MODE, 3, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_NONCOMPLIANT, "Error 261: AI (01) position 14: Bad checksum '4', expected '1'", -1 }, /* But not errors */ - /*145*/ { BARCODE_AZTEC, -1, "ก", -1, UNICODE_MODE, 13, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", -1 }, - /*146*/ { BARCODE_AZTEC, -1, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_USES_ECI, "Warning 222: Encoded data includes ECI 13", -1 }, - /*147*/ { BARCODE_AZTEC, -1, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_USES_ECI, "Error 222: Encoded data includes ECI 13", -1 }, - /*148*/ { BARCODE_AZTEC, 6, "ก", -1, UNICODE_MODE, 13, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 503: Error correction level '6' out of range (1 to 4), ignoring", -1 }, - /*149*/ { BARCODE_AZTEC, 6, "ก", -1, UNICODE_MODE, 13, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 503: Error correction level '6' out of range (1 to 4)", -1 }, - /*150*/ { BARCODE_AZTEC, 6, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_USES_ECI, "Warning 222: Encoded data includes ECI 13", -1 }, /* ECI warning trumps all other warnings */ - /*151*/ { BARCODE_AZTEC, 6, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 503: Error correction level '6' out of range (1 to 4)", -1 }, /* But not errors */ + /*128*/ { 127, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 }, + /*129*/ { 127, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 }, + /*130*/ { 148, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 }, + /*131*/ { 148, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 }, + /*132*/ { BARCODE_LAST + 1, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 }, + /*133*/ { BARCODE_LAST + 1, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 }, + /*134*/ { BARCODE_CODE128, -1, "\200", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 245: Invalid UTF-8 in input", -1 }, + /*135*/ { BARCODE_CODE128, -1, "\\o200", -1, UNICODE_MODE | ESCAPE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 245: Invalid UTF-8 in input", -1 }, + /*136*/ { BARCODE_MAXICODE, -1, "\200", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 245: Invalid UTF-8 in input", -1 }, + /*137*/ { BARCODE_MAXICODE, -1, "\\o200", -1, UNICODE_MODE | ESCAPE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 245: Invalid UTF-8 in input", -1 }, + /*138*/ { BARCODE_GS1_128, -1, "[01]12345678901234", -1, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_NONCOMPLIANT, "Warning 261: AI (01) position 14: Bad checksum '4', expected '1'", -1 }, + /*139*/ { BARCODE_GS1_128, -1, "[01]12345678901234", -1, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_NONCOMPLIANT, "Error 261: AI (01) position 14: Bad checksum '4', expected '1'", -1 }, + /*140*/ { BARCODE_QRCODE, -1, "ก", -1, UNICODE_MODE, 13, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", -1 }, + /*141*/ { BARCODE_QRCODE, -1, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_USES_ECI, "Warning 222: Encoded data includes ECI 13", -1 }, + /*142*/ { BARCODE_QRCODE, -1, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_USES_ECI, "Error 222: Encoded data includes ECI 13", -1 }, + /*143*/ { BARCODE_CODEONE, -1, "[01]12345678901231", -1, GS1_MODE, 3, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 512: ECI ignored for GS1 mode", -1 }, + /*144*/ { BARCODE_CODEONE, -1, "[01]12345678901231", -1, GS1_MODE, 3, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 512: ECI ignored for GS1 mode", -1 }, + /*145*/ { BARCODE_CODEONE, -1, "[01]12345678901234", -1, GS1_MODE, 3, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 512: ECI ignored for GS1 mode", -1 }, /* Warning in encoder overrides library warnings */ + /*146*/ { BARCODE_CODEONE, -1, "[01]12345678901234", -1, GS1_MODE, 3, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_NONCOMPLIANT, "Error 261: AI (01) position 14: Bad checksum '4', expected '1'", -1 }, /* But not errors */ + /*147*/ { BARCODE_AZTEC, -1, "ก", -1, UNICODE_MODE, 13, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", -1 }, + /*148*/ { BARCODE_AZTEC, -1, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_USES_ECI, "Warning 222: Encoded data includes ECI 13", -1 }, + /*149*/ { BARCODE_AZTEC, -1, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_USES_ECI, "Error 222: Encoded data includes ECI 13", -1 }, + /*150*/ { BARCODE_AZTEC, 6, "ก", -1, UNICODE_MODE, 13, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 503: Error correction level '6' out of range (1 to 4), ignoring", -1 }, + /*151*/ { BARCODE_AZTEC, 6, "ก", -1, UNICODE_MODE, 13, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 503: Error correction level '6' out of range (1 to 4)", -1 }, + /*152*/ { BARCODE_AZTEC, 6, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_USES_ECI, "Warning 222: Encoded data includes ECI 13", -1 }, /* ECI warning trumps all other warnings */ + /*153*/ { BARCODE_AZTEC, 6, "ก", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 503: Error correction level '6' out of range (1 to 4)", -1 }, /* But not errors */ }; const int data_size = ARRAY_SIZE(data); int i, length, ret; @@ -1530,7 +1532,7 @@ static int test_prev_ZBarcode_BarcodeName(int symbol_id, char name[32]) { { "", -1, 124 }, { "", -1, 125 }, { "", -1, 126 }, - { "BARCODE_DXFILMEDGE", BARCODE_DXFILMEDGE, 127 }, + { "", -1, 127 }, { "BARCODE_AZRUNE", BARCODE_AZRUNE, 128 }, { "BARCODE_CODE32", BARCODE_CODE32, 129 }, { "BARCODE_EANX_CC", BARCODE_EANX_CC, 130 }, @@ -1550,6 +1552,7 @@ static int test_prev_ZBarcode_BarcodeName(int symbol_id, char name[32]) { { "BARCODE_ULTRA", BARCODE_ULTRA, 144 }, { "BARCODE_RMQR", BARCODE_RMQR, 145 }, { "BARCODE_BC412", BARCODE_BC412, 146 }, + { "BARCODE_DXFILMEDGE", BARCODE_DXFILMEDGE, 147 }, }; name[0] = '\0'; diff --git a/backend/tests/testcommon.c b/backend/tests/testcommon.c index 3f453ca7..890972b2 100644 --- a/backend/tests/testcommon.c +++ b/backend/tests/testcommon.c @@ -3827,7 +3827,7 @@ static const char *testUtilZXingCPPName(int index, const struct zint_symbol *sym { "", -1, 124, }, { "", -1, 125, }, { "", -1, 126, }, - { "DXFilmEdge", BARCODE_DXFILMEDGE, 127, }, + { "", -1, 127, }, { "", BARCODE_AZRUNE, 128, }, { "", BARCODE_CODE32, 129, }, /* Code39 based */ { "", BARCODE_EANX_CC, 130, }, @@ -3847,6 +3847,7 @@ static const char *testUtilZXingCPPName(int index, const struct zint_symbol *sym { "", BARCODE_ULTRA, 144, }, { "RMQRCode", BARCODE_RMQR, 145, }, { "", BARCODE_BC412, 146, }, + { "DXFilmEdge", BARCODE_DXFILMEDGE, 147, }, }; const int data_size = ARRAY_SIZE(data); diff --git a/backend/zint.h b/backend/zint.h index c6d809b5..44d4c389 100644 --- a/backend/zint.h +++ b/backend/zint.h @@ -248,7 +248,6 @@ extern "C" { #define BARCODE_MAILMARK 121 /* Legacy */ /* Zint specific */ -#define BARCODE_DXFILMEDGE 127 /* DX Film Edge Barcode on 35mm and APS films */ #define BARCODE_AZRUNE 128 /* Aztec Runes */ #define BARCODE_CODE32 129 /* Code 32 */ #define BARCODE_EANX_CC 130 /* EAN Composite */ @@ -275,7 +274,8 @@ extern "C" { #define BARCODE_ULTRA 144 /* Ultracode */ #define BARCODE_RMQR 145 /* Rectangular Micro QR Code (rMQR) */ #define BARCODE_BC412 146 /* IBM BC412 (SEMI T1-95) */ -#define BARCODE_LAST 146 /* Max barcode number marker, not barcode */ +#define BARCODE_DXFILMEDGE 147 /* DX Film Edge Barcode on 35mm and APS films */ +#define BARCODE_LAST 147 /* Max barcode number marker, not barcode */ /* Output options (`symbol->output_options`) */ #define BARCODE_BIND_TOP 0x00001 /* Boundary bar above the symbol only (not below), does not affect stacking */ diff --git a/docs/manual.html b/docs/manual.html index 9456830b..bbe40ffe 100644 --- a/docs/manual.html +++ b/docs/manual.html @@ -1953,11 +1953,6 @@ Matrix) Royal Mail 4-State Mailmark -127 -BARCODE_DXFILMEDGE -DX Film Edge Barcode - - 128 BARCODE_AZRUNE Aztec Runes @@ -2063,6 +2058,11 @@ QR) BARCODE_BC412 IBM BC412 (SEMI T1-95) + +147 +BARCODE_DXFILMEDGE +DX Film Edge Barcode + diff --git a/docs/manual.pmd b/docs/manual.pmd index f0578906..c70bddb6 100644 --- a/docs/manual.pmd +++ b/docs/manual.pmd @@ -817,8 +817,6 @@ Value 121 `BARCODE_MAILMARK_4S` Royal Mail 4-State Mailmark - 127 `BARCODE_DXFILMEDGE` DX Film Edge Barcode - 128 `BARCODE_AZRUNE` Aztec Runes 129 `BARCODE_CODE32` Code 32 @@ -866,6 +864,8 @@ Value 145 `BARCODE_RMQR` Rectangular Micro QR Code (rMQR) 146 `BARCODE_BC412` IBM BC412 (SEMI T1-95) + + 147 `BARCODE_DXFILMEDGE` DX Film Edge Barcode ----------------------------------------------------------------------------- Table: {#tbl:barcode_types tag=": Barcode Types (Symbologies)"} diff --git a/docs/manual.txt b/docs/manual.txt index 5d824eb1..daaff5b5 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -952,8 +952,6 @@ underscores are optional. 121 BARCODE_MAILMARK_4S Royal Mail 4-State Mailmark - 127 BARCODE_DXFILMEDGE DX Film Edge Barcode - 128 BARCODE_AZRUNE Aztec Runes 129 BARCODE_CODE32 Code 32 @@ -1001,6 +999,8 @@ underscores are optional. 145 BARCODE_RMQR Rectangular Micro QR Code (rMQR) 146 BARCODE_BC412 IBM BC412 (SEMI T1-95) + + 147 BARCODE_DXFILMEDGE DX Film Edge Barcode ------------------------------------------------------------------------------ Table : Barcode Types (Symbologies) diff --git a/frontend/main.c b/frontend/main.c index 29632404..41bb3398 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -97,26 +97,26 @@ static void types(void) { "40 POSTNET USPS POSTNET 119 MAILMARK_2D Royal Mail 2D Mailmark\n" "47 MSI_PLESSEY MSI Plessey 120 UPU_S10 UPU S10\n", stdout); fputs("49 FIM Facing Ident Mark 121 MAILMARK_4S RM 4-State Mailmark\n" - "50 LOGMARS LOGMARS Code 39 127 DXFILMEDGE DX Film Edge Barcode\n" - "51 PHARMA Pharmacode One-Track 128 AZRUNE Aztec Runes\n" - "52 PZN Pharmazentralnummer 129 CODE32 Code 32\n" - "53 PHARMA_TWO Pharmacode Two-Track 130 EANX_CC Composite EAN\n", stdout); - fputs("54 CEPNET Brazilian CEPNet 131 GS1_128_CC Composite GS1-128\n" - "55 PDF417 PDF417 132 DBAR_OMN_CC Comp DataBar Omni\n" - "56 PDF417COMP Compact PDF417 133 DBAR_LTD_CC Comp DataBar Limited\n" - "57 MAXICODE MaxiCode 134 DBAR_EXP_CC Comp DataBar Expanded\n" - "58 QRCODE QR Code 135 UPCA_CC Composite UPC-A\n", stdout); - fputs("60 CODE128AB Code 128 (Suppress C) 136 UPCE_CC Composite UPC-E\n" - "63 AUSPOST AP Standard Customer 137 DBAR_STK_CC Comp DataBar Stacked\n" - "66 AUSREPLY AP Reply Paid 138 DBAR_OMNSTK_CC Comp DataBar Stack Omn\n" - "67 AUSROUTE AP Routing 139 DBAR_EXPSTK_CC Comp DataBar Exp Stack\n" - "68 AUSREDIRECT AP Redirection 140 CHANNEL Channel Code\n", stdout); - fputs("69 ISBNX ISBN 141 CODEONE Code One\n" - "70 RM4SCC Royal Mail 4SCC 142 GRIDMATRIX Grid Matrix\n" - "71 DATAMATRIX Data Matrix 143 UPNQR UPN QR Code\n" - "72 EAN14 EAN-14 144 ULTRA Ultracode\n" - "73 VIN Vehicle Information No. 145 RMQR Rectangular Micro QR\n", stdout); - fputs("74 CODABLOCKF Codablock-F 146 BC412 BC412\n", stdout); + "50 LOGMARS LOGMARS Code 39 128 AZRUNE Aztec Runes\n" + "51 PHARMA Pharmacode One-Track 129 CODE32 Code 32\n" + "52 PZN Pharmazentralnummer 130 EANX_CC Composite EAN\n" + "53 PHARMA_TWO Pharmacode Two-Track 131 GS1_128_CC Composite GS1-128\n", stdout); + fputs("54 CEPNET Brazilian CEPNet 132 DBAR_OMN_CC Comp DataBar Omni\n" + "55 PDF417 PDF417 133 DBAR_LTD_CC Comp DataBar Limited\n" + "56 PDF417COMP Compact PDF417 134 DBAR_EXP_CC Comp DataBar Expanded\n" + "57 MAXICODE MaxiCode 135 UPCA_CC Composite UPC-A\n" + "58 QRCODE QR Code 136 UPCE_CC Composite UPC-E\n", stdout); + fputs("60 CODE128AB Code 128 (Suppress C) 137 DBAR_STK_CC Comp DataBar Stacked\n" + "63 AUSPOST AP Standard Customer 138 DBAR_OMNSTK_CC Comp DataBar Stack Omn\n" + "66 AUSREPLY AP Reply Paid 139 DBAR_EXPSTK_CC Comp DataBar Exp Stack\n" + "67 AUSROUTE AP Routing 140 CHANNEL Channel Code\n" + "68 AUSREDIRECT AP Redirection 141 CODEONE Code One\n", stdout); + fputs("69 ISBNX ISBN 142 GRIDMATRIX Grid Matrix\n" + "70 RM4SCC Royal Mail 4SCC 143 UPNQR UPN QR Code\n" + "71 DATAMATRIX Data Matrix 144 ULTRA Ultracode\n" + "72 EAN14 EAN-14 145 RMQR Rectangular Micro QR\n" + "73 VIN Vehicle Information No. 146 BC412 BC412\n", stdout); + fputs("74 CODABLOCKF Codablock-F 147 DXFILMEDGE DX Film Edge Barcode\n", stdout); } /* Output version information */