diff options
Diffstat (limited to 'macros/latex')
36 files changed, 95 insertions, 104 deletions
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 c67da1f37c..03e5924d57 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{american-apa6.lbx}[2019/12/01\space v8.2\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 61f99fb3f6..8fff277b41 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 +p%% Copyright 2019 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.bbx}[2019/11/27\space v8.1\space APA 6th ed. biblatex references style] +\ProvidesFile{apa6.bbx}[2019/12/01\space v8.2\space APA 6th ed. biblatex references style] \RequireBiber[3] \RequireBibliographyStyle{standard} \urlstyle{rm} % APA examples all have URLs in same font as text @@ -251,7 +251,7 @@ \ExecuteBibliographyOptions{% abbreviate=true,% autocite=inline,% - backref=true,% + backref=false,% citetracker=true,% date=apalong,% dateabbrev=false,% @@ -295,18 +295,6 @@ } } -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% It is not APA standard to have backrefs in the bib -% Some users might like it though. - -\newbool{apa:backref} -\DeclareBibliographyOption{apabackref}{% - \ifstrequal{#1}{true} - {\global\booltrue{apa:backref}} - {\global\boolfalse{apa:backref}}} - -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 6.29) Additional material sometimes goes in parens @@ -1348,7 +1336,7 @@ \usebibmacro{related}} {}% \usebibmacro{apa:finpunct}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{finentry}} \DeclareBibliographyDriver{newsarticle}{% @@ -1375,7 +1363,7 @@ \usebibmacro{related}} {}% \usebibmacro{apa:finpunct}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{finentry}} \DeclareBibliographyDriver{book}{% @@ -1401,7 +1389,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1428,7 +1416,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1461,7 +1449,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1486,7 +1474,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1517,7 +1505,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1548,7 +1536,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1590,7 +1578,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1621,7 +1609,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1653,7 +1641,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1681,7 +1669,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1710,7 +1698,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1736,7 +1724,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1759,7 +1747,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1786,7 +1774,7 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1821,7 +1809,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1850,7 +1838,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1877,7 +1865,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1904,7 +1892,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1933,7 +1921,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1962,7 +1950,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1989,7 +1977,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -2009,7 +1997,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -2029,7 +2017,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -2059,7 +2047,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{apa:finpunct} \usebibmacro{finentry}} @@ -2175,14 +2163,6 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Wrapper for backrefs - -\newbibmacro{apa:pageref}{% - \ifbool{apa:backref}{\usebibmacro{pageref}}{}} - -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.cbx index 8284dff849..581f254693 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.cbx @@ -9,10 +9,10 @@ %% version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `maintained'. -%% +%% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa6.cbx}[2019/11/27\space v8.1\space APA 6th ed. biblatex citation style] +\ProvidesFile{apa6.cbx}[2019/12/01\space v8.2\space APA 6th ed. biblatex citation style] \RequireBiber[3] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -242,7 +242,7 @@ % X and Y and Z (2009) % X and W and V (2010) % -% which have the same namehash due to minnames visibility truncation to 1 +% which have the same namehash due to minnames visibility truncation to 1 % would be printed incorrectly as % \cite{one, two} -> X, Y & Z 2009, 2010 \newbibmacro*{cite}{% @@ -370,7 +370,6 @@ \DeclareDelimFormat[nptextcite]{finalnamedelim} {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space} -\DeclareMultiCiteCommand{\nptextcites}{\nptextcite}{\multicitedelim} \DeclareCiteCommand{\nptextcite} {\usebibmacro{cite:init}% \usebibmacro{prenote}} @@ -390,7 +389,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % No shorthand -% +% \newbibmacro*{citeyear}{% \iffieldundef{labelyear} {\usebibmacro{cite:init}} @@ -515,8 +514,6 @@ {} {\usebibmacro{postnote}} -\DeclareMultiCiteCommand{\textcites}{\textcite}{\compcitedelim} - \DeclareCiteCommand{\textcite} {\usebibmacro{cite:init}% \usebibmacro{prenote}} @@ -535,4 +532,17 @@ {} {\usebibmacro{postnote}} + +\DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\textcites}{\textcite}{\setunit{\compcitedelim}} +\DeclareMultiCiteCommand{\nptextcites}{\nptextcite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite} + {\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite} + {\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext] + {\footcitetext}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote] + {\smartcite}{\setunit{\multicitedelim}} + \endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.dbx index 48f94999d7..2dbac52698 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.dbx @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa6.dbx}[2019/11/27\space v8.1\space APA 6th ed. biblatex style data model] +\ProvidesFile{apa6.dbx}[2019/12/01\space v8.2\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 4ca5219127..73cc9eff56 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{austrian-apa6.lbx}[2019/12/01\space v8.2\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-apa-test.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa-test.pdf Binary files differdeleted file mode 100644 index 92de9ef490..0000000000 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa-test.pdf +++ /dev/null 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 Binary files differindex 3ae40818e7..08decb866a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6-test.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.pdf Binary files differindex ae85a92118..52bc6a548c 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa6/biblatex-apa6.pdf 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 221bb1c916..e2acfe3544 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.1}, + revision={8.2}, date={\today}} \hypersetup{% @@ -251,16 +251,6 @@ The following options are set as usual in the options passed to |biblatex|. \begin{ltxcode} -apabackref=true|false -\end{ltxcode}% | stupid comment to stop emacs highlighting as verb due - % to single pipe - -\noindent It is not APA style to include backreferences in the References to -pages where citations of the entry occur. However, this is very -useful, especially in proofing and so if you set the |apabackref| -option to «true», these are enabled. The default is «false». - -\begin{ltxcode} apamaxprtauth=<num> \end{ltxcode} @@ -467,6 +457,10 @@ 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} +\item Removed |apabackref| option, use the standard + |biblatex| |backref| option instead +\end{release} \begin{release}{8.1}{2019-11-27} \item Corrected documentation for legacy 6th edition style 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 ef292120b2..436ac9c87a 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{brazilian-apa6.lbx}[2019/12/01\space v8.2\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 6a31ce4945..fb681549b7 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{british-apa6.lbx}[2019/12/01\space v8.2\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 8e3f35c134..dccb0a4016 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{danish-apa6.lbx}[2019/12/01\space v8.2\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 e6bd73bc8f..f49dd16eeb 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{dutch-apa6.lbx}[2019/12/01\space v8.2\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 2dbc0716e9..a2b4dcbe30 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{english-apa6.lbx}[2019/12/01\space v8.2\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 10a6b16dca..ced24ab438 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{french-apa6.lbx}[2019/12/01\space v8.2\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 7430bc6601..0bdac305b2 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{galician-apa6.lbx}[2019/12/01\space v8.2\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 74a58af809..6fa6a51be1 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{german-apa6.lbx}[2019/12/01\space v8.2\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 130a5ae1c8..c85fb78e9e 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{greek-apa6.lbx}[2019/12/01\space v8.2\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 10682b6242..deaf12a53d 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{italian-apa6.lbx}[2019/12/01\space v8.2\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 1885026e67..04633411ae 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{naustrian-apa6.lbx}[2019/12/01\space v8.2\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 8aa8892ddd..e4f82536e0 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{ngerman-apa6.lbx}[2019/12/01\space v8.2\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 25843dac49..82aede694c 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{norsk-apa6.lbx}[2019/12/01\space v8.2\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 58edd9310b..7607c475b5 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{norwegian-apa6.lbx}[2019/12/01\space v8.2\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 a39910cad6..959144cbc0 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{nswissgerman-apa6.lbx}[2019/12/01\space v8.2\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 6354be0d65..9fa7a8627f 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{nynorsk-apa6.lbx}[2019/12/01\space v8.2\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 09e7c65896..33b8adf4ac 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{portuguese-apa6.lbx}[2019/12/01\space v8.2\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 c1d91d306f..bf5c6864e5 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{russian-apa6.lbx}[2019/12/01\space v8.2\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 04d3ad581a..a572fa9ce0 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{slovene-apa6.lbx}[2019/12/01\space v8.2\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 431c4e56f1..1dab1f59bb 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{spanish-apa6.lbx}[2019/12/01\space v8.2\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{spanish} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced 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 bb8c0f8f4e..1e9e68a6bf 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{swedish-apa6.lbx}[2019/12/01\space v8.2\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 b8d0f0a0ce..e85e399990 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/11/27\space v8.1\space APA 6th ed. biblatex localisation] +\ProvidesFile{swissgerman-apa6.lbx}[2019/12/01\space v8.2\space APA 6th ed. biblatex localisation] \InheritBibliographyExtras{swissgerman} % Following DGPs guidlines for German/Austrian/Swiss German diff --git a/macros/latex/contrib/hvqrurl/Changes b/macros/latex/contrib/hvqrurl/Changes index dbf1c990f2..85dfdd189e 100644 --- a/macros/latex/contrib/hvqrurl/Changes +++ b/macros/latex/contrib/hvqrurl/Changes @@ -1,2 +1,3 @@ hvqrurl.sty: -0.01 2019-11-27 - first CTAN version +0.01a 2019-12-01 - fixes to the documentation +0.01 2019-11-27 - first CTAN version diff --git a/macros/latex/contrib/hvqrurl/README b/macros/latex/contrib/hvqrurl/README index 12b48923cb..8de40ba379 100644 --- a/macros/latex/contrib/hvqrurl/README +++ b/macros/latex/contrib/hvqrurl/README @@ -3,8 +3,8 @@ Placing an URL as a QR code into the margin of the text. The package loads by default url, qrcode, marginnote, xcolor, and xkeyval -%% This program can be redistributed and/or modified under the terms -%% of the LaTeX Project Public License Distributed from CTAN archives -%% in directory macros/latex/base/lppl.txt. +This file is distributed under the terms of the LaTeX Project Public +License from CTAN archives in directory macros/latex/base/lppl.txt. +Either version 1.3 or, at your option, any later version. hvoss@tug.org
\ No newline at end of file diff --git a/macros/latex/contrib/hvqrurl/doc/hvqrurl.pdf b/macros/latex/contrib/hvqrurl/doc/hvqrurl.pdf Binary files differindex f1e8eb176c..7a0aa0aa49 100644 --- a/macros/latex/contrib/hvqrurl/doc/hvqrurl.pdf +++ b/macros/latex/contrib/hvqrurl/doc/hvqrurl.pdf diff --git a/macros/latex/contrib/hvqrurl/doc/hvqrurl.tex b/macros/latex/contrib/hvqrurl/doc/hvqrurl.tex index 23196651ec..7125c0d723 100644 --- a/macros/latex/contrib/hvqrurl/doc/hvqrurl.tex +++ b/macros/latex/contrib/hvqrurl/doc/hvqrurl.tex @@ -1,4 +1,4 @@ -%% $Id: hvqrurl.tex 1118 2019-11-29 07:56:18Z herbert $ +%% $Id: hvqrurl.tex 1119 2019-11-30 17:36:28Z herbert $ \listfiles \errorcontextlines=100 \documentclass[twoside,usegeometry]{scrartcl} @@ -37,7 +37,7 @@ \hypersetup{urlcolor=blue, linktocpage, colorlinks=true}% \begin{document} -\title{Package \texttt{hvqrurl}\\Creating a QR-code of an URL in the margin \\ver 0.01} +\title{Package \texttt{hvqrurl}\\Creating a QR-code of an URL in the margin \\\small ver 0.01a} \author{Herbert Voß\thanks{\protect\url{hvoss@tug.org}}} \date{\today} \maketitle @@ -52,13 +52,13 @@ and \end{abstract} -\section{The macro} +\section{The macros} \begin{BDef} -\Lcs{hvqrset}\Largb{key=value list}\\ -\Lcs{hvqrurl}\Largb{key=value list}\Largb{URL}\\ -\Lcs{hvqrurl*}\Largb{key=value list}\Largb{URL} +\Lcs{hvqrset}\Largb{key=value, \ldots}\\ +\Lcs{hvqrurl}\OptArg{key=value, \ldots}\Largb{URL}\\ +\Lcs{hvqrurl*}\OptArg{key=value, \ldots}\Largb{URL} \end{BDef} With the default macro \Lcs{hvqrurl} the URL is printed as as QR code into the margin and @@ -66,6 +66,13 @@ in the the text as usual with the macro \Lcs{url}, for example \hvqrurl{https:// With \LPack{hyperref} you'll get the the same color for the QR code as for the URL link and, of course, is also a link. This example shows the default setting for a QR code. +With \Lcs{hvqrset} one can set the optional arguments globally. For example if one do not want all +QR codes not as a link when using \LPack{hyperref}: + +\begin{lstlisting} +\hvqrset{qrlink=nolink} +\end{lstlisting} + \section{Optional arguments} @@ -75,7 +82,6 @@ is also a link. This example shows the default setting for a QR code. With \Lkeyset{qrlink=nolink} the QR code is no link: \hvqrurl[qrlink=nolink]{https://mirror.ctan.org/pkg/hvqrurl}. The default setting is \Lkeyset{qrlink=link}. \end{lstlisting} - With \Lkeyset{qrlink=nolink} the QR code is no link: \hvqrurl[qrlink=nolink]{https://mirror.ctan.org/pkg/hvqrurl}. The default setting is \Lkeyset{qrlink=link}. Without using \LPack{hyperref} this optional argument has no meaning. diff --git a/macros/latex/contrib/hvqrurl/latex/hvqrurl.sty b/macros/latex/contrib/hvqrurl/latex/hvqrurl.sty index b8c657b82f..bf27b32006 100644 --- a/macros/latex/contrib/hvqrurl/latex/hvqrurl.sty +++ b/macros/latex/contrib/hvqrurl/latex/hvqrurl.sty @@ -7,7 +7,7 @@ % Copyright 2019 Herbert Voss hvoss@tug.org %% \ProvidesPackage{hvqrurl}[% - 2019/11/27 v.0.01 (Herbert Voss) Supports qr images into the margin (hv)] + 2019/12/01 v.0.01a (Herbert Voss) Supports qr images into the margin (hv)] % \NeedsTeXFormat{LaTeX2e} \RequirePackage{url} |