ruby-zint 1.1.0 → 1.3.0

data/lib/zint/c25inter.rb

@@ -1,7 +1,8 @@
 module Zint
+  # 2 of 5 Interleaved
   class C25inter < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_C25INTER, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_C25INTER, **kwargs)
     end
   end
 end

data/lib/zint/c25logic.rb

@@ -1,7 +1,8 @@
 module Zint
+  # 2 of 5 Data Logic
   class C25logic < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_C25LOGIC, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_C25LOGIC, **kwargs)
     end
   end
 end

data/lib/zint/c25matrix.rb

@@ -1,7 +1,8 @@
 module Zint
+  # Legacy
   class C25matrix < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_C25MATRIX, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_C25MATRIX, **kwargs)
     end
   end
 end

data/lib/zint/c25standard.rb

@@ -1,7 +1,8 @@
 module Zint
+  # 2 of 5 Standard (Matrix)
   class C25standard < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_C25STANDARD, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_C25STANDARD, **kwargs)
     end
   end
 end

data/lib/zint/cep_net.rb

@@ -0,0 +1,8 @@
+module Zint
+  # Brazilian CEPNet Postal Code
+  class CepNet < Barcode
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_CEPNET, **kwargs)
+    end
+  end
+end

data/lib/zint/channel.rb

@@ -1,7 +1,8 @@
 module Zint
+  # Channel Code
   class Channel < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_CHANNEL, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_CHANNEL, **kwargs)
     end
   end
 end

data/lib/zint/codabar.rb

@@ -1,7 +1,8 @@
 module Zint
+  # Codabar
   class Codabar < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_CODABAR, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_CODABAR, **kwargs)
     end
   end
 end

data/lib/zint/codablock_f.rb

@@ -1,7 +1,8 @@
 module Zint
+  # Codablock-F
   class CodablockF < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_CODABLOCKF, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_CODABLOCKF, **kwargs)
     end
   end
 end

data/lib/zint/code11.rb

@@ -1,7 +1,8 @@
 module Zint
+  # Code 11
   class Code11 < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_CODE11, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_CODE11, **kwargs)
     end
   end
 end

data/lib/zint/code128.rb

@@ -1,7 +1,8 @@
 module Zint
+  # Code 128
   class Code128 < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_CODE128, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_CODE128, **kwargs)
     end
   end
 end

data/lib/zint/code128ab.rb

@@ -0,0 +1,8 @@
+module Zint
+  # Code 128 (Suppress Code Set C)
+  class Code128AB < Barcode
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_CODE128AB, **kwargs)
+    end
+  end
+end

data/lib/zint/code128b.rb

@@ -1,7 +1,5 @@
 module Zint
-  class Code128b < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_CODE128B, options: options)
-    end
+  # Legacy
+  class Code128B < Code128AB
   end
 end

data/lib/zint/code16k.rb

@@ -1,7 +1,8 @@
 module Zint
+  # Code 16k
   class Code16k < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_CODE16K, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_CODE16K, **kwargs)
     end
   end
 end

data/lib/zint/code32.rb

@@ -1,7 +1,8 @@
 module Zint
+  # Code 32
   class Code32 < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_CODE32, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_CODE32, **kwargs)
     end
   end
 end

data/lib/zint/code39.rb

@@ -1,7 +1,8 @@
 module Zint
+  # Code 39
   class Code39 < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_CODE39, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_CODE39, **kwargs)
     end
   end
 end

data/lib/zint/code49.rb

@@ -1,7 +1,8 @@
 module Zint
+  # Code 49
   class Code49 < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_CODE49, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_CODE49, **kwargs)
     end
   end
 end

data/lib/zint/code93.rb

@@ -1,7 +1,8 @@
 module Zint
+  # Code 93
   class Code93 < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_CODE93, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_CODE93, **kwargs)
     end
   end
 end

data/lib/zint/code_one.rb

@@ -1,7 +1,8 @@
 module Zint
+  # Code One
   class CodeOne < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_CODEONE, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_CODEONE, **kwargs)
     end
   end
 end

data/lib/zint/constants/capability_flags.rb

@@ -2,17 +2,20 @@ module Zint
   module Constants
     # Capability flags (ZBarcode_Cap() `cap_flag`)
     module CapabilityFlags
