GS1 (16jul17)

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

2 files changed, 7 insertions, 10 deletions

diff --git a/Master/texmf-dist/tex/latex/GS1/GS1.sty b/Master/texmf-dist/tex/latex/GS1/GS1.sty
index 7c97bf56eee..38bf5e22a75 100644
--- a/Master/texmf-dist/tex/latex/GS1/GS1.sty
+++ b/Master/texmf-dist/tex/latex/GS1/GS1.sty
@@ -16,7 +16,7 @@
 %% 
 %% Do not distribute modified version of this file.
 %% 
-%% File: GS1.dtx Copyright (C) 2012 Markus Kohm
+%% File: GS1.dtx Copyright (C) 2012-2017 Markus Kohm
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -31,12 +31,11 @@
 %% The released version of this bundle is available from CTAN.
 %%
 %% -------------------------------------------------------------------------
-\RequirePackage{expl3}
-\GetIdInfo$Id: GS1.dtx 15 2012-08-27 10:25:03Z mjk $
+\RequirePackage{expl3}[2017/05/29]
+\GetIdInfo$Id: GS1.dtx 22 2017-07-15 18:03:18Z mjk $
   {GS1 code handler and barcode generator}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\RequirePackage{expl3}[2012/07/16]
 \RequirePackage{rule-D}
 \cs_new_nopar:Npn \__GS_new_seq_c:cn #1#2
   {
@@ -119,7 +118,6 @@
     nor~a~EAN-13~with~or~without~control~digit.\\\\
     The~GS1~module~currently~only~supports~EAN-8~and~EAN~13.
   }
-
 \msg_new:nnn { GS1 } { module/minwidth }
   {
     Resulting~module~width~is~less~than~allowed~minimum~\msg_line_context:.\\\\
@@ -143,7 +141,7 @@
   }
 \cs_new_nopar:Npn \GS_cut_EAN_control_digit:N #1
   {
-    \int_case:nnn
+    \int_case:nnF
       { \seq_count:N #1 }
       {
         {  7 } {  }
diff --git a/Master/texmf-dist/tex/latex/GS1/rule-D.sty b/Master/texmf-dist/tex/latex/GS1/rule-D.sty
index ff5e3f8a5fc..a8c5cb1300d 100644
--- a/Master/texmf-dist/tex/latex/GS1/rule-D.sty
+++ b/Master/texmf-dist/tex/latex/GS1/rule-D.sty
@@ -31,20 +31,19 @@
 %% The released version of this bundle is available from CTAN.
 %%
 %% -------------------------------------------------------------------------
-\RequirePackage{expl3}
-\GetIdInfo$Id: rule-D.dtx 15 2012-08-27 10:25:03Z mjk $
+\RequirePackage{expl3}[2017/05/29]
+\GetIdInfo$Id: rule-D.dtx 22 2017-07-15 18:03:18Z mjk $
   {rule functions for LaTeX3}
 \ProvidesExplPackage
   {rule-D} {\ExplFileDate} {\ExplFileVersion}
   {experimental~L3~rule~functions}
-\RequirePackage{expl3}
 \cs_new:Npn \rule:nn #1#2
   {
     \rule:nnn { \c_zero_dim } { #1 } { #2 }
   }
 \cs_new:Npn \rule:nnn #1#2#3
   {
-    \leavevmode
+    \hbox_unpack_clear:N \c_empty_box
     \hbox:n
       {
         \tex_vrule:D width \dim_eval:n { #2 }