From 47af91cb8475b7352015cf05ce881e6b8415112d Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 4 May 2020 03:02:37 +0000 Subject: CTAN sync 202005040302 --- macros/latex/contrib/acro/README | 2 +- macros/latex/contrib/acro/acro-manual.pdf | Bin 851941 -> 868396 bytes macros/latex/contrib/acro/acro-manual.tex | 56 +- macros/latex/contrib/acro/acro.sty | 355 +- .../contrib/acro/examples/acro.example.acflike.pdf | Bin 21224 -> 20922 bytes .../acro/examples/acro.example.issue-119.tex | 2 +- .../acro/examples/acro.example.texsx-505891.pdf | Bin 32429 -> 32432 bytes .../acro/examples/acro.example.texsx-505891.tex | 20 +- .../acro/examples/acro.example.texsx-507726.tex | 25 +- .../contrib/acro/examples/acro.example.units.tex | 6 +- .../biblatex-apa6/american-apa6.lbx | 2 +- .../biblatex-contrib/biblatex-apa6/apa6.bbx | 202 +- .../biblatex-contrib/biblatex-apa6/apa6.cbx | 217 +- .../biblatex-contrib/biblatex-apa6/apa6.dbx | 4 +- .../biblatex-apa6/austrian-apa6.lbx | 2 +- .../biblatex-apa6/biblatex-apa6-test.pdf | Bin 110096 -> 110080 bytes .../biblatex-apa6/biblatex-apa6.pdf | Bin 92719 -> 92893 bytes .../biblatex-apa6/biblatex-apa6.tex | 12 +- .../biblatex-apa6/brazilian-apa6.lbx | 2 +- .../biblatex-apa6/british-apa6.lbx | 2 +- .../biblatex-contrib/biblatex-apa6/danish-apa6.lbx | 2 +- .../biblatex-contrib/biblatex-apa6/dutch-apa6.lbx | 2 +- .../biblatex-apa6/english-apa6.lbx | 2 +- .../biblatex-contrib/biblatex-apa6/french-apa6.lbx | 2 +- .../biblatex-apa6/galician-apa6.lbx | 2 +- .../biblatex-contrib/biblatex-apa6/german-apa6.lbx | 2 +- .../biblatex-contrib/biblatex-apa6/greek-apa6.lbx | 2 +- .../biblatex-apa6/italian-apa6.lbx | 2 +- .../biblatex-apa6/naustrian-apa6.lbx | 2 +- .../biblatex-apa6/ngerman-apa6.lbx | 2 +- .../biblatex-contrib/biblatex-apa6/norsk-apa6.lbx | 2 +- .../biblatex-apa6/norwegian-apa6.lbx | 2 +- .../biblatex-apa6/nswissgerman-apa6.lbx | 2 +- .../biblatex-apa6/nynorsk-apa6.lbx | 2 +- .../biblatex-apa6/portuguese-apa6.lbx | 2 +- .../biblatex-apa6/russian-apa6.lbx | 2 +- .../biblatex-apa6/slovene-apa6.lbx | 2 +- .../biblatex-apa6/spanish-apa6.lbx | 4 +- .../biblatex-apa6/swedish-apa6.lbx | 2 +- .../biblatex-apa6/swissgerman-apa6.lbx | 2 +- macros/latex/contrib/fancyvrb/Changes | 2 + macros/latex/contrib/fancyvrb/README | 4 +- macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf | Bin 133221 -> 125081 bytes macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex | 38 +- macros/latex/contrib/fancyvrb/latex/fancyvrb.sty | 11 +- macros/latex/contrib/gitver/ChangeLog | 6 +- macros/latex/contrib/gitver/README.md | 2 +- macros/latex/contrib/gitver/gitver.pdf | Bin 134931 -> 138738 bytes macros/latex/contrib/gitver/gitver.sty | 8 +- macros/latex/contrib/gitver/gitver.tex | 36 +- macros/latex/contrib/metanorma/README.md | 15 + macros/latex/contrib/metanorma/metanorma.adoc | 1650 ++ macros/latex/contrib/metanorma/metanorma.cls | 132 + macros/latex/contrib/metanorma/metanorma.cls.ltxml | 149 + macros/latex/contrib/metanorma/metanorma.pdf | 29325 +++++++++++++++++++ macros/latex/contrib/metanorma/metanorma.xsl | 693 + .../contrib/reledmac/doc-include/migrate-mac.dtx | 10 +- .../reledmac/doc-more/page-typesetting-columns.pdf | Bin 40839 -> 40839 bytes .../reledmac/examples/1-criticalendnotes.pdf | Bin 177475 -> 177475 bytes .../contrib/reledmac/examples/1-criticalnotes.pdf | Bin 121597 -> 121597 bytes .../contrib/reledmac/examples/1-sidenotes.pdf | Bin 145283 -> 145283 bytes .../latex/contrib/reledmac/examples/1-tabular.pdf | Bin 189798 -> 189792 bytes .../reledmac/examples/1-verses-doublenumbering.pdf | Bin 123178 -> 123178 bytes .../latex/contrib/reledmac/examples/1-verses.pdf | Bin 123463 -> 123463 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 122256 -> 122256 bytes .../reledmac/examples/2-footnote_spacing.pdf | Bin 126016 -> 126016 bytes .../contrib/reledmac/examples/2-glossaries.pdf | Bin 18323 -> 18323 bytes .../latex/contrib/reledmac/examples/2-indexing.pdf | Bin 187631 -> 187631 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 124324 -> 124324 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 144492 -> 144492 bytes .../contrib/reledmac/examples/2-linespacing.pdf | Bin 138405 -> 138405 bytes .../reledmac/examples/2-manuscript-apparatus.pdf | Bin 158108 -> 158108 bytes .../contrib/reledmac/examples/2-notes-width.pdf | Bin 129005 -> 129005 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 140523 -> 140523 bytes .../contrib/reledmac/examples/2-performances.pdf | Bin 135414 -> 135414 bytes .../reledmac/examples/2-reledmac-right-to-left.pdf | Bin 31754 -> 31756 bytes .../examples/2-subdivision-number-in-header.pdf | Bin 215012 -> 215012 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 190222 -> 190222 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 175170 -> 175170 bytes .../3-reledpar_columns_different_languages.pdf | Bin 24477 -> 24477 bytes .../contrib/reledmac/examples/3-reledpar_mwe.pdf | Bin 93475 -> 93475 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 37801 -> 37801 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 138222 -> 138222 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 190161 -> 190161 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 189362 -> 189362 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 168099 -> 168099 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 189915 -> 189915 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 188836 -> 188836 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 188745 -> 188745 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 188865 -> 188865 bytes ...mn_mix_with_not_column-continuous-numbering.pdf | Bin 189690 -> 189690 bytes .../4-reledpar_column_mix_with_not_column.pdf | Bin 134815 -> 134815 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 190204 -> 190204 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 201833 -> 201833 bytes .../examples/4-reledpar_inside-outside-columns.pdf | Bin 123601 -> 123601 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 215182 -> 215182 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 239560 -> 239560 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 125082 -> 125082 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 123151 -> 123151 bytes ...r_pages_titles_in_line_numbering_with_notes.pdf | Bin 263410 -> 263410 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 183782 -> 183782 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 118947 -> 118947 bytes macros/latex/contrib/reledmac/makefile | 2 +- macros/latex/contrib/reledmac/migration.pdf | Bin 356244 -> 356785 bytes macros/latex/contrib/reledmac/reledmac.dtx | 42 +- macros/latex/contrib/reledmac/reledmac.pdf | Bin 1847190 -> 1986367 bytes macros/latex/contrib/reledmac/reledpar.pdf | Bin 988616 -> 988622 bytes 107 files changed, 32631 insertions(+), 445 deletions(-) create mode 100644 macros/latex/contrib/metanorma/README.md create mode 100644 macros/latex/contrib/metanorma/metanorma.adoc create mode 100644 macros/latex/contrib/metanorma/metanorma.cls create mode 100644 macros/latex/contrib/metanorma/metanorma.cls.ltxml create mode 100644 macros/latex/contrib/metanorma/metanorma.pdf create mode 100644 macros/latex/contrib/metanorma/metanorma.xsl (limited to 'macros/latex') diff --git a/macros/latex/contrib/acro/README b/macros/latex/contrib/acro/README index 1af233ac32..9b6b9df588 100644 --- a/macros/latex/contrib/acro/README +++ b/macros/latex/contrib/acro/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -the ACRO package v3.0 2020/04/29 +the ACRO package v3.1 2020/05/03 Typeset Acronyms diff --git a/macros/latex/contrib/acro/acro-manual.pdf b/macros/latex/contrib/acro/acro-manual.pdf index adcbb7fb30..5c2310f650 100644 Binary files a/macros/latex/contrib/acro/acro-manual.pdf and b/macros/latex/contrib/acro/acro-manual.pdf differ diff --git a/macros/latex/contrib/acro/acro-manual.tex b/macros/latex/contrib/acro/acro-manual.tex index 6470c95ba4..af5e2387c6 100644 --- a/macros/latex/contrib/acro/acro-manual.tex +++ b/macros/latex/contrib/acro/acro-manual.tex @@ -1,8 +1,3 @@ -% arara: pdflatex: { interaction: nonstopmode } -% !arara: biber -% arara: pdflatex: { interaction: nonstopmode } -% !arara: pdflatex: { interaction: nonstopmode } -% !arara: pdflatex: { interaction: nonstopmode } % -------------------------------------------------------------------------- % the ACRO package % @@ -16,25 +11,17 @@ % Copyright 2011--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 nce status `maintained'. % % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- -% The acro package consists of the files -% - acro.sty, acro.definitions.tex, acro.cfg -% - acro-manual.tex, acro-manual.pdf, acro-manual.cls -% - acro.history, README -% -------------------------------------------------------------------------- -% If you have any ideas, questions, suggestions or bugs to report, please -% feel free to contact me. -% -------------------------------------------------------------------------- \PassOptionsToPackage{ngerman,latin,english}{babel} \PassOptionsToPackage{version=3,upgrade}{acro} \documentclass{acro-manual} @@ -190,19 +177,22 @@ tag = glossary , no-index } \DeclareAcronym{option}{ - long = An \option*{option} is a package option of \acro\ which must set - with \cs*{acsetup}. It \emph{cannot} be set as option to \cs*{usepackage}. , + long = {An \option*{option} is a package option of \acro\ which must set + with \cs*{acsetup}. It \emph{cannot} be set as option to \cs*{usepackage}. + Options usually also can be set in the optional argument of \cs*{ac} and + friends.} , tag = glossary , no-index } \DeclareAcronym{load-time option}{ - long = A load-time \option*{option} is a package option of \acro\ which must - be set as option to \cs*{usepackage}\oarg{options}\Marg{acro}. , + long = {A load-time \option*{option} is a package option of \acro\ which + \emph{must} be set as option to + \cs*{usepackage}\oarg{options}\Marg{acro}.} , tag = glossary , no-index } \DeclareAcronym{template}{ - long = A template determines how different objects of \acro\ are printed. + long = {A template determines how different objects of \acro\ are printed. This includes the acronyms themselves but also for example the list of - acronyms as a whole. , + acronyms as a whole.} , tag = glossary , no-index } \DeclareAcronym{articles}{ @@ -216,12 +206,11 @@ tag = glossary , no-index } \DeclareAcronym{translations}{ - long = Localisation strings which can be modified. , + long = {Localisation strings which can be modified.} , tag = glossary , no-index } \newcommand*\issues{\url{https://github.com/cgnieder/acro/issues}} - \newcommand*\latin[1]{\textit{#1}} \begin{document} @@ -661,6 +650,13 @@ Then typical outputs look like this: \acfp{ufo} \end{example} +\begin{bewareofthedog} + In a number of contexts all acronym commands act as if their starred form is + used: in the table of contents, in the list of figures, and in the list of + tables. The same is true for floats and the measuring phase of common + table environments like \env*{tabularx} or \env*{ltxtable}. +\end{bewareofthedog} + \section{Alternative short forms}\label{sec:altern-short-forms} Sometimes expressions have two different short forms. And example might be \acs*{jpg} which also often is \aca*{jpg}. This is what the property @@ -1181,6 +1177,8 @@ properties for such cases: \end{properties} There are also some options: \begin{options} + \keybool{display}\Module{foreign}\Default{true} + Determine wether to hide or display the foreign form. \keybool{display}\Module{locale}\Default{false} This options determines wether the language of the foreign form is printed or not when the full form of the acronym is printed. @@ -1527,6 +1525,13 @@ used. You have already seen one of the commands which make it possible: Every acronym will be reset. \end{commands} +\begin{bewareofthedog} + In a number of contexts all acronym commands act as if their starred form is + used: in the table of contents, in the list of figures, and in the list of + tables. The same is true for floats and the measuring phase of common + table environments like \env*{tabularx} or \env*{ltxtable}. +\end{bewareofthedog} + \section{Bookmarks, backlinks and accessibility support}\label{sec:pdf-properties} \subsection{Backlinks}\label{sec:backlinks} When \acro\ is used together with the package @@ -1881,6 +1886,9 @@ and \cs*{acroifF} each have an argument less than \cs*{acroifTF}. \command{acroif\TF}[\marg{property}\marg{true}\marg{false}] Checks if the property \meta{property} has been set for the current acronym and either leaves \meta{true} or \meta{false} in the input stream. + \command{acroifboolean\TF}[\marg{property}\marg{true}\marg{false}] + \sinceversion{3.1}Returns \meta{true} if the boolean property + \meta{property} has been set to \code{true} and \meta{false} otherwise. \command{acroifall\TF}[\marg{properties}\marg{true}\marg{false}] Checks if all properties in the csv list \meta{properties} have been set for the current acronym and either leaves \meta{true} or \meta{false} in diff --git a/macros/latex/contrib/acro/acro.sty b/macros/latex/contrib/acro/acro.sty index d1761cf005..2d1d88f020 100644 --- a/macros/latex/contrib/acro/acro.sty +++ b/macros/latex/contrib/acro/acro.sty @@ -11,33 +11,25 @@ % Copyright 2011--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, acro.definitions.tex, acro.cfg -% - acro-manual.tex, acro-manual.pdf, acro-manual.cls -% - acro.history, README -% -------------------------------------------------------------------------- -% If you have any ideas, questions, suggestions or bugs to report, please -% feel free to contact me. -% -------------------------------------------------------------------------- \RequirePackage{expl3,xparse,l3keys2e} \ExplSyntaxOn % setup package: \tl_const:Nn \c_acro_package_name_tl {acro} -\tl_const:Nn \c_acro_date_tl {2020/04/29} +\tl_const:Nn \c_acro_date_tl {2020/05/04} \tl_const:Nn \c_acro_version_major_number_tl {3} -\tl_const:Nn \c_acro_version_minor_number_tl {0} +\tl_const:Nn \c_acro_version_minor_number_tl {1} \tl_const:Nn \c_acro_version_subrelease_tl {} \tl_const:Nx \c_acro_version_number_tl { @@ -769,6 +761,7 @@ % commands for list templates \NewDocumentCommand \acroheading {} { \acro_heading: } \NewDocumentCommand \acropreamble {} { \acro_preamble: } +\NewDocumentCommand \acropostamble {} { \acro_postamble: } \NewExpandableDocumentCommand \acrolistname {} { \tl_use:N \l__acro_list_name_tl } @@ -846,12 +839,25 @@ \NewDocumentCommand \acrocite {} { \bool_set_true:N \l__acro_cite_always_bool } -\NewDocumentCommand \acroifTF {m+m+m} - { \acro_property_if_set:enTF { \AcronymID } {#1} {#2} {#3} } -\NewDocumentCommand \acroifT {m+m} - { \acro_property_if_set:enTF { \AcronymID } {#1} {#2} {} } -\NewDocumentCommand \acroifF {m+m} - { \acro_property_if_set:enTF { \AcronymID } {#1} {} {#2} } +\NewExpandableDocumentCommand \acroifbooleanTF {m} + { \acro_boolean_property_if:enTF { \AcronymID } {#1} } + +\NewExpandableDocumentCommand \acroifbooleanT {m} + { \acro_boolean_property_if:enT { \AcronymID } {#1} } + +\NewExpandableDocumentCommand \acroifbooleanF {m} + { \acro_boolean_property_if:enF { \AcronymID } {#1} } + +\NewExpandableDocumentCommand \acroifTF {+m+m+m} + { + \acro_property_if_set:enTF { \AcronymID } {#1} + { \acro_check_foreign:nn {#1} {#2} } + {#3} + } +\NewExpandableDocumentCommand \acroifT {+m+m} + { \acroifTF {#1} {#2} {} } +\NewExpandableDocumentCommand \acroifF {+m+m} + { \acroifTF {#1} {} {#2} } \NewDocumentCommand \acroifanyTF {m+m+m} { \acro_property_if_any:enTF { \AcronymID } {#1} {#2} {#3} } @@ -1317,8 +1323,7 @@ } { \prg_return_false: } } -\cs_generate_variant:Nn \acro_boolean_property_if:nnTF {oo} -\cs_generate_variant:Nn \acro_boolean_property_if:nnF {nV} +\prg_generate_conditional_variant:Nnn \acro_boolean_property_if:nn {nV,oo,e} {T,F,TF} % ---------------------------------------------------------------------------- % set properties: @@ -1567,33 +1572,6 @@ % ---------------------------------------------------------------------------- \AcroModuleEnd -% ---------------------------------------------------------------------------- -% the ACRO package - acronyms module -% -% Typeset Acronyms -% -% -------------------------------------------------------------------------- -% Clemens Niederberger -% Web: https://github.com/cgnieder/acro/ -% E-Mail: contact@mychemistry.eu -% -------------------------------------------------------------------------- -% Copyright 2011--2020 Clemens Niederberger -% -% This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 -% 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. -% -% This work has the LPPL maintenance status `maintained'. -% -% The Current Maintainer of this work is Clemens Niederberger. -% -------------------------------------------------------------------------- -% If you have any ideas, questions, suggestions or bugs to report, please -% feel free to contact me. -% -------------------------------------------------------------------------- \AcroModule{acronyms}{define acronyms} % -------------------------------------------------------------------------- @@ -1860,8 +1838,7 @@ % -------------------------------------------------------------------------- \AcroModuleEnd \AcroModule{formatting}{formatting of acronyms} -% -------------------------------------------------------------------------- -% formatting: + \bool_new:N \l__acro_format_replace_bool % sets the format from the global option: @@ -1880,8 +1857,26 @@ % #1: property \cs_new:Npn \__acro_use_global_format:n #1 { - \tl_if_exist:cT {l__acro_format_ #1 _tl} - { \tl_use:c {l__acro_format_ #1 _tl} } + \tl_if_exist:cTF {l__acro_format_ #1 _tl} + { + \tl_if_empty:cTF {l__acro_format_ #1 _tl} + { \use:n } + { \tl_use:c {l__acro_format_ #1 _tl} } + } + { + \acro_property_if_alias:nTF {#1} + { + \tl_if_exist:cTF + {l__acro_format_ \acro_property_alias:n {#1} _tl} + { + \tl_if_empty:cTF {l__acro_format_ \acro_property_alias:n {#1} _tl} + { \use:n } + { \tl_use:c {l__acro_format_ \acro_property_alias:n {#1} _tl} } + } + { \use:n } + } + { \use:n } + } } % #1: id @@ -1918,7 +1913,7 @@ % #1: id % #1: property \cs_new:Npn \__acro_property_format:nn #1#2 - { \__acro_property_format:nnF {#1} {#2} {} } + { \__acro_property_format:nnF {#1} {#2} { \use:n } } % sets the individual format: % #1: id @@ -1931,27 +1926,42 @@ { \__acro_property_format:nnF {#1} {#2} { \__acro_global_format:n {#2} } - {#3} + { \__acro_pdf_comment:nnn {#1} {#2} {#3} } } { \__acro_global_format:n {#2} { \__acro_property_format:nn {#1} {#2} - {#3} + { \__acro_pdf_comment:nnn {#1} {#2} {#3} } } } } } \cs_generate_variant:Nn \acro_format:nnn {e} +\cs_new:Npn \acro_index_format:nnn #1#2#3 + { + { + \bool_if:NTF \l__acro_format_replace_bool + { + \__acro_property_format:nnF {#1} {#2} + { \__acro_global_format:n {#2} } + {#3} + } + { + \__acro_global_format:n {#2} + { \__acro_property_format:nn {#1} {#2} {#3} } + } + } + } + % #1: property: \cs_new_protected:Npn \acro_new_format:n #1 { \tl_new:c {l__acro_format_#1_tl} \keys_define:nn {acro/format} { - #1 .tl_set:c = l__acro_format_#1_tl , - #1 .initial:n = + #1 .tl_set:c = l__acro_format_#1_tl } } @@ -2410,7 +2420,7 @@ \__acro_index:e { \acro_property_get:nn {#1} {index-sort} @ - \acro_format:nnn + \acro_index_format:nnn {#1} {short} { \acro_property_get:nn {#1} {short} } @@ -2879,7 +2889,7 @@ \acro_property_if_exist:nTF {#2-acc} { \__acro_accsupp:ee - { \__acro_write_acronym:nn {#1} {#2-acc} } + { \__acro_write_acronym_acc:nn {#1} {#2-acc} } { \__acro_write_acronym:nn {#1} {#2} } } { \__acro_write_acronym:nn {#1} {#2} } @@ -2905,6 +2915,19 @@ } } +% #1: id +% #2: property +\cs_new:Npn \__acro_write_acronym_acc:nn #1#2 + { + \__acro_upper:n + { + \__acro_article:nn {#1} {#2} + \acro_if_ending_form:nnTF {#1} {#2} + { \acro_ending_form:nn {#1} {#2} } + { \acro_property_get:nn {#1} {#2} } + } + } + % #1: id % #2: property \cs_new_protected:Npn \acro_write:nn #1#2 @@ -3010,7 +3033,6 @@ \l__acro_begin_command_hook_tl \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 \tl_set:Ne \AcronymID { \acro_case_insensitive:n {####1} } \tl_set:Ne \l_acro_id_tl { \acro_case_insensitive:n {####1} } @@ -3196,13 +3218,12 @@ \cs_new_protected:Npn \acro_template_use:nnn #1#2#3 { \bool_set_false:N \l__acro_tmpa_bool - \bool_if:NT \l__acro_use_only_first_bool + \bool_lazy_and:nnT + { \l__acro_use_only_first_bool } + { \l__acro_use_bool } { - \bool_if:NT \l__acro_use_bool - { - \bool_set_true:N \l__acro_tmpa_bool - \bool_set_false:N \l__acro_use_bool - } + \bool_set_true:N \l__acro_tmpa_bool + \bool_set_false:N \l__acro_use_bool } \str_case:nnF {#3} { @@ -3356,8 +3377,7 @@ % ---------------------------------------------------------------------------- \AcroModuleEnd \AcroModule{list}{the list of acronyms} -% -------------------------------------------------------------------------- -% list of acronyms: + \bool_new:N \l__acro_list_display_all_bool \bool_new:N \l__acro_list_bool \bool_new:N \l__acro_list_local_bool @@ -3481,6 +3501,7 @@ % -------------------------------------------------------------------------- \tl_new:N \l__acro_heading_tl \tl_new:N \l__acro_preamble_tl +\tl_new:N \l__acro_postamble_tl \cs_new_protected:Npn \acro_heading: { \acro_template_use:nnV {0} {heading} \l__acro_heading_tl } @@ -3488,6 +3509,9 @@ \cs_new_protected:Npn \acro_preamble: { \tl_use:N \l__acro_preamble_tl } +\cs_new_protected:Npn \acro_postamble: + { \tl_use:N \l__acro_postamble_tl } + \tl_new:N \l__acro_list_name_tl % -------------------------------------------------------------------------- @@ -3507,6 +3531,8 @@ heading .tl_set:N = \l__acro_heading_tl , preamble .tl_set:N = \l__acro_preamble_tl , preamble .initial:n = , + postamble .tl_set:N = \l__acro_postamble_tl , + postamble .initial:n = , name .tl_set:N = \l__acro_list_name_tl , name .initial:n = \acro_translate:n {list-name} } @@ -3826,15 +3852,33 @@ { You~ need~ to~ give~ a~ value~ to~ `#1'~ \msg_line_context: } % -------------------------------------------------------------------------- +\bool_new:N \l__acro_show_foreign_bool \bool_new:N \l__acro_show_locale_bool \bool_new:N \l__acro_list_show_locale_bool \tl_new:N \l__acro_locale_format_tl +% #1: property +\prg_new_conditional:Npnn \acro_if_foreign:n #1 {p,T,F,TF} + { + \str_if_eq:nnTF {#1} {foreign} + { \prg_return_true: } + { \prg_return_false: } + } + +% #1: property +% #2: text +\cs_new:Npn \acro_check_foreign:nn #1#2 + { + \acro_if_foreign:nTF {#1} + { \bool_if:NT \l__acro_show_foreign_bool {#2} } + {#2} + } + % #1: id % #2: property \prg_new_conditional:Npnn \acro_if_locale:nn #1#2 {p,T,F,TF} { - \str_if_eq:nnTF {#2} {foreign} + \acro_if_foreign:nTF {#2} { \bool_lazy_or:nnTF { \acro_property_if_set_p:nn {#1} {foreign-babel} } @@ -3850,33 +3894,38 @@ % #3: text \cs_new_protected:Npn \acro_locale:nnn #1#2#3 { - \acro_if_locale:nnTF {#1} {#2} + \acro_if_foreign:nTF {#2} { - \__acro_foreign_language:en - { \str_lowercase:e { \acro_property_get:nn {#1} {foreign-babel} } } + \bool_if:NT \l__acro_show_foreign_bool { - \bool_lazy_or:nnT - { \l__acro_show_locale_bool } - { - \bool_lazy_and_p:nn - { \l__acro_list_bool } - { \l__acro_list_show_locale_bool } - } + \acro_if_locale:nnTF {#1} {#2} { - { - \l__acro_locale_format_tl + \bool_lazy_or:nnT + { \l__acro_show_locale_bool } + { + \bool_lazy_and_p:nn + { \l__acro_list_bool } + { \l__acro_list_show_locale_bool } + } + { { - \acro_property_if_set:nnTF {#1} {foreign-locale} - { \acro_property_get:nn {#1} {foreign-locale} } + \l__acro_locale_format_tl { - \baselanguage - { \acro_property_get:nn {#1} {foreign-babel} } + \acro_property_if_set:nnTF {#1} {foreign-locale} + { \acro_property_get:nn {#1} {foreign-locale} } + { + \baselanguage + { \acro_property_get:nn {#1} {foreign-babel} } + } } } - } - :~ + :~ + } + \__acro_foreign_language:en + { \str_lowercase:e { \acro_property_get:nn {#1} {foreign-babel} } } + {#3} } - #3 + {#3} } } {#3} @@ -3906,6 +3955,12 @@ display .initial:n = false } +\keys_define:nn {acro/foreign} + { + display .bool_set:N = \l__acro_show_foreign_bool , + display .initial:n = true + } + % -------------------------------------------------------------------------- \bool_new:N \l__acro_language_auto_bool @@ -4216,7 +4271,7 @@ % #1: id % #2: property % #3: text -\cs_new_protected:Npn \__acro_pdf_comment:nnn #1#2#3 +\cs_new:Npn \__acro_pdf_comment:nnn #1#2#3 { \bool_lazy_all:nTF { @@ -4225,18 +4280,21 @@ { \acro_if_short_p:n {#2} } } { - \__acro_pdf_comment_cmd:nn + \__acro_pdf_comment_cmd:ee {#3} { \acro_property_get:nn {#1} {pdfcomment} } } {#3} } +\cs_new:Npn \__acro_pdf_comment_cmd:nn #1#2 {#1} +\cs_generate_variant:Nn \__acro_pdf_comment_cmd:nn {ee} + \keys_define:nn {acro/pdfcomments} { use .bool_set:N = \l__acro_pdfcomment_use_bool , use .initial:n = false , - cmd .cs_set:Np = \__acro_pdf_comment_cmd:nn #1#2 , + cmd .cs_set_protected:Np = \__acro_pdf_comment_cmd:nn #1#2 , cmd .initial:n = \pdftooltip {#1} {#2} } @@ -4643,6 +4701,50 @@ } % ---------------------------------------------------------------------------- +\AcroModuleEnd +\AcroModule{patch}{patch other code} + +\msg_new:nnn {acro} {patch} + { Patching~ `#1'~ failed.~ Please~ contact~ the~ acro~ author. } + +\AtEndPreamble + { + % floats: + \apptocmd \@floatboxreset + { \acswitchoff } + {} + { \msg_error:nnn {acro} {patch} {floats} } + % tables: + % * tabularx + \cs_if_exist:NT \TX@trial + { + \patchcmd \TX@trial + { \let\hbadness\@tempcnta } + { \acswitchoff\let\hbadness\@tempcnta } + {} + { \msg_error:nnn {acro} {patch} {tabularx} } + } + % * ltxtable + \cs_if_exist:NT \LTXtable + { + \patchcmd \LTXtable + { \input } + { \acswitchoff\input } + {} + { \msg_error:nnn {acro} {patch} {ltxtable} } + } + % * tabu + \cs_if_exist:NT \tabuDisableCommands + { \tabuDisableCommands { \acswitchoff } } + % contents lists: + \addtocontents {toc} { \acswitchoff } + \addtocontents {lof} { \acswitchoff } + \addtocontents {lot} { \acswitchoff } + % caption package: + \cs_if_exist:NT \caption@prepareslc + { \tl_gput_right:Nn \caption@prepareslc { \acswitchoff } } + } + \AcroModuleEnd \AcroModule{definitions}{definitions of user commands} @@ -4835,16 +4937,12 @@ \begin {description} \acronymsmapF { - \item [ \acrowrite {short} \acroifT {alt} { / \acrowrite {alt} } ] + \item [ \acrowrite {short} \acroifT {alt} { / } \acrowrite {alt} ] \acrowrite {list} \acroifanyT {foreign,extra} {~(} - \acroifT {foreign} - { - \acrowrite {foreign} - \acroifT {extra} {,~} - } - \acroifT {extra} - { \acrowrite {extra} } + \acrowrite {foreign} + \acroifallT {foreign,extra} {,~} + \acrowrite {extra} \acroifanyT {foreign,extra} {)} \acropagefill \acropages @@ -4863,17 +4961,13 @@ \AcroAddRow { \acrowrite {short} - \acroifT {alt} { / \acrowrite {alt} } + \acroifT {alt} { / } \acrowrite {alt} & \acrowrite {list} \acroifanyT {foreign,extra} {~(} - \acroifT {foreign} - { - \acrowrite {foreign} - \acroifT {extra} {,~} - } - \acroifT {extra} - { \acrowrite {extra} } + \acrowrite {foreign} + \acroifallT {foreign,extra} {,~} + \acrowrite {extra} \acroifanyT {foreign,extra} {)} \acropagefill \acropages @@ -4900,17 +4994,13 @@ \AcroAddRow { \acrowrite {short} - \acroifT {alt} { / \acrowrite {alt} } + \acroifT {alt} { / } \acrowrite {alt} & \acrowrite {list} \acroifanyT {foreign,extra} {~(} - \acroifT {foreign} - { - \acrowrite {foreign} - \acroifT {extra} {,~} - } - \acroifT {extra} - { \acrowrite {extra} } + \acrowrite {foreign} + \acroifallT {foreign,extra} {,~} + \acrowrite {extra} \acroifanyT {foreign,extra} {)} \acropagefill \acropages @@ -4938,17 +5028,13 @@ \AcroAddRow { \acrowrite {short} - \acroifT {alt} { / \acrowrite {alt} } + \acroifT {alt} { / } \acrowrite {alt} & \acrowrite {list} \acroifanyT {foreign,extra} {~(} - \acroifT {foreign} - { - \acrowrite {foreign} - \acroifT {extra} {,~} - } - \acroifT {extra} - { \acrowrite {extra} } + \acrowrite {foreign} + \acroifallT {foreign,extra} {,~} + \acrowrite {extra} \acroifanyT {foreign,extra} {)} \acropagefill \acropages @@ -4977,12 +5063,13 @@ \contentsline {acro} { \numberline - { \acrowrite {short} \acroifT {alt} { / \acrowrite {alt} } } + { \acrowrite {short} \acroifT {alt} { / } \acrowrite {alt} } { \acrowrite {list} - \acroifT {foreign} - { \acrowrite {foreign} \acroifT {extra} {,~} } - \acroifT {extra} { \acrowrite {extra} } + \acroifanyT {foreign,extra} {~(} + \acrowrite {foreign} + \acroifallT {foreign,extra} {,~} + \acrowrite {extra} \acroifanyT {foreign,extra} {)} } } @@ -5000,15 +5087,16 @@ \acronymsmapF { \contentsline { \acroifchapterTF {chapter} {section} } - { \acrowrite {short} \acroifT {alt} { / \acrowrite {alt} } } + { \acrowrite {short} \acroifT {alt} { / } \acrowrite {alt} } {}{} \contentsline { \acroifchapterF {sub} section } { \acrowrite {list} - \acroifT {foreign} - { \acrowrite {foreign} \acroifT {extra} {,~} } - \acroifT {extra} { \acrowrite {extra} } - \acroifanyT {foreign,extra} {) } + \acroifanyT {foreign,extra} {~(} + \acrowrite {foreign} + \acroifallT {foreign,extra} {,~} + \acrowrite {extra} + \acroifanyT {foreign,extra} {)} } { \acropages {} {} } {} @@ -5357,7 +5445,8 @@ \acro_deprecate_option:nn {use-only-first} {true} , sort .code:n = \acro_deprecate_option:nn {list/sort} {true} , - display-foreign .code:n = \acro_remove_option: , + display-foreign .code:n = + \acro_deprecate_option:nn {foreign/display} {#1} , cite .code:n = \acro_deprecate_option:nn {cite/display} {#1} , cite-cmd .code:n = diff --git a/macros/latex/contrib/acro/examples/acro.example.acflike.pdf b/macros/latex/contrib/acro/examples/acro.example.acflike.pdf index 59494c9916..5effc70280 100644 Binary files a/macros/latex/contrib/acro/examples/acro.example.acflike.pdf and b/macros/latex/contrib/acro/examples/acro.example.acflike.pdf differ diff --git a/macros/latex/contrib/acro/examples/acro.example.issue-119.tex b/macros/latex/contrib/acro/examples/acro.example.issue-119.tex index d1b5cadc65..098e50a0e1 100644 --- a/macros/latex/contrib/acro/examples/acro.example.issue-119.tex +++ b/macros/latex/contrib/acro/examples/acro.example.issue-119.tex @@ -14,7 +14,7 @@ \immediate\write\acro@list{% \space\space \item[\acrofield{##1}{short}] - \acrofield{##1}{long}% + \acrofield{##1}{list}% \acrofieldifTF{##1}{extra}{ (\acrofield{##1}{extra})}{}% }% }{\immediate\write\acro@list{\item}\AcroRerun}% diff --git a/macros/latex/contrib/acro/examples/acro.example.texsx-505891.pdf b/macros/latex/contrib/acro/examples/acro.example.texsx-505891.pdf index 673ee23f5c..806900ddc3 100644 Binary files a/macros/latex/contrib/acro/examples/acro.example.texsx-505891.pdf and b/macros/latex/contrib/acro/examples/acro.example.texsx-505891.pdf differ diff --git a/macros/latex/contrib/acro/examples/acro.example.texsx-505891.tex b/macros/latex/contrib/acro/examples/acro.example.texsx-505891.tex index 60e22e7051..da888fdaba 100644 --- a/macros/latex/contrib/acro/examples/acro.example.texsx-505891.tex +++ b/macros/latex/contrib/acro/examples/acro.example.texsx-505891.tex @@ -1,6 +1,6 @@ \documentclass{article} -\usepackage[version=3]{acro} +\usepackage{acro} \DeclareAcroProperty{alt2} \DeclareAcroProperty{alt2-format} @@ -12,24 +12,22 @@ \acronymsmapF{ \item [% \acrowrite{short}% - \acroifT{alt}{/\acrowrite{alt}}% - \acroifT{alt2}{/\acrowrite{alt2}}% + \acroifT{alt}{/}\acrowrite{alt}% + \acroifT{alt2}{/}\acrowrite{alt2}% ] - \acrowrite{long}% + \acrowrite{list}% \acroifanyT{foreign,extra}{ (}% \acroifT{foreign}{% \acrowrite{foreign}% \acroifT{foreign-short}{, \acrowrite{foreign-short}}% \acroifT{extra}{, }% }% - \acroifT{extra}{\acrowrite{extra}}% + \acrowrite{extra}% \acroifanyT{foreign,extra}{)}% - \acroifpagesT{% - \acropagefill - \acropages - {\acrotranslate{page}\nobreakspace}% - {\acrotranslate{pages}\nobreakspace}% - }% + \acropagefill + \acropages + {\acrotranslate{page}\nobreakspace}% + {\acrotranslate{pages}\nobreakspace}% } { \item \AcroRerun } \end {description} diff --git a/macros/latex/contrib/acro/examples/acro.example.texsx-507726.tex b/macros/latex/contrib/acro/examples/acro.example.texsx-507726.tex index f9acd723d1..4f5e829713 100644 --- a/macros/latex/contrib/acro/examples/acro.example.texsx-507726.tex +++ b/macros/latex/contrib/acro/examples/acro.example.texsx-507726.tex @@ -1,18 +1,20 @@ \documentclass{article} \usepackage[english,ngerman]{babel} \usepackage{csquotes} -\usepackage[version=3]{acro} +\usepackage{acro} % issue #136 \DeclareAcroProperty{foreign-short} -\RenewAcroTemplate {long-short}{% +\RenewAcroTemplate{long-short}{% \acroiffirstTF{% \acrowrite{long}\acspace (% \acrowrite{short}% - \acroifT{foreign}{, \acrowrite{foreign}}% - \acroifT{foreign-short}{, \acrowrite{foreign-short}}% + \acroifT{foreign}{, }% + \acrowrite{foreign}% + \acroifT{foreign-short}{, }% + \acrowrite{foreign-short}% \acrogroupcite )% } @@ -26,14 +28,13 @@ \acronymsmapF{ \item [\acrowrite{short}\acroifT{alt}{/\acrowrite{alt}}] \acrowrite{long}% - \acroifanyT{foreign,extra}{ (}% - \acroifT{foreign}{% - \acrowrite{foreign}% - \acroifT{foreign-short}{, \acrowrite{foreign-short}}% - \acroifT{extra}{, }% - }% - \acroifT{extra}{\acrowrite{extra}}% - \acroifanyT{foreign,extra}{)}% + \acroifanyT{foreign,extra,foreign-short}{ (}% + \acrowrite{foreign}% + \acroifallT{foreign-short,foreign}{, }% + \acrowrite{foreign-short}% + \acroifanyT{foreign-short,foreign}{\acroifT{extra}{, }}% + \acrowrite{extra}% + \acroifanyT{foreign,extra,foreign-short}{)}% \acroifpagesT{% \acropagefill \acropages diff --git a/macros/latex/contrib/acro/examples/acro.example.units.tex b/macros/latex/contrib/acro/examples/acro.example.units.tex index 7a3ff0b351..f499a918cb 100644 --- a/macros/latex/contrib/acro/examples/acro.example.units.tex +++ b/macros/latex/contrib/acro/examples/acro.example.units.tex @@ -65,10 +65,12 @@ \acrowrite{unit}% & \def\AcronymID{##1}% - \acrowrite{long}% + \acrowrite{list}% & \def\AcronymID{##1}% - \acroifpagesT{\acropages{S. }{S. }}% + \acropages + {\acrotranslate{page}\nobreakspace}% + {\acrotranslate{pages}\nobreakspace}% \tabularnewline }% }% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/american-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/american-apa6.lbx index 925571781e..3ce35769a6 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/american-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/american-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{american-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{american-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{american} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.bbx index 6f8714a188..56248f2870 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.bbx @@ -1,4 +1,4 @@ -%% Copyright 2019 Philip Kime +%% Copyright 2020 Philip Kime %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -12,10 +12,10 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa6.bbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex references style] +\ProvidesFile{apa6.bbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex references style] \RequireBiber[3] \RequireBibliographyStyle{standard} -\urlstyle{rm} % APA examples all have URLs in same font as text +\urlstyle{same} % APA examples all have URLs in same font as text % Declare the language mapping suffix \DeclareLanguageMappingSuffix{-apa6} @@ -82,18 +82,6 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% (APA 4.16 Example 29) Some DSM macros - -\gdef\DSMIII{\emph{DSM-III}} -\gdef\DSMIIIR{\emph{DSM-III-R}} -\gdef\DSMIV{\emph{DSM-IV}} -\gdef\DSMIVTR{\emph{DSM-IV-TR}} -\gdef\PsycSCAN{\emph{PsycSCAN}} -\gdef\PsycARTICLES{\emph{PsycARTICLES}} - -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -177,9 +165,9 @@ % eprint references \DeclareFieldFormat{eprint:eric}{% - \printtext{\bibcpstring{retrieved}}% - \setunit{\addspace}% - \printtext{\bibstring{from}}\addspace% + \bibcpstring{retrieved}% + \addspace + \bibstring{from}\addspace% ERIC\addspace database\adddot\addspace% \mkbibparens{#1}} @@ -298,10 +286,11 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 6.29) Additional material sometimes goes in parens -% after title. This bool tracks the parens. +% after title. This bool used to track the +% parens. It is no longer needed and just kept +% for backwarwds compatibility. \newbool{bbx:parens} -\AtEveryBibitem{\global\boolfalse{bbx:parens}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -428,9 +417,12 @@ \printfield{nameaddon}% \ifnameundef{with} {} - {\setunit{}\addspace\mkbibparens{\printtext{\bibstring{with}\addspace}% - \printnames[apaauthor][-\value{listtotal}]{with}} - \setunit*{\addspace}}}% + {\setunit{\addspace}% + \printtext[parens]{% + \bibstring{with}% + \setunit{\addspace}% + \printnames[apaauthor][-\value{listtotal}]{with}}% + \setunit{\addspace}}}% \newunit\newblock% \usebibmacro{labelyear+extradate}} @@ -484,8 +476,8 @@ \DeclareFieldFormat{apadate}{% \ifboolexpr{ test {\ifdatecirca} or test {\ifdateuncertain} } - {\printtext{\mkbibbrackets{#1}}} - {\printtext{\mkbibparens{#1}}}} + {\mkbibbrackets{#1}} + {\mkbibparens{#1}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -544,13 +536,10 @@ \newbibmacro*{bookaddinfo}{% \ifthenelse{\iffieldundef{edition}\AND\iffieldundef{volumes}} {} - {\printtext{\bibopenparen}% - \printfield{edition}% - \setunit*{\addcomma\addspace}% - \printfield{volumes}% - \setunit{}% - \printtext{\bibcloseparen}}% -} + {\printtext[parens]{% + \printfield{edition}% + \setunit*{\addcomma\addspace}% + \printfield{volumes}}}} \renewbibmacro*{title}{% \ifthenelse{\iffieldundef{title}\AND\iffieldundef{subtitle}} @@ -641,21 +630,24 @@ \iffieldundef{number}\AND% \(\iffieldundef{volume}\OR\boolean{bbx:volseen}\)} {} - {\printtext{\bibopenparen}% - \printfield{edition}% - \setunit*{\addcomma\addspace}% - \printfield{chapter}% - \setunit*{\addcomma\addspace}% - \notbool{bbx:volseen}% - {\iffieldundef{volume}{}{\global\booltrue{bbx:volseen}}% - \printfield{volume}% - \iffieldundef{part}{}{\printfield{part}}}{}% - \setunit*{\addcomma\addspace}% - \printfield{volumes}% - \setunit*{\addcomma\addspace}% - \printfield{pages}% - \setunit{}% - \printtext{\bibcloseparen}}} + {\printtext[parens]{% + \printfield{edition}% + \setunit*{\addcomma\addspace}% + \printfield{chapter}% + \setunit*{\addcomma\addspace}% + \notbool{bbx:volseen}% + {\iffieldundef{volume} + {} + {\global\booltrue{bbx:volseen}}% + \printfield{volume}% + \iffieldundef{part} + {} + {\printfield{part}}} + {}% + \setunit*{\addcomma\addspace}% + \printfield{volumes}% + \setunit*{\addcomma\addspace}% + \printfield{pages}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -803,30 +795,28 @@ \ifnameundef{translator}}% {}% {\ifnamesequal{editor}{translator}% - {\printtext{\bibopenparen}\global\booltrue{bbx:parens}% - \printnames[apanames][-\value{listtotal}]{editor}% - \setunit*{\addcomma\addspace}% - \usebibmacro{apaeditorstrg}{editor}% - \setunit*{\addspace\&\space}% - \printtext{\bibcpstring{translator}}% - \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}} - {\printtext{\bibopenparen}\global\booltrue{bbx:parens}% - \ifnameundef{editor}% - {}% - {\printnames[apanames][-\value{listtotal}]{editor}% - \setunit{\addcomma\addspace}% - \usebibmacro{apaeditorstrg}{editor}% - \clearname{editor}% - \setunit{\adddot}% - \setunit*{\addspace\&\space}}% - \ifnameundef{translator}% - {\setunit{}}% - {\printnames[apanames][-\value{listtotal}]{translator}% - \setunit{\addcomma\addspace}% - \printtext{\bibcpstring{translator}}% - \clearname{translator}% - \setunit{\adddot}}% - \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}}} + {\printtext[parens]{% + \printnames[apanames][-\value{listtotal}]{editor}% + \setunit*{\addcomma\addspace}% + \usebibmacro{apaeditorstrg}{editor}% + \setunit*{\addspace\&\space}% + \bibcpstring{translator}}} + {\printtext[parens]{% + \ifnameundef{editor}% + {}% + {\printnames[apanames][-\value{listtotal}]{editor}% + \setunit{\addcomma\addspace}% + \usebibmacro{apaeditorstrg}{editor}% + \clearname{editor}% + \setunit{\adddot}% + \setunit*{\addspace\&\space}}% + \ifnameundef{translator}% + {\setunit{}}% + {\printnames[apanames][-\value{listtotal}]{translator}% + \setunit{\addcomma\addspace}% + \bibcpstring{translator}% + \clearname{translator}% + \setunit{\adddot}}}}}} \newbibmacro*{editor+trans}{% \ifthenelse{\ifnameundef{editor}\AND% @@ -838,17 +828,17 @@ {\ifnamesequal{editor}{translator}% {\usebibmacro{in}% \printnames[apanames][-\value{listtotal}]{editor}% - \setunit{\addspace\bibopenparen\global\booltrue{bbx:parens}}% - \usebibmacro{apaeditorstrg}{editor}% - \setunit*{\addspace\&\space}% - \printtext{\bibcpstring{translator}}% - \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}} + \setunit{\addspace} + \printtext[parens]{% + \usebibmacro{apaeditorstrg}{editor}% + \setunit*{\addspace\&\space}% + \bibcpstring{translator}}} {\ifnameundef{translator}% {}% {\setunit{\addspace}% \printtext[parens]{\printnames[apanames][-\value{listtotal}]{translator}% \setunit{\addcomma\addspace}% - \printtext{\bibcpstring{translator}}}% + \bibcpstring{translator}}% \clearname{translator}% \setunit{\adddot\addspace}}% \usebibmacro{in}% @@ -904,8 +894,11 @@ not test {\iffieldundef{origyear}} not test {\iffieldundef{labelyear}} and not test {\iffieldsequal{labelyear}{origyear}}} - {\printtext{\mkbibparens{\bibcpstring{origyear}~\printorigdate}}} - {}} + {\printtext[parens]{% + \bibcpstring{origyear} + \setunit{\addnbspace}% + \printorigdate}} + {}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1051,9 +1044,9 @@ \newcommand*{\begrelateddelimreviewof}{\addspace} \DeclareFieldFormat[review]{title}{% \entrydata*{\thefield{related}}{% - \ifentrytype{article} - {\mkbibemph{\printtext[apacase]{\thefield{savedtitle}}}} - {\printtext[apacase]{\thefield{savedtitle}}}}} + \printtext[title]{% + \printtext[apacase]{% + \thefield{savedtitle}}}}} \DeclareFieldFormat[review]{pages}{#1} \DeclareFieldFormat[review]{volume}{\mkbibemph{\apanum{#1}}} @@ -1185,26 +1178,27 @@ \DeclareFieldFormat{urldate}{#1} \renewbibmacro*{url+urldate}{% - \ifthenelse{\(\iffieldundef{url}\AND\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}\)\OR\NOT\iffieldundef{doi}} + \ifthenelse{\(\iffieldundef{url}\AND\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}\)\OR\NOT\iffieldundef{doi}} + {} + {\ifthenelse{\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}} {} - {\ifthenelse{\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}} - {} - {\printtext{\bibcpstring{abstract}}\addspace}% - \iffieldequalstr{entrysubtype}{{DVD}} - {\printtext{\bibstring{available}}} - {\printtext{\bibstring{retrieved}}}% - \setunit{\addspace}% - \iffieldundef{urlyear} - {} - {\printtext{\printurldate}% - \setunit*{\urldatecomma}}% - \printtext{\bibstring{from}}% - \setunit*{\addspace}% - \printfield{urldescription}% - \setunit*{\addcolon\addspace}% - \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}% - \iffieldundef{abstractloc}{}{\printfield{abstractloc}\renewcommand*{\finentrypunct}{\relax}}% - \iffieldundef{abstracturl}{}{\printfield{abstracturl}\renewcommand*{\finentrypunct}{\relax}}}} + {\bibcpstring{abstract}% + \setunit{\addspace}}% + \iffieldequalstr{entrysubtype}{{DVD}} + {\bibstring{available}} + {\bibstring{retrieved}}% + \setunit{\addspace}% + \iffieldundef{urlyear} + {} + {\printurldate + \setunit{\urldatecomma}}% + \bibstring{from}% + \setunit{\addspace}% + \printfield{urldescription}% + \setunit*{\addcolon\addspace}% + \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}% + \iffieldundef{abstractloc}{}{\printfield{abstractloc}\renewcommand*{\finentrypunct}{\relax}}% + \iffieldundef{abstracturl}{}{\printfield{abstracturl}\renewcommand*{\finentrypunct}{\relax}}}} % %%%%%%%%%%%%%%%%% @@ -1273,7 +1267,7 @@ \renewbibmacro*{related:reprintfrom}[1]{% \entrydata*{#1}{% - \printtext{\mkbibemph{\printfield[apacase]{title}}}% + \printtext[title]{\printfield[apacase]{title}}% \setunit{\bibpagespunct}% \printfield{pages}% \setunit{\addcomma\addspace}% @@ -1295,9 +1289,7 @@ \newbibmacro*{related:reviewof}[1]{% \setunit{}% Sanitise this in case no author \entrydata*{#1}{% - \ifentrytype{article} - {\printtext{\printfield[apacase]{title}}} - {\printtext{\mkbibemph{\printfield[apacase]{title}}}}% + \printtext[title]{\printfield[apacase]{title}}% \setunit{\addspace}% \bibstring{byauthor}\addspace \printnames[apanames][-\value{listtotal}]{author}% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.cbx index b30b4da62a..50815fdc3f 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.cbx @@ -1,4 +1,4 @@ -%% Copyright 2019 Philip Kime +%% Copyright 2020 Philip Kime %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa6.cbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex citation style] +\ProvidesFile{apa6.cbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex citation style] \RequireBiber[3] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -42,33 +42,6 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% (APA 6.12) ampersand separator in parenthetical cites - -\DeclareDelimFormat[parencite]{finalnamedelim} - {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space} - -\DeclareCiteCommand{\parencite}[\mkbibparens] - {\usebibmacro{cite:init}% - \usebibmacro{prenote}} - {\usebibmacro{citeindex}% - \usebibmacro{cite}% - \usebibmacro{cite:post}} - {} - {\usebibmacro{postnote}} - -\DeclareCiteCommand*{\parencite}[\mkbibparens] - {\usebibmacro{cite:init}% - \usebibmacro{prenote}} - {\usebibmacro{citeindex}% - \usebibmacro{citeyear}% - \usebibmacro{cite:post}} - {} - {\usebibmacro{postnote}} - -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 6.11) Suffices are not shown in citations % (APA 6.12) 3-5 authors have "et al." after first cite @@ -268,6 +241,9 @@ \savefield{fullhash}{\cbx@lasthash}}}% \setunit{\multicitedelim}} +\renewcommand*{\iffinalcitedelim}{% + \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}} + \newbibmacro*{textcite}{% \iffieldequals{fullhash}{\cbx@lasthash} % Compact cite - more than one thing for same author @@ -275,18 +251,16 @@ \usebibmacro{cite:plabelyear+extradate}} % New cite {% - \ifbool{cbx:parens} - {\bibcloseparen\global\boolfalse{cbx:parens}} - {}% - \setunit{\compcitedelim}% + \ifbool{cbx:parens} + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}% + \setunit{\textcitedelim}% \ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}} % No author/editor or patent {\iffieldundef{shorthand}% % Cite using title {\usebibmacro{cite:noname}% - \setunit{\ifbool{cbx:np}% - {\printdelim{nameyeardelim}}% - {\global\booltrue{cbx:parens}\addspace\bibopenparen}}% + \setunit{\global\booltrue{cbx:parens}\addspace\bibopenparen}% \usebibmacro{cite:plabelyear+extradate}} % Cite using shorthand {\usebibmacro{cite:shorthand}}} @@ -300,19 +274,22 @@ {\printnames{shortauthor}} {\printnames[labelname][-\value{listtotal}]{author}}}% % Year - \setunit{\ifbool{cbx:np} - {\printdelim{nameyeardelim}} - {\global\booltrue{cbx:parens}\addspace\bibopenparen}}% + \setunit{\global\booltrue{cbx:parens}\addspace\bibopenparen}% % Put the shortauthor inside the year brackets if necessary \ifnameundef{shortauthor} {} {\cbx@apa@ifnamesaved {} {\printnames{shortauthor}\setunit{\printdelim{nameyeardelim}}}}% + % Print prenote (belongs to first cite) + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% % Actual year printing \usebibmacro{cite:plabelyear+extradate}% % Save name hash for checks later - \savefield{fullhash}{\cbx@lasthash}}}} + \savefield{fullhash}{\cbx@lasthash}}% + \stepcounter{textcitecount}}} \newbibmacro*{cite:plabelyear+extradate}{% \iffieldundef{labelyear}{} @@ -363,29 +340,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% (APA 6.21) No parens round year for cites when the cite is in -% parentheses. Use new command \nptextcite for such cites. - -\DeclareDelimFormat[nptextcite]{finalnamedelim} - {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space} - -\DeclareCiteCommand{\nptextcite} - {\usebibmacro{cite:init}% - \usebibmacro{prenote}} - {\usebibmacro{citeindex}% - \global\booltrue{cbx:np}% - \usebibmacro{textcite}% - \usebibmacro{cite:post}% - \global\boolfalse{cbx:np}}% - {} - {\iffieldundef{postnote} - {} - {\printdelim{nameyeardelim}% - \printfield{postnote}}} -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % No shorthand @@ -449,7 +404,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \newbool{cbx:parens} % boolean to say we're inside parens -\newbool{cbx:np} % boolean to say we're using a non-parentheses text cite \newbibmacro*{textcite:postnote}{% \usebibmacro{postnote}% @@ -478,6 +432,16 @@ {\printfield{labelyear}% \printfield{extradate}}} + +\DeclareCiteCommand{\citeauthor} + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite:author}% + \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} + \DeclareCiteCommand{\citeyear} {\boolfalse{citetracker}% \boolfalse{pagetracker}% @@ -486,6 +450,7 @@ {\multinamedelim} {\usebibmacro{postnote}} + \DeclareCiteCommand{\cite} {\usebibmacro{cite:init}% \usebibmacro{prenote}} @@ -495,6 +460,8 @@ {} {\usebibmacro{postnote}} +\DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}} + \DeclareCiteCommand*{\cite} {\usebibmacro{cite:init}% \usebibmacro{prenote}} @@ -504,9 +471,15 @@ {} {\usebibmacro{postnote}} -\DeclareCiteCommand{\footcite}[\mkbibfootnote] - {\bibsentence - \usebibmacro{cite:init}% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.12) ampersand separator in parenthetical cites + +\DeclareDelimFormat[parencite]{finalnamedelim} + {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space} + +\DeclareCiteCommand{\parencite}[\mkbibparens] + {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% \usebibmacro{cite}% @@ -514,35 +487,127 @@ {} {\usebibmacro{postnote}} -\DeclareCiteCommand{\textcite} +\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite} + {\setunit{\multicitedelim}} + +\DeclareCiteCommand*{\parencite}[\mkbibparens] {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% - \usebibmacro{textcite}% + \usebibmacro{citeyear}% \usebibmacro{cite:post}} {} - {\usebibmacro{textcite:postnote}} + {\usebibmacro{postnote}} -\DeclareCiteCommand{\citeauthor} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.21) No parens round year for cites when the cite is in +% parentheses. Use new command \nptextcite for such cites. + +\DeclareDelimAlias*[nptextcite]{finalnamedelim}[parencite]{finalnamedelim} + +\DeclareCiteCommand{\nptextcite} {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% - \usebibmacro{cite:author}% + \usebibmacro{cite}% \usebibmacro{cite:post}} {} {\usebibmacro{postnote}} - -\DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}} -\DeclareMultiCiteCommand{\textcites}{\textcite}{\setunit{\compcitedelim}} \DeclareMultiCiteCommand{\nptextcites}{\nptextcite}{\setunit{\multicitedelim}} -\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite} - {\setunit{\multicitedelim}} + +\DeclareCiteCommand*{\nptextcite} + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{citeyear}% + \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\DeclareCiteCommand{\footcite}[\mkbibfootnote] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}% + \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} + \DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite} {\setunit{\multicitedelim}} + +\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}% + \usebibmacro{cite:post}} + {} + {\usebibmacro{postnote}} + \DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext] {\footcitetext}{\setunit{\multicitedelim}} + + +\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote] + {\usebibmacro{cite:init}% + \usebibmacro{prenote}} + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{postnote}} + \DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote] {\smartcite}{\setunit{\multicitedelim}} + +\DeclareCiteCommand{\cbx@textcite} + {\usebibmacro{cite:init}} + {\usebibmacro{citeindex}% + \usebibmacro{textcite}% + \usebibmacro{cite:post}} + {} + {\usebibmacro{textcite:postnote}} + +\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite] + {\gdef\cbx@savedkeys{}% + \citetrackerfalse% + \pagetrackerfalse% + \DeferNextCitekeyHook% + \usebibmacro{cite:init}} + {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0} + {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}% + \global\clearfield{multipostnote}} + {}% + \xappto\cbx@savedkeys{\thefield{entrykey},}% + \iffieldequals{namehash}{\cbx@lasthash} + {} + {\stepcounter{textcitetotal}% + \savefield{namehash}{\cbx@lasthash}}} + {} + {\protected@xappto\cbx@savedcites{% + [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} + +% textcite has nested \DeclareCiteCommand definitions for textcite and we want to use +% the normal textcite context +\DeclareDelimcontextAlias{cbx@textcite}{textcite} + +\newrobustcmd{\cbx@textcite@init}[2]{% + \setcounter{textcitetotal}{0}% + \setcounter{textcitecount}{0}% + \def\cbx@savedcites{#1}#2\cbx@savedcites\empty} + +\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{} +\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{} + +\let\cbx@textcites@init\cbx@textcite@init +\pretocmd{\cbx@textcites@init}{\UseNextMultiCiteHook}{}{} + \endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.dbx index d85f511a66..1e31e40fa8 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.dbx @@ -1,4 +1,4 @@ -%% Copyright 2019 Philip Kime +%% Copyright 2020 Philip Kime %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa6.dbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex style data model] +\ProvidesFile{apa6.dbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex style data model] \RequireBiber[3] \DeclareDatamodelEntrytypes{ diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/austrian-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/austrian-apa6.lbx index 7229705370..0ce89fce42 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/austrian-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/austrian-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{austrian-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{austrian-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{austrian} % Following DGPs guidlines for German/Austrian diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test.pdf index 998145555e..c056b75b0f 100644 Binary files a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test.pdf and b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test.pdf differ diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.pdf index b771b6aaea..0a57a7be90 100644 Binary files a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.pdf and b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.pdf differ diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.tex b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.tex index e2acfe3544..a1b236afe6 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.tex @@ -24,7 +24,7 @@ url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/}, author={Philip Kime}, email={Philip@kime.org.uk}, - revision={8.2}, + revision={8.4}, date={\today}} \hypersetup{% @@ -457,7 +457,15 @@ applied to the data stream by |biber| and does not change your \file{.bib}. \section{Revision history}\label{rev} \begin{changelog} -\begin{release}{8.2}{2019-12-01} +\begin{release}{8.4}{2020-05-03} +\item Misc bug fixes +\end{release} + +\begin{release}{8.3}{2019-12-02} +\item Misc bug fixes +\end{release} + + \begin{release}{8.2}{2019-12-01} \item Removed |apabackref| option, use the standard |biblatex| |backref| option instead \end{release} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/brazilian-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/brazilian-apa6.lbx index cb6760a878..4ec7f9158c 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/brazilian-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/brazilian-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{brazilian-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{brazilian-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{brazilian} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/british-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/british-apa6.lbx index 036ce2bef1..31642b76bb 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/british-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/british-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{british-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{british-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{british} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/danish-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/danish-apa6.lbx index 456a057fd1..dc237de87c 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/danish-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/danish-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{danish-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{danish-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{danish} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/dutch-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/dutch-apa6.lbx index 4795fcd37b..903a7b77ae 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/dutch-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/dutch-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{dutch-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{dutch-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{dutch} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/english-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/english-apa6.lbx index 9eadd285d0..79336ea83e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/english-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/english-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{english-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{english-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{english} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/french-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/french-apa6.lbx index 3f19ee669e..4aed01e37a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/french-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/french-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{french-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{french-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{french} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/galician-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/galician-apa6.lbx index 52465ab0d2..5c90b5fb0c 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/galician-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/galician-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{galician-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{galician-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{galician} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/german-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/german-apa6.lbx index 91a5cea456..dd01497295 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/german-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/german-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{german-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{german-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{german} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/greek-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/greek-apa6.lbx index 3cf49cb96d..c65da12ebe 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/greek-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/greek-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{greek-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{greek-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{greek} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/italian-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/italian-apa6.lbx index 9fc2a327ea..f24dda01a3 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/italian-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/italian-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{italian-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{italian-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{italian} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/naustrian-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/naustrian-apa6.lbx index eb0034b2e2..efc7dadade 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/naustrian-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/naustrian-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{naustrian-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{naustrian-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{naustrian} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/ngerman-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/ngerman-apa6.lbx index a5289b2a8a..3647ba8fc1 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/ngerman-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/ngerman-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{ngerman-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{ngerman-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{ngerman} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/norsk-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/norsk-apa6.lbx index 083b8e97fa..21cf3366ac 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/norsk-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/norsk-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{norsk-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{norsk-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{norsk} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/norwegian-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/norwegian-apa6.lbx index 52f60affff..1e4bd4f649 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/norwegian-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/norwegian-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{norwegian-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{norwegian-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{norwegian} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/nswissgerman-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/nswissgerman-apa6.lbx index 040afdc2e3..793ea22062 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/nswissgerman-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/nswissgerman-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{nswissgerman-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{nswissgerman-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{nswissgerman} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/nynorsk-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/nynorsk-apa6.lbx index 809be547a3..d6660c762a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/nynorsk-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/nynorsk-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{nynorsk-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{nynorsk-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{nynorsk} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/portuguese-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/portuguese-apa6.lbx index e70cc569c8..9b272a9977 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/portuguese-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/portuguese-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{portuguese-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{portuguese-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{portuguese} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/russian-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/russian-apa6.lbx index 6850ffa1f9..42399aa9c9 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/russian-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/russian-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{russian-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{russian-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{russian} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/slovene-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/slovene-apa6.lbx index 1ce595d0d6..e04b8fcac9 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/slovene-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/slovene-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{slovene-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{slovene-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{slovene} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/spanish-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/spanish-apa6.lbx index c26be88ec3..79e7669705 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/spanish-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/spanish-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{spanish-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{spanish-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{spanish} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced @@ -54,7 +54,7 @@ page = {{P\'agina}{{}p\adddot}}, pages = {{P\'aginas}{{}pp\adddot}}, on = {{el}{el}}, - retrieved = {{Recuperado}{Recuperado}}, + retrieved = {{Consultado}{Consultado}}, available = {{disponible}{disponible}}, from = {{desde}{desde}}, archivedat = {{archivado en}{archivado en}}, diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/swedish-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/swedish-apa6.lbx index 644afb1b0d..667af52f53 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/swedish-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/swedish-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{swedish-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{swedish-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{swedish} % (APA 6.22) The example abbreviations diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/swissgerman-apa6.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/swissgerman-apa6.lbx index 87109df58f..335cd7df89 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/swissgerman-apa6.lbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/swissgerman-apa6.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{swissgerman-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation] +\ProvidesFile{swissgerman-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{swissgerman} % Following DGPs guidlines for German/Austrian/Swiss German diff --git a/macros/latex/contrib/fancyvrb/Changes b/macros/latex/contrib/fancyvrb/Changes index c59dc316ec..83f18e56f9 100644 --- a/macros/latex/contrib/fancyvrb/Changes +++ b/macros/latex/contrib/fancyvrb/Changes @@ -1,4 +1,6 @@ --- fancyvrb.sty +3.6 2020/05/03 - added optional argument reflabel for page references + to verbatim environments (hv) 3.5 2020/01/13 - use \verbvisiblespace instead of \textvisiblespace (hv) 3.4 2019/11/09 - use catcode change for space if \textvisiblespace doesn't exist (hv) 3.3 2019/10/22 - use \textvisiblespace for showspaces (hv) diff --git a/macros/latex/contrib/fancyvrb/README b/macros/latex/contrib/fancyvrb/README index e78fec959f..878c579897 100644 --- a/macros/latex/contrib/fancyvrb/README +++ b/macros/latex/contrib/fancyvrb/README @@ -20,8 +20,8 @@ font family and size, numbering lines, framing code examples, colouring text and conditionally processing text. `fancyvrb' was heavily used in the typesetting of the "LaTeX Graphics -Companion", by Michel Goossens, Sebastian Rahtz and Frank Mittelbach, Addison -Wesley, 1997. +Companion", by Michel Goossens, Frank Mittelbach, Sebastian Rahtz, +Denis Roegel, and Herbert Voß, Addison Wesley, 2007. It was presented March 31, 1998 for EuroTeX'98. The original paper is available on "Cahiers GUTenberg" diff --git a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf index 7a929f1147..33799f3b3d 100644 Binary files a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf and b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf differ diff --git a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex index e28dc41408..e64a86f3ba 100644 --- a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex +++ b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex @@ -1,13 +1,12 @@ \documentclass{article} %\usepackage[T1]{fontenc} %\usepackage[charter]{mathdesign} -\usepackage{libertinus-otf} -%\usepackage[scaled=0.84]{beramono} +\usepackage{libertinus} \setmonofont[Scale=MatchLowercase,FakeStretch=0.9]{AnonymousPro-Regular.ttf} - +%\usepackage[scaled=0.88]{beramono} \newif\ifChangeBar \ChangeBarfalse \usepackage{fancyvrb} -\usepackage[pstricks]{fancyvrb-ex} +\usepackage{fancyvrb-ex} \usepackage{xurl} \usepackage[colorlinks,linktocpage]{hyperref} \parskip=3pt plus 1pt minus 1pt @@ -63,7 +62,7 @@ {\footnotesize and}\\[-2mm] {\footnotesize Herbert Voß\ (FU Berlin -- DE)} } -\date{Version 3.5\\ \today} +\date{Version 3.6\\ \today} \fvset{frame=single,xrightmargin=0cm,numbers=left,numbersep=3pt,commentchar=Z} @@ -83,6 +82,7 @@ Report bugs to \url{hvoss@tug.org} \vfill Thanks to +Claudio Beccari, Philippe Esperet, %\url{esperet@marie.polytechnique.fr}, Michael Friendly, %\url{friendly@hotspur.psych.yorku.ca}, Mario Hassler, %\url{HASSLER@ippnv2.ipp.kfa-juelich.de}, @@ -919,6 +919,25 @@ text: This allows us to do some devious tricks: see the example in Section \ref{sec:VerbatimInclude} on page~\pageref{sec:VerbatimInclude}. + +\subsubsection{Reference label} + +\begin{optlist} + \item[reflabel (