acro (13aug16)

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

4 files changed, 31 insertions, 36 deletions

diff --git a/Master/texmf-dist/doc/latex/acro/README b/Master/texmf-dist/doc/latex/acro/README
index 8033cec3214..413f49ada42 100644
--- a/Master/texmf-dist/doc/latex/acro/README
+++ b/Master/texmf-dist/doc/latex/acro/README
@@ -1,9 +1,9 @@
 --------------------------------------------------------------------------
-the ACRO package v2.6
+the ACRO package v2.6b
 
   Typeset Acronyms
 
-2016/07/20
+2016/08/13
 --------------------------------------------------------------------------
 Clemens Niederberger
 Web:    http://www.mychemistry.eu/forums/forum/acro/
diff --git a/Master/texmf-dist/doc/latex/acro/acro_en.pdf b/Master/texmf-dist/doc/latex/acro/acro_en.pdf
index e7adbbbc472..c37fa11a8fb 100644
--- a/Master/texmf-dist/doc/latex/acro/acro_en.pdf
+++ b/Master/texmf-dist/doc/latex/acro/acro_en.pdf
diff --git a/Master/texmf-dist/doc/latex/acro/acro_en.tex b/Master/texmf-dist/doc/latex/acro/acro_en.tex
index 02adea8cd85..4a54d178982 100644
--- a/Master/texmf-dist/doc/latex/acro/acro_en.tex
+++ b/Master/texmf-dist/doc/latex/acro/acro_en.tex
@@ -347,7 +347,7 @@ documentation.
     The plural ending appended to the short form.
   %% short-plural-form
   \keyval{short-plural-form}{text}
-    The\sinceversion{2.0}plural short form of the acronym; replaces the short
+    The\sinceversion{2.0} plural short form of the acronym; replaces the short
     form when used instead of appending the plural ending.
   %% long-plural
   \keyval{long-plural}{text}\Default{s}
@@ -361,7 +361,7 @@ documentation.
     The\sinceversion{2.0} plural ending appended to the alternative form.
   %% alt-plural-form
   \keyval{alt-plural-form}{text}
-    The\sinceversion{2.0}plural alternative form of the acronym; replaces the
+    The\sinceversion{2.0} plural alternative form of the acronym; replaces the
     alternative form when used instead of appending the plural ending.
   %% list
   \keyval{list}{text}
diff --git a/Master/texmf-dist/tex/latex/acro/acro.sty b/Master/texmf-dist/tex/latex/acro/acro.sty
index c2871989966..0e4549ea47c 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,l3sort,xparse,l3keys2e,xtemplate,etoolbox}
 \ProvidesExplPackage
   {acro}
-  {2016/07/20}
-  {2.6}
+  {2016/08/13}
+  {2.6a}
   {Typeset Acronyms}
 
 % --------------------------------------------------------------------------
@@ -581,6 +581,9 @@
         \cs_new_eq:NN \acro_xspace: \xspace
       }
       { \cs_new:Npn \acro_xspace: {} }
+    \@ifpackageloaded {biblatex}
+      { \acro_reset_all: }
+      { }
   }
 
 % --------------------------------------------------------------------------
@@ -611,12 +614,25 @@
   { \UseInstance {acro-list} {#1} {#2} {#3} }
 \cs_generate_variant:Nn \acro_list_instance:nnn {VVV}
 
-\cs_new_protected:Npn \acro_first_instance:nnn #1#2#3
+\cs_new_protected:Npn \acro_first_instance:nn #1#2
   {
-    \acro_if_defined:nT {#2}
-      { \UseInstance {acro-first} {#1} {#2} {#3} }
+    \tl_if_blank:VF \l__acro_first_style_tl
+      {
+        \tl_set_eq:NN
+          \l__acro_first_instance_tl
+          \l__acro_first_style_tl
+      }
+    \acro_if_defined:nT {#1}
+      {
+        \use:x {
+          \UseInstance {acro-first}
+            { \exp_not:V \l__acro_first_instance_tl }
+            { \exp_not:n {#1} }
+            { \exp_not:n {#2} }
+          }
+      }
   }
-\cs_generate_variant:Nn \acro_first_instance:nnn {Vn,VnV}
+\cs_generate_variant:Nn \acro_first_instance:nn {nV}
   
 % --------------------------------------------------------------------------
 % hyperref support
@@ -1939,18 +1955,7 @@
         \bool_gset_true:c { g__acro_#1_first_use_bool }
         \acro_if_is_single:nTF {#1}
           { \acro_single:n {#1} }
-          {
-            \tl_if_blank:VF \l__acro_first_style_tl
-              {
-                \tl_set_eq:NN
-                  \l__acro_first_instance_tl
-                  \l__acro_first_style_tl
-              }
-            \acro_first_instance:VnV
-              \l__acro_first_instance_tl
-              {#1}
-              \l__acro_long_tl
-          }
+          { \acro_first_instance:nV {#1} \l__acro_long_tl }
       }
   }
 
@@ -1997,10 +2002,7 @@
             }
           \tl_if_blank:VT \l__acro_single_tl
             { \tl_set_eq:NN \l__acro_single_tl \l__acro_long_tl }
-          \acro_first_instance:VnV
-            \l__acro_first_instance_tl
-            {#1}
-            \l__acro_single_tl
+          \acro_first_instance:nV {#1} \l__acro_single_tl
         }
       }
       { % other (e.g. short)
@@ -2744,14 +2746,7 @@
     \acro_is_used:n {#1}
     \acro_if_is_single:nT {#1}
       { \cs_set_eq:NN \acro_hyper_link:nn \use_ii:nn }
-    \tl_if_blank:VF \l__acro_first_style_tl
-      {
-        \tl_set_eq:NN
-          \l__acro_first_instance_tl
-          \l__acro_first_style_tl
-      }
-    \acro_first_instance:VnV
-      \l__acro_first_instance_tl
+    \acro_first_instance:nV
       {#1}
       \l__acro_long_tl
   }
@@ -2766,8 +2761,7 @@
     \acro_is_used:n {#1}
     \acro_if_is_single:nT {#1}
       { \cs_set_eq:NN \acro_hyper_link:nn \use_ii:nn }
-    \acro_first_instance:Vnn
-      \l__acro_first_instance_tl
+    \acro_first_instance:nn
       {#1}
       {#2}
   }
@@ -4478,6 +4472,7 @@
                  - fix issue #74
                  - fix error: acronyms with same sort entry are not
                    overwritten any more in the list of acronyms
+2016/08/13 v2.6a - fix issues #80 and #81
 
 % --------------------------------------------------------------------------
 % TODO: