pst-barcode (16nov12)

git-svn-id: svn://tug.org/texlive/trunk@28278 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 21 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-barcode/Changes b/Master/texmf-dist/doc/generic/pst-barcode/Changes
index 5deaf6b3c0a..1a5c3f1b20e 100644
--- a/Master/texmf-dist/doc/generic/pst-barcode/Changes
+++ b/Master/texmf-dist/doc/generic/pst-barcode/Changes
@@ -15,6 +15,8 @@
 
 
 ----- pst-barcode.pro
+2012-11-15 - renlinear was modified to avoid a clash with a 
+             predefined name in Distiller.
 2012-06-26 - The QR Code encoder was modified so that Micro QR Code 
              symbols do not require the use of raw mode. 
            - Support for the alphanumeric, numeric, and kanji encodings
diff --git a/Master/texmf-dist/doc/generic/pst-barcode/pst-barcode-doc.pdf b/Master/texmf-dist/doc/generic/pst-barcode/pst-barcode-doc.pdf
index 3825bf8d445..d422fbbe33e 100644
--- a/Master/texmf-dist/doc/generic/pst-barcode/pst-barcode-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-barcode/pst-barcode-doc.pdf
diff --git a/Master/texmf-dist/dvips/pst-barcode/pst-barcode.pro b/Master/texmf-dist/dvips/pst-barcode/pst-barcode.pro
index 453d96fbc1b..429b300be0e 100644
--- a/Master/texmf-dist/dvips/pst-barcode/pst-barcode.pro
+++ b/Master/texmf-dist/dvips/pst-barcode/pst-barcode.pro
@@ -3,11 +3,13 @@
 %%DocumentPaperSizes: a4
 %%EndComments
 
-% Barcode Writer in Pure PostScript - Version 2012-06-26
+% Barcode Writer in Pure PostScript - Version 2012-11-15
 % http://www.terryburton.co.uk/barcodewriter/
 %
 % Copyright (c) 2004-2012 Terry Burton
 %
+% $Id: barcode.ps 2399 2012-11-15 13:18:46Z terry.burton $
+%
 % Permission is hereby granted, free of charge, to any
 % person obtaining a copy of this software and associated
 % documentation files (the "Software"), to deal in the