-      ZINT_CAP_HRT = 0x0001 # Prints Human Readable Text?
-      ZINT_CAP_STACKABLE = 0x0002 # Is stackable?
-      ZINT_CAP_EXTENDABLE = 0x0004 # Is extendable with add-on data? (Is UPC/EAN?)
-      ZINT_CAP_COMPOSITE = 0x0008 # Can have composite data?
-      ZINT_CAP_ECI = 0x0010 # Supports Extended Channel Interpretations?
-      ZINT_CAP_GS1 = 0x0020 # Supports GS1 data?
-      ZINT_CAP_DOTTY = 0x0040 # Can be output as dots?
-      ZINT_CAP_FIXED_RATIO = 0x0100 # Has fixed width-to-height (aspect) ratio?
-      ZINT_CAP_READER_INIT = 0x0200 # Supports Reader Initialisation?
-      ZINT_CAP_FULL_MULTIBYTE = 0x0400 # Supports full-multibyte option?
-      ZINT_CAP_MASK = 0x0800 # Is mask selectable?
+      ZINT_CAP_HRT = 0x0001 # Prints Human Readable Text? */
+      ZINT_CAP_STACKABLE = 0x0002 # Is stackable? */
+      ZINT_CAP_EXTENDABLE = 0x0004 # Is extendable with add-on data? (Is EAN/UPC?) */
+      ZINT_CAP_COMPOSITE = 0x0008 # Can have composite data? */
+      ZINT_CAP_ECI = 0x0010 # Supports Extended Channel Interpretations? */
+      ZINT_CAP_GS1 = 0x0020 # Supports GS1 data? */
+      ZINT_CAP_DOTTY = 0x0040 # Can be output as dots? */
+      ZINT_CAP_QUIET_ZONES = 0x0080 # Has default quiet zones? */
+      ZINT_CAP_FIXED_RATIO = 0x0100 # Has fixed width-to-height (aspect) ratio? */
+      ZINT_CAP_READER_INIT = 0x0200 # Supports Reader Initialisation? */
+      ZINT_CAP_FULL_MULTIBYTE = 0x0400 # Supports full-multibyte option? */
+      ZINT_CAP_MASK = 0x0800 # Is mask selectable? */
+      ZINT_CAP_STRUCTAPP = 0x1000 # Supports Structured Append? */
+      ZINT_CAP_COMPLIANT_HEIGHT = 0x2000 # Has compliant height? */
     end
   end
 end

data/lib/zint/constants/input_data_types.rb

@@ -2,13 +2,14 @@ module Zint
   module Constants
     # Input data types (`symbol->input_mode`)
     module InputDataTypes
-      DATA_MODE = 0
-      UNICODE_MODE = 1
-      GS1_MODE = 2
-      # The following may be OR-ed with above
-      ESCAPE_MODE = 8
-      GS1PARENS_MODE = 16
-      GS1NOCHECK_MODE = 32
+      DATA_MODE = 0 #  Binary
+      UNICODE_MODE = 1 #  UTF-8
+      GS1_MODE = 2 #  GS1
+      ESCAPE_MODE = 0x0008 #  Process escape sequences
+      GS1PARENS_MODE = 0x0010 #  Process parentheses as GS1 AI delimiters (instead of square brackets)
+      GS1NOCHECK_MODE = 0x0020 #  Do not check validity of GS1 data (except that printable ASCII only)
+      HEIGHTPERROW_MODE = 0x0040 #  Interpret `height` as per-row rather than as overall height
+      FAST_MODE = 0x0080 #  Use faster if less optimal encodation or other shortcuts if available (affects DATAMATRIX, MICROPDF417, PDF417, QRCODE & UPNQR only)
     end
   end
 end

data/lib/zint/constants/output_options.rb

@@ -2,17 +2,20 @@ module Zint
   module Constants
     # Output options (`symbol->output_options`)
     module OutputOptions
