T - thermal media type -- fix tu use ribbon

diff --git a/bin/debian-install.sh b/bin/debian-install.sh
index a88040e..fd139ef 100755 (executable)
--- a/bin/debian-install.sh
+++ b/bin/debian-install.sh
@@ -3,4 +3,5 @@
 sudo apt-get install ttf-mscorefonts-installer librsvg2-bin netpbm rlpr libdata-dump-perl
 
 # install font system-wide
-sudo ln -s `pwd`/fonts/AdvCBe.ttf /usr/share/fonts/truetype/
+#sudo ln -s `pwd`/fonts/AdvCBe.ttf /usr/share/fonts/truetype/
+sudo ls `pwd`/fonts/*.ttf | xargs -i ln -sfv {} /usr/share/fonts/truetype/

diff --git a/fonts/AdvCBe.ttf b/fonts/AdvCBe.ttf
deleted file mode 100644 (file)
index d5b6277..0000000
Binary files a/fonts/AdvCBe.ttf and /dev/null differ

diff --git a/fonts/CodabarLarge.ttf b/fonts/CodabarLarge.ttf
new file mode 100644 (file)
index 0000000..6b64f97
Binary files /dev/null and b/fonts/CodabarLarge.ttf differ

diff --git a/fonts/CodabarMedium.ttf b/fonts/CodabarMedium.ttf
new file mode 100644 (file)
index 0000000..872bbe6
Binary files /dev/null and b/fonts/CodabarMedium.ttf differ

diff --git a/pbm2ZPL.pl b/pbm2ZPL.pl
index 8b9c887..01ab6eb 100755 (executable)
--- a/pbm2ZPL.pl
+++ b/pbm2ZPL.pl
@@ -60,7 +60,7 @@ printf '~TA%03d', 0; # tear-off
 print '~JSN'; # sensor detect N = normal, 90%
 #print '^LT18'; # label top -120 .. 120
 print '^MNW'; # media tracking N = continuous Y/W = web sensing M = mark sensing
-print '^MTD'; # media type T = termal D = direct (ribbon!)
+print '^MTT'; # media type T = termal (ribbon) D = direct (termal paper)
 print '^PON'; # print orientation N = normal I = invert
 print '^PMN'; # print mirror Y/N
 print '^LH0,0'; # label home x,y

diff --git a/templates/105x40.svg b/templates/105x40.svg
index b0214dc..1312c2f 100644 (file)
--- a/templates/105x40.svg
+++ b/templates/105x40.svg
@@ -14,7 +14,7 @@
    height="141.73228"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="105x40.svg"
    inkscape:export-filename="/home/dpavlin/Downloads/S4M/s4m-naljepnica-105x40.png"
    inkscape:export-xdpi="150"
@@ -28,19 +28,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="9.5794286"
+     inkscape:zoom="4.7897143"
      inkscape:cx="151.79507"
-     inkscape:cy="9.921498"
+     inkscape:cy="82.636539"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="true"
      units="mm"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:window-width="1278"
-     inkscape:window-height="1003"
-     inkscape:window-x="1280"
-     inkscape:window-y="19"
+     inkscape:window-width="1912"
+     inkscape:window-height="1018"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
      inkscape:window-maximized="0"
      borderlayer="false">
     <sodipodi:guide
@@ -168,17 +168,17 @@
          style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold">1301272944</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:15.15446377px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:AdvCBe;-inkscape-font-specification:AdvCBe"
-       x="927.5907"
-       y="-36.822033"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:25.85527802px;line-height:125%;font-family:AdvCBe;-inkscape-font-specification:AdvCBe;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+       x="1579.1284"
+       y="-21.582371"
        id="text3000"
        sodipodi:linespacing="125%"
-       transform="matrix(0,0.98930658,-1.010809,0,0,0)"><tspan
+       transform="matrix(0,0.57985883,-1.7245577,0,0,0)"><tspan
          sodipodi:role="line"
          id="tspan3002"
-         x="927.5907"
-         y="-36.822033"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:AdvCBe;-inkscape-font-specification:AdvCBe">A1301272944B</tspan></text>
+         x="1579.1284"
+         y="-21.582371"
+         style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:29.85703468px;font-family:CodabarMedium;-inkscape-font-specification:'CodabarMedium Medium'">A1301272944B</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:120%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:AdvCBe;-inkscape-font-specification:AdvCBe"