acro (19dec13)

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

5 files changed, 61 insertions, 14 deletions

diff --git a/Master/texmf-dist/doc/latex/acro/README b/Master/texmf-dist/doc/latex/acro/README
index 3779d2da094..7c51cfd3838 100644
--- a/Master/texmf-dist/doc/latex/acro/README
+++ b/Master/texmf-dist/doc/latex/acro/README
@@ -1,9 +1,9 @@
 --------------------------------------------------------------------------
-the ACRO package v1.4c
+the ACRO package v1.5
 
   Typeset Acronyms
 
-2013/11/04
+2013/12/18
 --------------------------------------------------------------------------
 Clemens Niederberger
 Web:    https://bitbucket.org/cgnieder/acro/
diff --git a/Master/texmf-dist/doc/latex/acro/acro_en.pdf b/Master/texmf-dist/doc/latex/acro/acro_en.pdf
index e084157c1f4..76a82c0cbc4 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 efa91ee416e..043c6d5ad90 100644
--- a/Master/texmf-dist/doc/latex/acro/acro_en.tex
+++ b/Master/texmf-dist/doc/latex/acro/acro_en.tex
@@ -917,12 +917,22 @@ There are a few options which change the general behaviour of \acro.
     If set to \code{true} the short forms of the acronyms will be linked to
     their list entry.
   %%
+  \keybool{label}\Default{false}
+    \sinceversion{1.5}If set to \code{true} this option will place
+    \cs*{label}\Marg{\meta{prefix}\meta{id}} the first time the acronym with
+    \ac{id} \meta{id} is used.
+  %%
+  \keyval{label-prefix}{text}\Default{ac:}
+    \sinceversion{1.5}The prefix for the \cs*{label} that is placed when
+    option \keyis{label}{true} is used.
+  %%
   \keybool{record-pages}\Default{true}
     Since \acro\ can handle arabic, roman and Roman page numbers but
     \emph{not} any other kind of numbering this option allows to turn the page
     number recording off for these cases as it would lead to errors else.
     This affects the whole document and can only be set in the preamble!  It
     means you cannot have page numbers in the list of acronyms in this case.
+    Or rather: you can if you use \keyis{pages}{first}.
   %%
   \keybool{only-used}\Default{true}
     This option is \code{true} as default.  It means that only acronyms that
@@ -1086,10 +1096,15 @@ possible output forms of the acronyms.
     this is an experimental feature and might fail in quite a number of cases.
     If you notice anything please send me an email!
   %%
+  \keychoice{pages}{all,first}\Default{all}
+    \sinceversion{1.5}If the option \option{page-ref} has any value other than
+    \code{none} this option determines wether all usages of the acronyms are
+    listed or only the first time.  Implicitly sets \keyis{label}{true}.
   \keyval{page-name}{page name}\Default{p.\cs*{@}\cs*{,}}
     The ``name'' of the page label.  This is automatically translated to the
     active language. However for the time being there are many translations
     missing, yet.  Please notify me if you find your language missing.
+  %%
   \keyval{pages-name}{page name plural}\Default{pp.\cs*{@}\cs*{,}}
     \sinceversion{1.0}The ``name'' of the page label when there are more than
     one page.  This is automatically translated to the active language.
diff --git a/Master/texmf-dist/tex/latex/acro/acro.sty b/Master/texmf-dist/tex/latex/acro/acro.sty
index bdbda639524..dcde7bebdb4 100644
--- a/Master/texmf-dist/tex/latex/acro/acro.sty
+++ b/Master/texmf-dist/tex/latex/acro/acro.sty
@@ -28,11 +28,11 @@
 % If you have any ideas, questions, suggestions or bugs to report, please
 % feel free to contact me.
 % --------------------------------------------------------------------------
-\RequirePackage{expl3,xparse,l3keys2e,xtemplate}
+\RequirePackage{expl3,l3sort,xparse,l3keys2e,xtemplate}
 \ProvidesExplPackage
   {acro}
-  {2013/11/04}
-  {1.4c}
+  {2013/12/18}
+  {1.5}
   {Typeset Acronyms}
 
 % --------------------------------------------------------------------------
@@ -171,6 +171,9 @@
 \bool_new:N      \l__acro_extra_punct_bool
 \bool_new:N      \l__acro_extra_use_brackets_bool
 \bool_new:N      \l__acro_in_list_bool
+\bool_new:N      \l__acro_place_label_bool
+\bool_new:N      \l__acro_list_all_pages_bool
+\bool_set_true:N \l__acro_list_all_pages_bool
 
 % --------------------------------------------------------------------------
 % token list variables:
@@ -238,6 +241,8 @@
 \tl_new:N   \l__acro_index_format_tl
 \tl_new:N   \l__acro_acc_supp_tl
 \tl_new:N   \l__acro_acc_supp_options_tl
+\tl_new:N   \l__acro_label_prefix_tl
+\tl_set:Nn  \l__acro_label_prefix_tl { ac: }
 
 % --------------------------------------------------------------------------
 % comma list variables