-      BARCODE_NO_ASCII = 1   # Legacy (no-op)
-      BARCODE_BIND = 2   # Boundary bars above & below the symbol and between stacked symbols
-      BARCODE_BOX = 4   # Box around symbol
-      BARCODE_STDOUT = 8   # Output to stdout
-      READER_INIT = 16  # Reader Initialisation (Programming)
-      SMALL_TEXT = 32  # Use smaller font
-      BOLD_TEXT = 64  # Use bold font
-      CMYK_COLOUR = 128 # CMYK colour space (Encapsulated PostScript and TIF)
-      BARCODE_DOTTY_MODE = 256 # Plot a matrix symbol using dots rather than squares
-      GS1_GS_SEPARATOR = 512 # Use GS instead of FNC1 as GS1 separator (Data Matrix)
-      OUT_BUFFER_INTERMEDIATE = 1024 # Return ASCII values in bitmap buffer (OUT_BUFFER only)
+      BARCODE_BIND_TOP = 0x0001 # Boundary bar above the symbol only (not below), does not affect stacking */
+      BARCODE_BIND = 0x0002 # Boundary bars above & below the symbol and between stacked symbols */
+      BARCODE_BOX = 0x0004 # Box around symbol */
+      BARCODE_STDOUT = 0x0008 # Output to stdout */
+      READER_INIT = 0x0010 # Reader Initialisation (Programming) */
+      SMALL_TEXT = 0x0020 # Use smaller font */
+      BOLD_TEXT = 0x0040 # Use bold font */
+      CMYK_COLOUR = 0x0080 # CMYK colour space (Encapsulated PostScript and TIF) */
+      BARCODE_DOTTY_MODE = 0x0100 # Plot a matrix symbol using dots rather than squares */
+      GS1_GS_SEPARATOR = 0x0200 # Use GS instead of FNC1 as GS1 separator (Data Matrix) */
+      OUT_BUFFER_INTERMEDIATE = 0x0400 # Return ASCII values in bitmap buffer (OUT_BUFFER only) */
+      BARCODE_QUIET_ZONES = 0x0800 # Add compliant quiet zones (additional to any specified whitespace); Note: CODE16K, CODE49, CODABLOCKF, ITF14, EAN/UPC have default quiet zones */
+      BARCODE_NO_QUIET_ZONES = 0x1000 # Disable quiet zones, notably those with defaults as listed above */
+      COMPLIANT_HEIGHT = 0x2000 # Warn if height not compliant and use standard height (if any) as default */
     end
   end
 end

data/lib/zint/constants/symbologies.rb

@@ -35,25 +35,27 @@ module Zint
       BARCODE_UPCA_CHK = 35 #  UPC-A + Check Digit
       BARCODE_UPCE = 37 #  UPC-E
       BARCODE_UPCE_CHK = 38 #  UPC-E + Check Digit
-      BARCODE_POSTNET = 40 #  USPS POSTNET
+      BARCODE_POSTNET = 40 # USPS (U.S. Postal Service) POSTNET
       BARCODE_MSI_PLESSEY = 47 #  MSI Plessey
       BARCODE_FIM = 49 #  Facing Identification Mark
       BARCODE_LOGMARS = 50 #  LOGMARS
       BARCODE_PHARMA = 51 #  Pharmacode One-Track
       BARCODE_PZN = 52 #  Pharmazentralnummer
       BARCODE_PHARMA_TWO = 53 #  Pharmacode Two-Track
+      BARCODE_CEPNET = 54  # Brazilian CEPNet Postal Code
       BARCODE_PDF417 = 55 #  PDF417
       BARCODE_PDF417COMP = 56 #  Compact PDF417 (Truncated PDF417)
       BARCODE_PDF417TRUNC = 56 #  Legacy
       BARCODE_MAXICODE = 57 #  MaxiCode
       BARCODE_QRCODE = 58 #  QR Code
-      BARCODE_CODE128B = 60 #  Code 128 (Subset B)
+      BARCODE_CODE128AB = 60 #  Code 128 (Suppress subset C)
+      BARCODE_CODE128B = 60 # Legacy
       BARCODE_AUSPOST = 63 #  Australia Post Standard Customer
       BARCODE_AUSREPLY = 66 #  Australia Post Reply Paid
       BARCODE_AUSROUTE = 67 #  Australia Post Routing
       BARCODE_AUSREDIRECT = 68 #  Australia Post Redirection
       BARCODE_ISBNX = 69 #  ISBN
-      BARCODE_RM4SCC = 70 #  Royal Mail 4 State
+      BARCODE_RM4SCC = 70 #  Royal Mail 4-State Customer Code
       BARCODE_DATAMATRIX = 71 #  Data Matrix (ECC200)
       BARCODE_EAN14 = 72 #  EAN-14
       BARCODE_VIN = 73 #  Vehicle Identification Number
@@ -71,7 +73,7 @@ module Zint
       BARCODE_MICROPDF417 = 84 #  MicroPDF417
       BARCODE_USPS_IMAIL = 85 #  USPS Intelligent Mail (OneCode)
       BARCODE_ONECODE = 85 #  Legacy
-      BARCODE_PLESSEY = 86 #  Plessey Code
+      BARCODE_PLESSEY = 86 #  UK Plessey
 
       #  Tbarcode 8 codes
       BARCODE_TELEPEN_NUM = 87 #  Telepen Numeric
