v3.0beta

cgnieder · Apr 20, 2020 · 649cfad · 649cfad
1 parent f6d1009
commit 649cfad
Show file tree

Hide file tree

Showing 28 changed files with 1,723 additions and 5,606 deletions.
diff --git a/doc/acro.history → HISTORY b/doc/acro.history → HISTORY
@@ -286,3 +286,5 @@ feel free to contact me.
 2020/03/07 v2.11c - fix issues #149 and #150
 2020/04/06 v3.0alpha   - pre-release of v3.0 without proper documentation
 2020/04/07 v3.0alpha-1 - upgrade module included
+2020/04/13 v3.0alpha-2 - mutiple imrovements
+2020/04/19 v3.0beta - ready?
diff --git a/README b/README
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------
-the ACRO package v3.0alpha-2 2020/04/13
+the ACRO package v3.0beta 2020/04/20
 
   Typeset Acronyms
 
@@ -11,21 +11,41 @@ E-Mail: contact@mychemistry.eu
 Copyright 2012--2020 Clemens Niederberger
 
 This work may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either version 1.3
+conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
   http://www.latex-project.org/lppl.txt
-and version 1.3 or later is part of all distributions of LaTeX
-version 2005/12/01 or later.
+and version 1.3c or later is part of all distributions of LaTeX
+version 2008/05/04 or later.
 
 This work has the LPPL maintenance status `maintained'.
 
 The Current Maintainer of this work is Clemens Niederberger.
 --------------------------------------------------------------------------
-The acro package consists of the files:
-   acro.sty
-   README
-   acro.history
-   acro-manual.tex, acro-manual.pdf, acro-manual.cls
-   a number of example files
+The acro package consists of the code file:
+
+  acro.sty
+
+The acro package consists of documentation files:
+
+  README
+  LICENSE
+  HISTORY
+  acro-manual.tex
+  acro-manual.pdf
+  acro-manual.cls
+
+The acro package consists of example files -- these should be placed in a
+folder examples/ in the same folder as acro-manual.pdf:
+
+  acro.example.basic.pdf, acro.example.basic.tex
+  acro.example.issue-109.pdf, acro.example.issue-109.tex
+  acro.example.issue-111.pdf, acro.example.issue-111.tex
+  acro.example.issue-119.pdf, acro.example.issue-119.tex
+  acro.example.issue-154.pdf, acro.example.issue-154.tex
+  acro.example.possessive.pdf, acro.example.possessive.tex
+  acro.example.texsx-505891.pdf, acro.example.texsx-505891.tex
+  acro.example.texsx-507726.pdf, acro.example.texsx-507726.tex
+  acro.example.units.pdf, acro.example.units.tex
+
 --------------------------------------------------------------------------
diff --git a/acro.build b/acro.build
@@ -86,6 +86,9 @@ while [ -n "$1" ]; do
                 examples)
                     cleanup=true
                     cleanexamples=true ;;
+                *)
+                    echo "invalid value '$2'"
+                    exit 1 ;;
             esac
             shift ;;
         -f|--file)
@@ -196,7 +199,7 @@ if [ "$cleanup" == true ] ; then
                    ${DOC_DIR}/*synctex*
                    ${DOC_DIR}/*.run.xml
                    ${DOC_DIR}/*.aux
-                   ${DOC_DIR}/*.acro
+                   ${DOC_DIR}/*.acr
                    ${DOC_DIR}/*.xsim
                    ${DOC_DIR}/*.log
                    ${DOC_DIR}/*.out
@@ -218,7 +221,7 @@ if [ "$cleanup" == true ] ; then
                    ${EXAMPLES_DIR}/*synctex*
                    ${EXAMPLES_DIR}/*.run.xml
                    ${EXAMPLES_DIR}/*.aux
-                   ${EXAMPLES_DIR}/*.acro
+                   ${EXAMPLES_DIR}/*.acr
                    ${EXAMPLES_DIR}/*.xsim
                    ${EXAMPLES_DIR}/*.log
                    ${EXAMPLES_DIR}/*.out
@@ -247,6 +250,7 @@ if [ "$build" == true ] ; then
     cat \
     $pkgname.start.$moduleext \
     $pkgname.base.$moduleext \
+    $pkgname.interface.$moduleext \
     $pkgname.aux.$moduleext \
     $pkgname.properties.$moduleext \
     $pkgname.acronyms.$moduleext \
@@ -258,15 +262,14 @@ if [ "$build" == true ] ; then
     $pkgname.pages.$moduleext \
     $pkgname.locale.$moduleext \
     $pkgname.pdfsupport.$moduleext \
-    $pkgname.interface.$moduleext \
     $pkgname.definitions.$moduleext \
     $pkgname.upgrade.$moduleext \
     > $styname
     # append necessary end:
     echo -e "% finish package:\n\
-    \\AtEndDocument { \\\\acro_close_aux: \\\\acro_do_rerun: }\n\
-    %----------------------------------------------------------------------------\n\
-    \\\\file_input_stop:"\
+\\AtEndDocument { \\\\acro_close_aux: \\\\acro_do_rerun: }\n\
+%----------------------------------------------------------------------------\n\
+\\\\file_input_stop:"\
     >> $styname
 fi
 

diff --git a/code/acro.acronyms.code.tex b/code/acro.acronyms.code.tex
@@ -74,15 +74,6 @@
 
 % --------------------------------------------------------------------------
 % define necessary properties:
-\NewDocumentCommand \DeclareAcroProperty {st?t!t|m}
-  { \acro_property_declare:nnnnn {#1} {#2} {#3} {#4} {#5} }
-
-\NewDocumentCommand \DeclareAcroPropertyAlias {st?t!t|mm}
-  {
-    \acro_property_declare:nnnnn {#1} {#2} {#3} {#4} {#5}
-    \acro_property_make_alias:nn {#5} {#6}
-  }
-
 % short and long properties:
 \acro_list_add:nn {short} {short,alt}
 \acro_list_add:nn {long}  {long,foreign,single,extra,list}
@@ -130,7 +121,7 @@
 \DeclareAcroPropertyAlias {short-format} {format}
 \DeclareAcroProperty {alt-format}
 \DeclareAcroPropertyAlias {long-format}  {format}
-\DeclareAcroProperty {first-long-format}
+\DeclareAcroPropertyAlias {first-long-format} {long-format}
 \DeclareAcroProperty {foreign-format}
 \DeclareAcroProperty {single-format}
 \DeclareAcroProperty {list-format}

diff --git a/code/acro.base.code.tex b/code/acro.base.code.tex
@@ -20,12 +20,14 @@
 \cs_generate_variant:Nn \tl_remove_all:Nn {NV}
 \cs_generate_variant:Nn \tl_remove_once:Nn {NV}
 \cs_generate_variant:Nn \tl_if_in:NnF {NV}
+\cs_generate_variant:Nn \tl_put_right:Nn {Ne}
 \cs_generate_variant:Nn \clist_set:Nn {Ne}
 \cs_generate_variant:Nn \str_if_eq:nnT {x}
 \cs_generate_variant:Nn \str_fold_case:n {e}
 \cs_generate_variant:Nn \str_lowercase:n {e}
 \cs_generate_variant:Nn \msg_error:nnnnn {nnnxx}
 \cs_generate_variant:Nn \msg_warning:nn {nV}
+\cs_generate_variant:Nn \msg_error:nnnn {nne}
 \cs_generate_variant:Nn \prg_new_conditional:Npnn {c}
 \cs_generate_variant:Nn \file_get_mdfive_hash:nN {V}
 \cs_generate_variant:Nn \iow_open:Nn {NV}

diff --git a/code/acro.commands.code.tex b/code/acro.commands.code.tex
@@ -132,7 +132,7 @@
     \bool_if:cT {l__acro_article_#3_bool}
       {
         \tl_map_break:n
-          { \acro_property_get:nn {#1} {#2-#3} \c_space_tl }
+          { \acro_property_get:nn {#1} {#2-#3} \exp_stop_f: }
       }
   }
 
@@ -252,7 +252,7 @@
   { \exp_after:wN \use_none:n \token_to_str:N #1 }
 
 % #1: csname
-% #2: csname
+% #2: xparse csname
 % #3: action
 \cs_set_protected:Npn \acro_new_definition_command:NNn #1#2#3
   {
@@ -266,7 +266,7 @@
           { base \__acro_remove_bs:N ##1  } {##2}
           {
             \acro_begin:
-              \cs_set_eq:NN \nospace \tex_ignorespaces:D
+              \cs_set:Npn \nospace { \exp:w \exp_end_continue_f:w }
               \acro_check_definition:n {####1}
               \bool_set_true:N \l__acro_use_bool
               \keys_set:nV {acro} \l__acro_options_tl