@@ -205,11 +207,11 @@ begin
     textcolor (unset) ne { textcolor setanycolor } if
     includetext {
         textxalign (unset) eq textyalign (unset) eq and alttext () eq and {
-            /s 0 def /f () def
+            /s 0 def /fn () def
             txt {
                 {} forall
-                2 copy s ne exch f ne or {
-                    2 copy /s exch def /f exch def            
+                2 copy s ne exch fn ne or {
+                    2 copy /s exch def /fn exch def            
                     exch findfont exch scalefont setfont          
                 } {
                     pop pop
@@ -666,7 +668,7 @@ end
 % --BEGIN ENCODER ean13--
 % --SUGGESTS ean5 ean2--
 % --DESC: EAN-13
-% --EXAM: 977147396801
+% --EXAM: 2071473968010
 % --EXOP: includetext guardwhitespace
 % --RNDR: renlinear
 /setpacking where {pop currentpacking true setpacking} if
@@ -1033,7 +1035,7 @@ end
 % --BEGIN ENCODER upca--
 % --SUGGESTS ean5 ean2--
 % --DESC: UPC-A
-% --EXAM: 78858101497
+% --EXAM: 488581014973
 % --EXOP: includetext
 % --RNDR: renlinear
 /setpacking where {pop currentpacking true setpacking} if
@@ -1214,7 +1216,7 @@ end
 % --BEGIN ENCODER upce--
 % --SUGGESTS ean5 ean2--
 % --DESC: UPC-E
-% --EXAM: 0123456
+% --EXAM: 00123457
 % --EXOP: includetext height=0.4
 % --RNDR: renlinear
 /setpacking where {pop currentpacking true setpacking} if
@@ -11784,8 +11786,8 @@ begin
     /i 0 def
     { % loop
         /m metrics i get def
-        /c    m 0 get def        % Rows in symbol
-        /r    m 1 get def        % Columns in symbol
+        /c    m 0 get def        % Columns in symbol
+        /r    m 1 get def        % Rows in symbol
         /k    m 2 get def        % Error correction codewords
         /rapl m 3 get def        % Left row address pattern
         /rapc m 4 get def        % Centre row address pattern
@@ -15533,7 +15535,7 @@ end
 % --REQUIRES ean13 micropdf417 pdf417 gs1-cc--
 % --SUGGESTS ean5 ean2--
 % --DESC: EAN-13 Composite
-% --EXAM: 331234567890|(99)1234-abcd
+% --EXAM: 2112345678900|(99)1234-abcd
 % --EXOP: includetext
 % --RNDR: renlinear renmatrix
 /setpacking where {pop currentpacking true setpacking} if
@@ -15613,7 +15615,7 @@ end
 % --REQUIRES ean8 micropdf417 pdf417 gs1-cc--
 % --SUGGESTS ean5 ean2--
 % --DESC: EAN-8 Composite
-% --EXAM: 12345670|(21)A12345678
+% --EXAM: 02345673|(21)A12345678
 % --EXOP: includetext
 % --RNDR: renlinear renmatrix
 /setpacking where {pop currentpacking true setpacking} if
@@ -15696,7 +15698,7 @@ end
 % --REQUIRES upca micropdf417 pdf417 gs1-cc--
 % --SUGGESTS ean5 ean2--
 % --DESC: UPC-A Composite
-% --EXAM: 01600033610|(99)1234-abcd
+% --EXAM: 416000336108|(99)1234-abcd
 % --EXOP: includetext
 % --RNDR: renlinear renmatrix
 /setpacking where {pop currentpacking true setpacking} if
@@ -15776,7 +15778,7 @@ end
 % --REQUIRES upce micropdf417 pdf417 gs1-cc--
 % --SUGGESTS ean5 ean2--
 % --DESC: UPC-E Composite
-% --EXAM: 0121230|(15)021231
+% --EXAM: 00123457|(15)021231
 % --EXOP: includetext
 % --RNDR: renlinear renmatrix
 /setpacking where {pop currentpacking true setpacking} if
diff --git a/Master/texmf-dist/source/generic/pst-barcode/Makefile b/Master/texmf-dist/source/generic/pst-barcode/Makefile
index a739a8a6c13..e48c015b1e8 100644
--- a/Master/texmf-dist/source/generic/pst-barcode/Makefile
+++ b/Master/texmf-dist/source/generic/pst-barcode/Makefile
@@ -38,7 +38,7 @@ $(MAIN).dvi : $(MAIN).tex
 	$(LATEX) $<
 
 clean : 
-	$(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out )
+	$(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg)
 	$(RM) $(addprefix $(MAIN), .dvi .ps)
 
 veryclean : clean
diff --git a/Master/texmf-dist/tex/generic/pst-barcode/pst-barcode.tex b/Master/texmf-dist/tex/generic/pst-barcode/pst-barcode.tex
index 43d0f4f18b5..ca56ac4459b 100644
--- a/Master/texmf-dist/tex/generic/pst-barcode/pst-barcode.tex
+++ b/Master/texmf-dist/tex/generic/pst-barcode/pst-barcode.tex
@@ -19,8 +19,8 @@
 \let\PSTBarcodeLoaded\endinput
 \ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
 %
-\def\fileversion{0.09}
-\def\filedate{2012/06/25}
+\def\fileversion{0.10}
+\def\filedate{2012/11/16}
 \message{`PST-barcode' v\fileversion, \filedate\space (tb,hv)}
 %
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
diff --git a/Master/texmf-dist/tex/latex/pst-barcode/pst-barcode.sty b/Master/texmf-dist/tex/latex/pst-barcode/pst-barcode.sty
index 34e80d319f1..ed02c1e4a1b 100644
--- a/Master/texmf-dist/tex/latex/pst-barcode/pst-barcode.sty
+++ b/Master/texmf-dist/tex/latex/pst-barcode/pst-barcode.sty
@@ -1,5 +1,5 @@
 \RequirePackage{pstricks}
-\ProvidesPackage{pst-barcode}[2006/07/23 package wrapper for 
+\ProvidesPackage{pst-barcode}[2012/11/16 package wrapper for 
   pst-barcode.tex (hv)]
 \input{pst-barcode.tex}
 \ProvidesFile{pst-barcode.tex}