acro (17jun13)

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

1 files changed, 44 insertions, 31 deletions

diff --git a/Master/texmf-dist/tex/latex/acro/acro.sty b/Master/texmf-dist/tex/latex/acro/acro.sty
index c0a3d366e30..a95a4e64c22 100644
--- a/Master/texmf-dist/tex/latex/acro/acro.sty
+++ b/Master/texmf-dist/tex/latex/acro/acro.sty
@@ -31,8 +31,8 @@
 \RequirePackage{expl3,xparse,l3keys2e,xtemplate}
 \ProvidesExplPackage
   {acro}
-  {2013/05/09}
-  {1.3a}
+  {2013/06/16}
+  {1.3c}
   {Typeset Acronyms}
 
 % --------------------------------------------------------------------------
@@ -1368,6 +1368,7 @@
 
 \cs_new_protected:Npn \acro_get:n #1
   {
+    \leavevmode
     \acro_defined:n { #1 }
     \__acro_activate_hyperref_support:
     \prop_get:NnNF \l__acro_short_prop { #1 } \l__acro_tmpa_tl {}
@@ -1424,32 +1425,36 @@
         )
       }
       {
-        \bool_if:NTF \l__acro_mark_as_used_bool
-          {
-            \iow_shipout_x:Nn \@auxout
-              {
-                \token_to_str:N \acro@used@twice { #1 }
-                  { \thepage }
-                  { \arabic{page} }
-                  { \arabic{abspage} }
-              }
-          }
-          {
-            \iow_shipout_x:Nn \@auxout
-              { \token_to_str:N \acro@used@twice { #1 } {} {} {} }
-          }
+        \if@filesw
+          \bool_if:NTF \l__acro_mark_as_used_bool
+            {
+              \iow_shipout_x:Nn \@auxout
+                {
+                  \token_to_str:N \acro@used@twice { #1 }
+                    { \thepage }
+                    { \arabic{page} }
+                    { \arabic{abspage} }
+                }
+            }
+            {
+              \iow_shipout_x:Nn \@auxout
+                { \token_to_str:N \acro@used@twice { #1 } {} {} {} }
+            }
+        \fi
         \prg_return_true:
       }
       {
         \bool_if:NTF \l__acro_mark_as_used_bool
           {
-            \iow_shipout_x:Nn \@auxout
-              {
-                \token_to_str:N \acro@used@once { #1 }
-                  { \thepage }
-                  { \arabic{page} }
-                  { \arabic{abspage} }
-              }
+            \if@filesw
+              \iow_shipout_x:Nn \@auxout
+                {
+                  \token_to_str:N \acro@used@once { #1 }
+                    { \thepage }
+                    { \arabic{page} }
+                    { \arabic{abspage} }
+                }
+            \fi
             \bool_if:nT
               {
                 !\bool_if_p:c { g__acro_#1_label_bool } &&
@@ -1462,8 +1467,10 @@
             \bool_gset_true:c { g__acro_#1_used_bool }
           }
           {
-            \iow_shipout_x:Nn \@auxout
-             { \token_to_str:N \acro@used@once { #1 } {} {} {} }
+            \if@filesw
+              \iow_shipout_x:Nn \@auxout
+                { \token_to_str:N \acro@used@once { #1 } {} {} {} }
+            \fi
           }
         \prg_return_false:
       }
@@ -1502,16 +1509,19 @@
       {
         \seq_if_empty:cF { g__acro_#1_pages_seq }
           {
-            \iow_shipout_x:Nn \@auxout
-              {
-                \token_to_str:N \acro@pages { #1 }
-                  { \seq_use:cnnn { g__acro_#1_pages_seq } { | } { | } { | } }
-              }
+            \if@filesw
+              \iow_shipout_x:Nn \@auxout
+                {
+                  \token_to_str:N \acro@pages { #1 }
+                    { \seq_use:cnnn { g__acro_#1_pages_seq } { | } { | } { | } }
+                }
+            \fi
           }
       }
   }
 
 % if `acro' is deactivated prevent unnecessary errors from aux file:
+\if@filesw
 \AtBeginDocument
   {
     \iow_now:Nx \@auxout
@@ -1521,6 +1531,7 @@
         \token_to_str:N \providecommand \token_to_str:N \acro@pages [2] {}
       }
   }
+\fi
 
 % --------------------------------------------------------------------------
 \cs_new:Npn \acro_after:n #1
@@ -2354,6 +2365,8 @@
                  - cleaned the sty file, added a few more comments
 2013/05/09 v1.3a - Bug fix: corrected wrong argument checking in \Ac, thanks
                    to Michel Voßkuhle
+2013/05/30 v1.3b - obey \if@filesw
+2013/06/16 v1.3c - added \leavevmode to \acro_get:n
 
 % --------------------------------------------------------------------------
 % TODO:
@@ -2362,4 +2375,4 @@
   this probably needs a handfull of macros that give access to the entries
   without worrying about internals
 - add \ACF, \ACFP, \ACL and \ACLP that will print all words of the long form
-  capitalized
\ No newline at end of file
+  capitalized