From 45c606bee196cd87449612bf1b11df69557f8a03 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 5 Nov 2013 01:09:57 +0000 Subject: acro (4nov13) git-svn-id: svn://tug.org/texlive/trunk@32071 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/acro/README | 4 ++-- Master/texmf-dist/doc/latex/acro/acro_en.pdf | Bin 513734 -> 513332 bytes Master/texmf-dist/doc/latex/acro/acro_en.tex | 11 +++++------ Master/texmf-dist/tex/latex/acro/acro.sty | 25 +++++++++++++++---------- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Master/texmf-dist/doc/latex/acro/README b/Master/texmf-dist/doc/latex/acro/README index 3b0844869e1..3779d2da094 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.4b +the ACRO package v1.4c Typeset Acronyms -2013/09/24 +2013/11/04 -------------------------------------------------------------------------- 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 1bd6610092e..e084157c1f4 100644 Binary files a/Master/texmf-dist/doc/latex/acro/acro_en.pdf and b/Master/texmf-dist/doc/latex/acro/acro_en.pdf differ diff --git a/Master/texmf-dist/doc/latex/acro/acro_en.tex b/Master/texmf-dist/doc/latex/acro/acro_en.tex index 80547fd4aff..efa91ee416e 100644 --- a/Master/texmf-dist/doc/latex/acro/acro_en.tex +++ b/Master/texmf-dist/doc/latex/acro/acro_en.tex @@ -1,7 +1,7 @@ % arara: pdflatex -% arara: biber -% arara: pdflatex -% arara: pdflatex +% !arara: biber +% !arara: pdflatex +% !arara: pdflatex % arara: pdflatex % -------------------------------------------------------------------------- % the ACRO package @@ -41,6 +41,7 @@ % \documentclass[load-preamble+,scrartcl={DIV10}]{cnltx-doc} +\usepackage[utf8]{inputenc} \usepackage[single,macros,accsupp,index]{acro} \setcnltx{ package = {acro} , @@ -71,9 +72,7 @@ \acsetup{hyperref} -\microtypesetup{tracking=scshape} - -\defbibheading{bibliography}[\bibname]{\addsec{#1}} +\defbibheading{bibliography}{\addsec{References}} \usepackage{csquotes} diff --git a/Master/texmf-dist/tex/latex/acro/acro.sty b/Master/texmf-dist/tex/latex/acro/acro.sty index ce2d35610d3..bdbda639524 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/09/24} - {1.4b} + {2013/11/04} + {1.4c} {Typeset Acronyms} % -------------------------------------------------------------------------- @@ -421,7 +421,7 @@ \bool_if:NTF \l__acro_custom_format_bool { \l__acro_custom_format_tl } { \l__acro_short_format_tl } - { \hbox:n { #1 } } + { #1 } \group_end: \bool_if:NT \l__acro_use_plural_bool { \tl_use:N \l__acro_short_plural_tl } @@ -468,16 +468,18 @@ \cs_new_protected:Npn \__acro_make_link:nNN #1#2#3 { - \tl_set:Nn #2 - { - \acro_hyper_link:nn { #1 } { \phantom { #3 } } - \__acro_is_single:nTF { #1 } { \hbox_overlap_left:n { #3 } } + \bool_if:nTF + { \l__acro_use_hyperref_bool && \l__acro_hyperref_loaded_bool } + { + \tl_set:Nn #2 { - \bool_if:nTF { \l__acro_use_hyperref_bool && \l__acro_hyperref_loaded_bool } - { \acro_color_link:n { \hbox_overlap_left:n { #3 } } } + \acro_hyper_link:nn { #1 } { \phantom { #3 } } + \__acro_is_single:nTF { #1 } { \hbox_overlap_left:n { #3 } } + { \acro_color_link:n { \hbox_overlap_left:n { #3 } } } } } + { \tl_set:Nn #2 { #3 } } } \cs_new:Npn \acro_color_link:n #1 @@ -2439,8 +2441,11 @@ 2013/09/02 v1.4a - bug fix: used acronyms are added to the list when the list is printed before the use - \DeclareAcronym may now be used after \begin{document} -2013/??/?? v1.4b - bug fix: only-used=false works again for only declared but +2013/09/24 v1.4b - bug fix: only-used=false works again for only declared but unused acronyms (only if option single is not used) +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 % -------------------------------------------------------------------------- % TODO: -- cgit v1.2.3