@@ -83,7 +85,7 @@ module Zint
       BARCODE_MICROQR = 97 #  Micro QR Code
 
       #  Tbarcode 9 codes
-      BARCODE_HIBC_128 = 98 #  HIBC Code 128
+      BARCODE_HIBC_128 = 98 #  HIBC (Health Industry Barcode) Code 128
       BARCODE_HIBC_39 = 99 #  HIBC Code 39
       BARCODE_HIBC_DM = 102 #  HIBC Data Matrix
       BARCODE_HIBC_QR = 104 #  HIBC QR Code
@@ -97,7 +99,10 @@ module Zint
       BARCODE_HANXIN = 116 #  Han Xin (Chinese Sensible) Code
 
       #  Tbarcode 11 codes
-      BARCODE_MAILMARK = 121 #  Royal Mail 4-state Mailmark
+      BARCODE_MAILMARK_2D = 119 # Royal Mail 2D Mailmark (CMDM) (Data Matrix)
+      BARCODE_UPU_S10 = 120 # Universal Postal Union S10
+      BARCODE_MAILMARK_4S = 121 # Royal Mail 4-State Mailmark
+      BARCODE_MAILMARK = 121 # Legacy
 
       #  Zint specific
       BARCODE_AZRUNE = 128 #  Aztec Runes
@@ -125,6 +130,8 @@ module Zint
       BARCODE_UPNQR = 143 #  UPNQR (Univerzalnega Plačilnega Naloga QR)
       BARCODE_ULTRA = 144 #  Ultracode
       BARCODE_RMQR = 145 #  Rectangular Micro QR Code (rMQR)
+      BARCODE_BC412 = 146 # IBM BC412 (SEMI T1-95)
+      BARCODE_LAST = 146 # Max barcode number marker, not barcode
     end
   end
 end

data/lib/zint/constants/warn_levels.rb

@@ -1,6 +1,6 @@
 module Zint
   module Constants
-    # Warning warn (`symbol->warn_level`)
+    # Warning level (`symbol->warn_level`)
     module WarnLevels
       WARN_DEFAULT = 0  # Default behaviour
       WARN_FAIL_ALL = 2 # Treat warning as error

data/lib/zint/daft.rb

@@ -1,7 +1,8 @@
 module Zint
+  # DAFT Code
   class Daft < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_DAFT, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_DAFT, **kwargs)
     end
   end
 end

data/lib/zint/data_matrix.rb

@@ -1,4 +1,5 @@
 module Zint
+  # Data Matrix (ECC200)
   class DataMatrix < Barcode
     # Options
     DM_NULL = 0
@@ -9,10 +10,10 @@ module Zint
     DM_EDIFACT = 5
     DM_BASE256 = 6
 
-    def initialize(value: nil, input_file: nil, type: Zint::BARCODE_DATAMATRIX, options: {})
-      raise ArgumentError, "Invalid type for DataMatrix code" unless [Zint::BARCODE_DATAMATRIX, Zint::BARCODE_HIBC_DM].include?(type)
+    def initialize(value: nil, input_file: nil, type: Zint::BARCODE_DATAMATRIX, symbology: type, **kwargs)
+      raise ArgumentError, "Invalid symbology for DataMatrix code" unless [Zint::BARCODE_DATAMATRIX, Zint::BARCODE_HIBC_DM].include?(symbology)
 
-      super(value: value, input_file: input_file, type: type, options: {option_3: Zint::DM_SQUARE}.merge(options))
+      super(value: value, input_file: input_file, symbology: symbology, option_3: Zint::DM_SQUARE, **kwargs)
     end
   end
 end

data/lib/zint/dbarexp.rb

@@ -1,7 +1,8 @@
 module Zint
+  # GS1 DataBar Expanded
   class DbarExp < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_DBAR_EXP, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_DBAR_EXP, **kwargs)
     end
   end
 end

data/lib/zint/dbarexpstk.rb

@@ -1,7 +1,8 @@
 module Zint
+  # GS1 DataBar Expanded Stacked
   class DbarExpstk < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_DBAR_EXPSTK, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_DBAR_EXPSTK, **kwargs)
     end
   end
 end

data/lib/zint/dbarltd.rb

@@ -1,7 +1,8 @@
 module Zint
+  #  GS1 DataBar Limited
   class DbarLtd < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_DBAR_LTD, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_DBAR_LTD, **kwargs)
     end
   end
 end