@@ -342,6 +347,14 @@
     single            .bool_set:N = \l__acro_use_single_bool        ,
     first-style       .tl_set:N   = \l__acro_first_instance_tl      ,
     extra-style       .tl_set:N   = \l__acro_extra_instance_tl      ,
+    label             .bool_set:N = \l__acro_place_label_bool       ,
+    label-prefix      .tl_set:N   = \l__acro_label_prefix_tl        ,
+    pages             .choice: ,
+    pages / all       .code:n     =
+      \bool_set_true:N \l__acro_list_all_pages_bool                 ,
+    pages / first     .code:n     =
+      \bool_set_true:N \l__acro_place_label_bool
+      \bool_set_false:N \l__acro_list_all_pages_bool                ,
     page-ref          .tl_set:N   = \l__acro_page_instance_tl       ,
     page-name         .tl_set:N   = \l__acro_page_name_tl           ,
     pages-name        .tl_set:N   = \l__acro_pages_name_tl          ,
@@ -367,9 +380,9 @@
     only-used         .bool_set:N = \l__acro_print_only_used_bool   ,
     mark-as-used      .choice: ,
     mark-as-used / first .code:n  =
-      \bool_gset_true:N \g__acro_mark_first_as_used_bool             ,
+      \bool_gset_true:N \g__acro_mark_first_as_used_bool            ,
     mark-as-used / any   .code:n  =
-      \bool_gset_false:N \g__acro_mark_first_as_used_bool            ,
+      \bool_gset_false:N \g__acro_mark_first_as_used_bool           ,
     plural-ending     .tl_set:N   = \l__acro_default_plural_tl      ,
     list-caps         .bool_set:N = \l__acro_capitalize_list_bool   ,
     cite              .choice:                                      ,
@@ -897,7 +910,12 @@
 
 \AtBeginDocument
   {
-    \tl_if_eq:NNT \l__acro_active_version_tl \l__acro_version_zero_tl
+    \bool_if:nT
+      {
+        \tl_if_eq_p:NN \l__acro_active_version_tl \l__acro_version_zero_tl
+        ||
+        !\l__acro_list_all_pages_bool
+      }
       {
         \cs_set:Npn \acro_print_page_numbers:n #1
           {
@@ -905,7 +923,7 @@
             \skip_horizontal:N \l__acro_page_space_dim
             \acro_no_break:
             \tl_use:N \l__acro_page_name_tl
-            \pageref{ac:#1}
+            \pageref{\l__acro_label_prefix_tl #1}
           }
       }
   }
@@ -1495,11 +1513,17 @@
             \bool_if:nT
               {
                 !\bool_if_p:c { g__acro_#1_label_bool } &&
-                \tl_if_eq_p:NN \l__acro_active_version_tl \l__acro_version_zero_tl
+                (
+                  \tl_if_eq_p:NN
+                    \l__acro_active_version_tl
+                    \l__acro_version_zero_tl
+                  ||
+                  \l__acro_place_label_bool
+                )
               }
               {
                 \bool_gset_true:c { g__acro_#1_label_bool }
-                \label{ac:#1}
+                \label{\l__acro_label_prefix_tl #1}
               }
             \bool_gset_true:c { g__acro_#1_used_bool }
           }
@@ -1775,7 +1799,6 @@
   {
     \bool_if:NT \l__acro_sort_bool
       {
-        \RequirePackage { l3sort }
         \cs_new_protected:Npn \acro_sort_prop:N #1
           {
             \seq_clear:N  \l__acro_tmpa_seq
@@ -1789,7 +1812,7 @@
             \seq_sort:Nn \l__acro_tmpa_seq
               {
                 \tl_to_lowercase:n {
-                  \int_compare:nTF { \pdfstrcmp { ##1 } { ##2 } = -1 }
+                  \int_compare:nTF { \pdftex_strcmp:D { ##1 } { ##2 } = -1 }
                     { \sort_ordered: }
                     { \sort_reversed: }
                 }
@@ -2446,6 +2469,15 @@
 2013/11/04 v1.4c - remove \hbox from the written short form
                  - changed \__acro_make_link:nNN in a way that it doesn't box
                    its when links are deactivated
+2013/11/22 v1.4d - require `l3sort' independently from the `sort' option
+                   instead of at begin document in order to avoid conflicts
+                   with `babel' and `french'
+2013/12/18 v1.5  - new option `label=true|false' that
+                   places \label{<prefix>:<id>} the first time an acronym is
+                   used
+                 - new option `pages=first|all' that determines if in the list
+                   of acronyms all appearances are listed or only the first
+                   time; implicitly sets `label=true'
 
 % --------------------------------------------------------------------------
 % TODO:
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 8259023cebd..f4444a199bc 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -347,7 +347,7 @@ my @TLP_working = qw(
     paper papercdcase papermas papertex
     paracol paralist parallel paratype
     paresse parnotes parrun parselines parskip
-    pas-crosswords pas-cours pas-cv pas-tableur passivetex 
+    pas-cours pas-crosswords pas-cv pas-tableur passivetex 
     patch patchcmd patgen2-tutorial path pauldoc pawpict pax
     pbox pb-diagram pbsheet
     pdf14