data/lib/zint/dbaromn.rb

@@ -1,7 +1,8 @@
 module Zint
+  # GS1 DataBar Omnidirectional
   class DbarOmn < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_DBAR_OMN, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_DBAR_OMN, **kwargs)
     end
   end
 end

data/lib/zint/dbaromnstk.rb

@@ -1,7 +1,8 @@
 module Zint
+  # GS1 DataBar Stacked Omnidirectional
   class DbarOmnstk < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_DBAR_OMNSTK, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_DBAR_OMNSTK, **kwargs)
     end
   end
 end

data/lib/zint/dbarstk.rb

@@ -1,7 +1,8 @@
 module Zint
+  # GS1 DataBar Stacked
   class DbarStk < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_DBAR_STK, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_DBAR_STK, **kwargs)
     end
   end
 end

data/lib/zint/dependencies.rb

@@ -1,8 +1,7 @@
 module Zint
-  ZINT_VERSION = ENV["ZINT_VERSION"] || "2.10.0"
-  # ZINT_SOURCE_URI = "file://#{File.join(File.expand_path("../../../", __FILE__))}/ports/archives/zint-#{ZINT_VERSION}-src.tar.gz"
+  ZINT_VERSION = ENV["ZINT_VERSION"] || "2.12.0"
   ZINT_SOURCE_URI = "https://downloads.sourceforge.net/zint/zint-#{ZINT_VERSION}-src.tar.gz"
-  ZINT_SOURCE_SHA1 = "e4a8a5ccbc9e1901e4b592ccc80e17184f2ff5e8"
+  ZINT_SOURCE_SHA1 = "6e16036d9822895edededd96e65da755ef3fdb69"
 
   MINI_PORTILE_VERSION = "~> 2.1"
 end

data/lib/zint/dot_code.rb

@@ -1,7 +1,8 @@
 module Zint
+  # DotCode
   class DotCode < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_DOTCODE, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_DOTCODE, **kwargs)
     end
   end
 end

data/lib/zint/dpd.rb

@@ -1,7 +1,8 @@
 module Zint
+  # DPD Code
   class Dpd < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_DPD, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_DPD, **kwargs)
     end
   end
 end

data/lib/zint/dpident.rb

@@ -1,7 +1,8 @@
 module Zint
+  # Deutsche Post Identcode
   class Dpident < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_DPIDENT, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_DPIDENT, **kwargs)
     end
   end
 end

data/lib/zint/dpleit.rb

@@ -1,7 +1,8 @@
 module Zint
+  # Deutsche Post Leitcode
   class Dpleit < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_DPLEIT, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_DPLEIT, **kwargs)
     end
   end
 end

data/lib/zint/ean128.rb

@@ -1,7 +1,8 @@
 module Zint
+  # Legacy
   class Ean128 < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_EAN128, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_EAN128, **kwargs)
     end
   end
 end

data/lib/zint/ean14.rb

@@ -1,7 +1,8 @@
 module Zint
+  # EAN-14
   class Ean14 < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_EAN14, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_EAN14, **kwargs)
     end
   end
 end

data/lib/zint/eanx.rb

@@ -1,7 +1,8 @@
 module Zint
+  # EAN (European Article Number)
   class Eanx < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_EANX, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_EANX, **kwargs)
     end
   end
 end

data/lib/zint/eanxchk.rb

@@ -1,7 +1,8 @@
 module Zint
+  # EAN + Check Digit
   class EanxChk < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_EANX_CHK, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_EANX_CHK, **kwargs)
     end
   end
 end

data/lib/zint/excode39.rb

@@ -1,7 +1,8 @@
 module Zint
+  #  Extended Code 39
   class Excode39 < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_EXCODE39, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_EXCODE39, **kwargs)
     end
   end
 end

data/lib/zint/fim.rb

@@ -1,7 +1,8 @@
 module Zint
+  # Facing Identification Mark
   class Fim < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_FIM, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_FIM, **kwargs)
     end
   end
 end

data/lib/zint/flat.rb

@@ -1,7 +1,8 @@
 module Zint
+  # Flattermarken
   class Flat < Barcode
-    def initialize(value: nil, input_file: nil, options: {})
-      super(value: value, input_file: input_file, type: Zint::BARCODE_FLAT, options: options)
+    def initialize(value: nil, input_file: nil, **kwargs)
+      super(value: value, input_file: input_file, symbology: Zint::BARCODE_FLAT, **kwargs)
     end
   end
 end