diff options
Diffstat (limited to 'macros/latex/contrib')
28 files changed, 726 insertions, 1734 deletions
diff --git a/macros/latex/contrib/apa7/README.txt b/macros/latex/contrib/apa7/README.txt index 91f1a11659..f144b7a199 100644 --- a/macros/latex/contrib/apa7/README.txt +++ b/macros/latex/contrib/apa7/README.txt @@ -3,7 +3,7 @@ apa7 - A LaTeX class for formatting documents in compliance with the American Psychological Association's Publication Manual, 7th edition -Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> +Copyright (C) 2020 by Daniel A. Weiss <daniel.weiss.led at gmail.com> This work may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either diff --git a/macros/latex/contrib/apa7/apa7.dtx b/macros/latex/contrib/apa7/apa7.dtx index 4641281267..b670b67b92 100644 --- a/macros/latex/contrib/apa7/apa7.dtx +++ b/macros/latex/contrib/apa7/apa7.dtx @@ -4,11 +4,11 @@ % % % CHANGE THESE VALUES WITH EACH NEW RELEASE: % % % -%<class>\ProvidesClass{apa7}[2019/12/30 v1.04 APA formatting (7th edition)] +%<class>\ProvidesClass{apa7}[2020/3/27 v1.05 APA formatting (7th edition)] % % %<*internal> % -\def\apaSevenVersionDate{2019/12/30} -\def\apaSevenVersionNumber{1.04} +\def\apaSevenVersionDate{2020/3/27} +\def\apaSevenVersionNumber{1.05} % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -20,7 +20,7 @@ apa7 - A LaTeX class for formatting documents in compliance with the American Psychological Association's Publication Manual, 7th edition -Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> +Copyright (C) 2020 by Daniel A. Weiss <daniel.weiss.led at gmail.com> This work may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either @@ -61,7 +61,7 @@ manuscript type has been added. See the documentation for details. apa7 - A LaTeX class for formatting documents in compliance with the American Psychological Association's Publication Manual, 7th edition -Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> +Copyright (C) 2020 by Daniel A. Weiss <daniel.weiss.led at gmail.com> This work may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either @@ -81,7 +81,7 @@ by, the American Psychological Association. \endpreamble \postamble -Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> +Copyright (C) 2020 by Daniel A. Weiss <daniel.weiss.led at gmail.com> This work may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either @@ -238,6 +238,8 @@ and the derived files apa7.ins, % \changes{v1.04}{2019/12/30}{Added table of contents.} % \changes{v1.04}{2019/12/30}{Updated documentation and added correct license statement to cls for apa6 package.} % +% \changes{v1.05}{2020/3/27}{Fixed float placement at end for man and stu mode to ensure one correctly placed figure/table per page. Thanks WC!} +% % \begin{abstract} % The \textit{Publication Manual} of the American Psychological % Association is widely used in the social sciences. The most @@ -2268,6 +2270,7 @@ and the derived files apa7.ins, \@noendfloatfig \else \efloat@condopen{fff} + \@nameuse{efloat@separator@fff}% \efloat@iwrite{fff}{\string\begin{figure*}[hbt]}% \global\def\@figure@written{\relax}% Set a flag that there is at least one figure -- thp 20010705 %% should be a global declaration to be "visible" at end document @@ -2292,6 +2295,7 @@ and the derived files apa7.ins, \@noendfloattab \else \efloat@condopen{ttt} + \@nameuse{efloat@separator@ttt}% \efloat@iwrite{ttt}{\string\begin{table*}[hbt]}% \ifnextchar[{\gobbleuntilnext[}{} \@ifundefined{hrm}{}{% diff --git a/macros/latex/contrib/apa7/apa7.ins b/macros/latex/contrib/apa7/apa7.ins new file mode 100644 index 0000000000..054d5df5e4 --- /dev/null +++ b/macros/latex/contrib/apa7/apa7.ins @@ -0,0 +1,163 @@ +%% +%% This is file `apa7.ins', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% apa7.dtx (with options: `install') +%% ---------------------------------------------------------------------- +%% +%% apa7 - A LaTeX class for formatting documents in compliance with the +%% American Psychological Association's Publication Manual, 7th edition +%% +%% Copyright (C) 2020 by Daniel A. Weiss <daniel.weiss.led at gmail.com> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License (LPPL), either +%% version 1.3c of this license or (at your option) any later +%% version. The latest version of this license is in the file: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% Users may freely modify these files without permission, as long as the +%% copyright line and this statement are maintained intact. +%% +%% This work is not endorsed by, affiliated with, or probably even known +%% by, the American Psychological Association. +%% +%% ---------------------------------------------------------------------- +%% +\input docstrip.tex +\keepsilent +\askforoverwritefalse +\preamble +---------------------------------------------------------------------- + +apa7 - A LaTeX class for formatting documents in compliance with the +American Psychological Association's Publication Manual, 7th edition + +Copyright (C) 2020 by Daniel A. Weiss <daniel.weiss.led at gmail.com> + +This work may be distributed and/or modified under the +conditions of the LaTeX Project Public License (LPPL), either +version 1.3c of this license or (at your option) any later +version. The latest version of this license is in the file: + +http://www.latex-project.org/lppl.txt + +Users may freely modify these files without permission, as long as the +copyright line and this statement are maintained intact. + +This work is not endorsed by, affiliated with, or probably even known +by, the American Psychological Association. + +---------------------------------------------------------------------- + +\endpreamble +\postamble + +Copyright (C) 2020 by Daniel A. Weiss <daniel.weiss.led at gmail.com> + +This work may be distributed and/or modified under the +conditions of the LaTeX Project Public License (LPPL), either +version 1.3c of this license or (at your option) any later +version. The latest version of this license is in the file: + +http://www.latex-project.org/lppl.txt + +Users may freely modify these files without permission, as long as the +copyright line and this statement are maintained intact. + +This work is not endorsed by, affiliated with, or probably even known +by, the American Psychological Association. + +This work is "maintained" (as per LPPL maintenance status) by +Daniel A. Weiss. + +This work consists of the file apa7.dtx +and the derived files apa7.ins, + apa7.cls, + apa7.pdf, + README, + APA7american.txt, + APA7british.txt, + APA7dutch.txt, + APA7english.txt, + APA7german.txt, + APA7ngerman.txt, + APA7greek.txt, + APA7czech.txt, + APA7turkish.txt, + APA7endfloat.cfg, + Figure1.pdf, + shortsample.tex, + longsample.tex, and + bibliography.bib. + +\endpostamble +\usedir{tex/latex/apa7} +\generate{ + \file{\jobname.cls}{\from{\jobname.dtx}{class}} +} +\usedir{tex/latex/apa7/config} +\generate{ + \file{./config/APA7american.txt}{\from{\jobname.dtx}{american}} + \file{./config/APA7british.txt}{\from{\jobname.dtx}{british}} + \file{./config/APA7dutch.txt}{\from{\jobname.dtx}{dutch}} + \file{./config/APA7english.txt}{\from{\jobname.dtx}{english}} + \file{./config/APA7german.txt}{\from{\jobname.dtx}{german}} + \file{./config/APA7ngerman.txt}{\from{\jobname.dtx}{ngerman}} + \file{./config/APA7greek.txt}{\from{\jobname.dtx}{greek}} + \file{./config/APA7czech.txt}{\from{\jobname.dtx}{czech}} + \file{./config/APA7turkish.txt}{\from{\jobname.dtx}{turkish}} + \file{./config/APA7endfloat.cfg}{\from{\jobname.dtx}{APAendfloat}} +} +\usedir{tex/latex/apa7/samples} +\generate{ + \file{./samples/bibliography.bib}{\from{\jobname.dtx}{bibliography}} + \file{./samples/shortsample.tex}{\from{\jobname.dtx}{shortsample}} + \file{./samples/longsample.tex}{\from{\jobname.dtx}{longsample}} +} +\endbatchfile +%% +%% Copyright (C) 2020 by Daniel A. Weiss <daniel.weiss.led at gmail.com> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License (LPPL), either +%% version 1.3c of this license or (at your option) any later +%% version. The latest version of this license is in the file: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% Users may freely modify these files without permission, as long as the +%% copyright line and this statement are maintained intact. +%% +%% This work is not endorsed by, affiliated with, or probably even known +%% by, the American Psychological Association. +%% +%% +%% This work is "maintained" (as per LPPL maintenance status) by +%% Daniel A. Weiss. +%% +%% This work consists of the file apa7.dtx +%% and the derived files apa7.ins, +%% apa7.cls, +%% apa7.pdf, +%% README, +%% APA7american.txt, +%% APA7british.txt, +%% APA7dutch.txt, +%% APA7english.txt, +%% APA7german.txt, +%% APA7ngerman.txt, +%% APA7greek.txt, +%% APA7czech.txt, +%% APA7turkish.txt, +%% APA7endfloat.cfg, +%% Figure1.pdf, +%% shortsample.tex, +%% longsample.tex, and +%% bibliography.bib. +%% +%% +%% End of file `apa7.ins'. diff --git a/macros/latex/contrib/apa7/apa7.pdf b/macros/latex/contrib/apa7/apa7.pdf Binary files differindex b334f6db64..65bee10d57 100644 --- a/macros/latex/contrib/apa7/apa7.pdf +++ b/macros/latex/contrib/apa7/apa7.pdf diff --git a/macros/latex/contrib/apa7/config/APA7american.txt b/macros/latex/contrib/apa7/config/APA7american.txt deleted file mode 100644 index e5bc6d9c36..0000000000 --- a/macros/latex/contrib/apa7/config/APA7american.txt +++ /dev/null @@ -1,77 +0,0 @@ -%% -%% This is file `./config/APA7american.txt', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% apa7.dtx (with options: `american') -%% ---------------------------------------------------------------------- -%% -%% apa7 - A LaTeX class for formatting documents in compliance with the -%% American Psychological Association's Publication Manual, 7th edition -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% ---------------------------------------------------------------------- -%% -\ProvidesFile{APA7american.txt}[2019/12/29 v1.00 apa7 configuration for American English] - -\renewcommand{\acksname}{Author Note} -\renewcommand{\keywordname}{Keywords} -\renewcommand{\notesname}{Footnotes} - -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% -%% This work is "maintained" (as per LPPL maintenance status) by -%% Daniel A. Weiss. -%% -%% This work consists of the file apa7.dtx -%% and the derived files apa7.ins, -%% apa7.cls, -%% apa7.pdf, -%% README, -%% APA7american.txt, -%% APA7british.txt, -%% APA7dutch.txt, -%% APA7english.txt, -%% APA7german.txt, -%% APA7ngerman.txt, -%% APA7greek.txt, -%% APA7czech.txt, -%% APA7turkish.txt, -%% APA7endfloat.cfg, -%% Figure1.pdf, -%% shortsample.tex, -%% longsample.tex, and -%% bibliography.bib. -%% -%% -%% End of file `./config/APA7american.txt'. diff --git a/macros/latex/contrib/apa7/config/APA7british.txt b/macros/latex/contrib/apa7/config/APA7british.txt deleted file mode 100644 index d0fcaab21e..0000000000 --- a/macros/latex/contrib/apa7/config/APA7british.txt +++ /dev/null @@ -1,77 +0,0 @@ -%% -%% This is file `./config/APA7british.txt', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% apa7.dtx (with options: `british') -%% ---------------------------------------------------------------------- -%% -%% apa7 - A LaTeX class for formatting documents in compliance with the -%% American Psychological Association's Publication Manual, 7th edition -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% ---------------------------------------------------------------------- -%% -\ProvidesFile{APA7british.txt}[2019/12/29 v1.00 apa7 configuration for British English] - -\renewcommand{\acksname}{Author Note} -\renewcommand{\keywordname}{Keywords} -\renewcommand{\notesname}{Footnotes} - -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% -%% This work is "maintained" (as per LPPL maintenance status) by -%% Daniel A. Weiss. -%% -%% This work consists of the file apa7.dtx -%% and the derived files apa7.ins, -%% apa7.cls, -%% apa7.pdf, -%% README, -%% APA7american.txt, -%% APA7british.txt, -%% APA7dutch.txt, -%% APA7english.txt, -%% APA7german.txt, -%% APA7ngerman.txt, -%% APA7greek.txt, -%% APA7czech.txt, -%% APA7turkish.txt, -%% APA7endfloat.cfg, -%% Figure1.pdf, -%% shortsample.tex, -%% longsample.tex, and -%% bibliography.bib. -%% -%% -%% End of file `./config/APA7british.txt'. diff --git a/macros/latex/contrib/apa7/config/APA7czech.txt b/macros/latex/contrib/apa7/config/APA7czech.txt deleted file mode 100644 index 0704f8f171..0000000000 --- a/macros/latex/contrib/apa7/config/APA7czech.txt +++ /dev/null @@ -1,77 +0,0 @@ -%% -%% This is file `./config/APA7czech.txt', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% apa7.dtx (with options: `czech') -%% ---------------------------------------------------------------------- -%% -%% apa7 - A LaTeX class for formatting documents in compliance with the -%% American Psychological Association's Publication Manual, 7th edition -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% ---------------------------------------------------------------------- -%% -\ProvidesFile{APA7czech.txt}[2019/12/29 v1.00 apa7 configuration for Czech] - -\renewcommand{\acksname}{Poznámka~autora}% Author Note -\renewcommand{\keywordname}{Klícová~1slova}% Keywords -\renewcommand{\notesname}{Poznámky}% Footnotes - -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% -%% This work is "maintained" (as per LPPL maintenance status) by -%% Daniel A. Weiss. -%% -%% This work consists of the file apa7.dtx -%% and the derived files apa7.ins, -%% apa7.cls, -%% apa7.pdf, -%% README, -%% APA7american.txt, -%% APA7british.txt, -%% APA7dutch.txt, -%% APA7english.txt, -%% APA7german.txt, -%% APA7ngerman.txt, -%% APA7greek.txt, -%% APA7czech.txt, -%% APA7turkish.txt, -%% APA7endfloat.cfg, -%% Figure1.pdf, -%% shortsample.tex, -%% longsample.tex, and -%% bibliography.bib. -%% -%% -%% End of file `./config/APA7czech.txt'. diff --git a/macros/latex/contrib/apa7/config/APA7dutch.txt b/macros/latex/contrib/apa7/config/APA7dutch.txt deleted file mode 100644 index c7817997cc..0000000000 --- a/macros/latex/contrib/apa7/config/APA7dutch.txt +++ /dev/null @@ -1,77 +0,0 @@ -%% -%% This is file `./config/APA7dutch.txt', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% apa7.dtx (with options: `dutch') -%% ---------------------------------------------------------------------- -%% -%% apa7 - A LaTeX class for formatting documents in compliance with the -%% American Psychological Association's Publication Manual, 7th edition -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% ---------------------------------------------------------------------- -%% -\ProvidesFile{APA7dutch.txt}[2019/12/29 v1.00 apa7 configuration for Dutch] - -\renewcommand{\acksname}{Auteursnoot}% Author Note -\renewcommand{\keywordname}{Trefwoorden}% Keywords -\renewcommand{\notesname}{Voetnoten}% Footnotes - -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% -%% This work is "maintained" (as per LPPL maintenance status) by -%% Daniel A. Weiss. -%% -%% This work consists of the file apa7.dtx -%% and the derived files apa7.ins, -%% apa7.cls, -%% apa7.pdf, -%% README, -%% APA7american.txt, -%% APA7british.txt, -%% APA7dutch.txt, -%% APA7english.txt, -%% APA7german.txt, -%% APA7ngerman.txt, -%% APA7greek.txt, -%% APA7czech.txt, -%% APA7turkish.txt, -%% APA7endfloat.cfg, -%% Figure1.pdf, -%% shortsample.tex, -%% longsample.tex, and -%% bibliography.bib. -%% -%% -%% End of file `./config/APA7dutch.txt'. diff --git a/macros/latex/contrib/apa7/config/APA7endfloat.cfg b/macros/latex/contrib/apa7/config/APA7endfloat.cfg deleted file mode 100644 index 802cfe52db..0000000000 --- a/macros/latex/contrib/apa7/config/APA7endfloat.cfg +++ /dev/null @@ -1,142 +0,0 @@ -%% -%% This is file `./config/APA7endfloat.cfg', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% apa7.dtx (with options: `APAendfloat') -%% ---------------------------------------------------------------------- -%% -%% apa7 - A LaTeX class for formatting documents in compliance with the -%% American Psychological Association's Publication Manual, 7th edition -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% ---------------------------------------------------------------------- -%% -%% -%% This is file `endfloat.cfg', -%% modifed from the original supplied with the endfloat package -%% to handle both sideways floats and longtable -%% -%% Athanassios Protopapas <protopap@ilsp.gr> -%% July 2005 -%% -%% Original authors: James Darrell McCauley <jdm5548@diamond.tamu.edu>, -%% Jeff Goldberg <j.goldberg@cranfield.ac.uk> -%% Original version: Version 2.4i <October 1995> -%% -\RequirePackage{rotating} -\let\efsaved@sidewaysfigure\sidewaysfigure -\let\efsaved@sidewaystable\sidewaystable -\let\efsaved@longtable\longtable -\AtBeginTables{\let\sidewaystable=\efsaved@sidewaystable\relax} -\AtBeginTables{\let\longtable=\efsaved@longtable\relax} -\AtBeginFigures{\let\sidewaysfigure=\efsaved@sidewaysfigure\relax} -\def\sidewaystable{\efloat@condopen{ttt} - \efloat@iwrite{ttt}{\string\begin{sidewaystable}}% - \def\@currenvir{efloat@float}% - \begingroup - \let\do\ef@makeinnocent \dospecials - \ef@makeinnocent\^^L% and whatever other special cases - \endlinechar`\^^M \catcode`\^^M=12 \ef@xsidetable} -{\catcode`\^^M=12 \endlinechar=-1 % - \gdef\ef@xsidetable#1^^M{\def\test{#1} - \ifx\test\ef@endsidetabletest - \efloat@foundend{ttt}{sidewaystable} - \else - \efloat@iwrite{ttt}{#1}% - \let\next\ef@xsidetable - \fi \next} -} -\def\sidewaysfigure{\efloat@condopen{fff} - \efloat@iwrite{fff}{\string\begin{sidewaysfigure}}% - \def\@currenvir{efloat@float}% - \begingroup - \let\do\ef@makeinnocent \dospecials - \ef@makeinnocent\^^L% and whatever other special cases - \endlinechar`\^^M \catcode`\^^M=12 \ef@xsidefigure} -{\catcode`\^^M=12 \endlinechar=-1 % - \gdef\ef@xsidefigure#1^^M{\def\test{#1} - \ifx\test\ef@endsidefiguretest - \efloat@foundend{fff}{sidewaysfigure} - \else - \efloat@iwrite{fff}{#1}% - \let\next\ef@xsidefigure - \fi \next} -} -\def\longtable{\efloat@condopen{ttt} - \efloat@iwrite{ttt}{\string\begin{longtable}}% - \def\@currenvir{efloat@float}% - \begingroup - \let\do\ef@makeinnocent \dospecials - \ef@makeinnocent\^^L% and whatever other special cases - \endlinechar`\^^M \catcode`\^^M=12 \ef@xlongtable} -{\catcode`\^^M=12 \endlinechar=-1 % - \gdef\ef@xlongtable#1^^M{\def\test{#1} - \ifx\test\ef@endlongtabletest - \efloat@foundend{ttt}{longtable} - \else - \efloat@iwrite{ttt}{#1}% - \let\next\ef@xlongtable - \fi \next} -} -{\escapechar=-1% - \xdef\ef@endsidefiguretest{\string\\end\string\{sidewaysfigure\string\}}% - \xdef\ef@endsidetabletest{\string\\end\string\{sidewaystable\string\}} - \xdef\ef@endlongtabletest{\string\\end\string\{longtable\string\}}}% -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% -%% This work is "maintained" (as per LPPL maintenance status) by -%% Daniel A. Weiss. -%% -%% This work consists of the file apa7.dtx -%% and the derived files apa7.ins, -%% apa7.cls, -%% apa7.pdf, -%% README, -%% APA7american.txt, -%% APA7british.txt, -%% APA7dutch.txt, -%% APA7english.txt, -%% APA7german.txt, -%% APA7ngerman.txt, -%% APA7greek.txt, -%% APA7czech.txt, -%% APA7turkish.txt, -%% APA7endfloat.cfg, -%% Figure1.pdf, -%% shortsample.tex, -%% longsample.tex, and -%% bibliography.bib. -%% -%% -%% End of file `./config/APA7endfloat.cfg'. diff --git a/macros/latex/contrib/apa7/config/APA7english.txt b/macros/latex/contrib/apa7/config/APA7english.txt deleted file mode 100644 index f70dfdd920..0000000000 --- a/macros/latex/contrib/apa7/config/APA7english.txt +++ /dev/null @@ -1,77 +0,0 @@ -%% -%% This is file `./config/APA7english.txt', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% apa7.dtx (with options: `english') -%% ---------------------------------------------------------------------- -%% -%% apa7 - A LaTeX class for formatting documents in compliance with the -%% American Psychological Association's Publication Manual, 7th edition -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% ---------------------------------------------------------------------- -%% -\ProvidesFile{APA7english.txt}[2019/12/29 v1.00 apa7 configuration for non-American English] - -\renewcommand{\acksname}{Author Note} -\renewcommand{\keywordname}{Keywords} -\renewcommand{\notesname}{Footnotes} - -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% -%% This work is "maintained" (as per LPPL maintenance status) by -%% Daniel A. Weiss. -%% -%% This work consists of the file apa7.dtx -%% and the derived files apa7.ins, -%% apa7.cls, -%% apa7.pdf, -%% README, -%% APA7american.txt, -%% APA7british.txt, -%% APA7dutch.txt, -%% APA7english.txt, -%% APA7german.txt, -%% APA7ngerman.txt, -%% APA7greek.txt, -%% APA7czech.txt, -%% APA7turkish.txt, -%% APA7endfloat.cfg, -%% Figure1.pdf, -%% shortsample.tex, -%% longsample.tex, and -%% bibliography.bib. -%% -%% -%% End of file `./config/APA7english.txt'. diff --git a/macros/latex/contrib/apa7/config/APA7german.txt b/macros/latex/contrib/apa7/config/APA7german.txt deleted file mode 100644 index 0cf23f4564..0000000000 --- a/macros/latex/contrib/apa7/config/APA7german.txt +++ /dev/null @@ -1,77 +0,0 @@ -%% -%% This is file `./config/APA7german.txt', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% apa7.dtx (with options: `german') -%% ---------------------------------------------------------------------- -%% -%% apa7 - A LaTeX class for formatting documents in compliance with the -%% American Psychological Association's Publication Manual, 7th edition -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% ---------------------------------------------------------------------- -%% -\ProvidesFile{APA7german.txt}[2019/12/29 v1.00 apa7 configuration for German] - -\renewcommand{\acksname}{Autorenhinweis}% Author Note -\renewcommand{\keywordname}{Schl\"usselw\"orter}% Keywords -\renewcommand{\notesname}{Fußnoten}% Footnotes - -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% -%% This work is "maintained" (as per LPPL maintenance status) by -%% Daniel A. Weiss. -%% -%% This work consists of the file apa7.dtx -%% and the derived files apa7.ins, -%% apa7.cls, -%% apa7.pdf, -%% README, -%% APA7american.txt, -%% APA7british.txt, -%% APA7dutch.txt, -%% APA7english.txt, -%% APA7german.txt, -%% APA7ngerman.txt, -%% APA7greek.txt, -%% APA7czech.txt, -%% APA7turkish.txt, -%% APA7endfloat.cfg, -%% Figure1.pdf, -%% shortsample.tex, -%% longsample.tex, and -%% bibliography.bib. -%% -%% -%% End of file `./config/APA7german.txt'. diff --git a/macros/latex/contrib/apa7/config/APA7greek.txt b/macros/latex/contrib/apa7/config/APA7greek.txt deleted file mode 100644 index c61343ee15..0000000000 --- a/macros/latex/contrib/apa7/config/APA7greek.txt +++ /dev/null @@ -1,77 +0,0 @@ -%% -%% This is file `./config/APA7greek.txt', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% apa7.dtx (with options: `greek') -%% ---------------------------------------------------------------------- -%% -%% apa7 - A LaTeX class for formatting documents in compliance with the -%% American Psychological Association's Publication Manual, 7th edition -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% ---------------------------------------------------------------------- -%% -\ProvidesFile{APA7greek.txt}[2019/12/29 v1.00 apa7 configuration for Greek] - -\renewcommand{\acksname}{Shmei'wseis tou suggraf'ea}% Author Note -\renewcommand{\keywordname}{L'exeis kleidi'a}% Keywords -\renewcommand{\notesname}{Uposhmei'wseis}% Footnotes - -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% -%% This work is "maintained" (as per LPPL maintenance status) by -%% Daniel A. Weiss. -%% -%% This work consists of the file apa7.dtx -%% and the derived files apa7.ins, -%% apa7.cls, -%% apa7.pdf, -%% README, -%% APA7american.txt, -%% APA7british.txt, -%% APA7dutch.txt, -%% APA7english.txt, -%% APA7german.txt, -%% APA7ngerman.txt, -%% APA7greek.txt, -%% APA7czech.txt, -%% APA7turkish.txt, -%% APA7endfloat.cfg, -%% Figure1.pdf, -%% shortsample.tex, -%% longsample.tex, and -%% bibliography.bib. -%% -%% -%% End of file `./config/APA7greek.txt'. diff --git a/macros/latex/contrib/apa7/config/APA7ngerman.txt b/macros/latex/contrib/apa7/config/APA7ngerman.txt deleted file mode 100644 index 52cbfe3d5f..0000000000 --- a/macros/latex/contrib/apa7/config/APA7ngerman.txt +++ /dev/null @@ -1,77 +0,0 @@ -%% -%% This is file `./config/APA7ngerman.txt', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% apa7.dtx (with options: `ngerman') -%% ---------------------------------------------------------------------- -%% -%% apa7 - A LaTeX class for formatting documents in compliance with the -%% American Psychological Association's Publication Manual, 7th edition -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% ---------------------------------------------------------------------- -%% -\ProvidesFile{APA7german.txt}[2019/12/29 v1.00 apa7 configuration for "new" German] - -\renewcommand{\acksname}{Autorenhinweis}% Author Note -\renewcommand{\keywordname}{Schl\"usselw\"orter}% Keywords -\renewcommand{\notesname}{Fußnoten}% Footnotes - -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% -%% This work is "maintained" (as per LPPL maintenance status) by -%% Daniel A. Weiss. -%% -%% This work consists of the file apa7.dtx -%% and the derived files apa7.ins, -%% apa7.cls, -%% apa7.pdf, -%% README, -%% APA7american.txt, -%% APA7british.txt, -%% APA7dutch.txt, -%% APA7english.txt, -%% APA7german.txt, -%% APA7ngerman.txt, -%% APA7greek.txt, -%% APA7czech.txt, -%% APA7turkish.txt, -%% APA7endfloat.cfg, -%% Figure1.pdf, -%% shortsample.tex, -%% longsample.tex, and -%% bibliography.bib. -%% -%% -%% End of file `./config/APA7ngerman.txt'. diff --git a/macros/latex/contrib/apa7/config/APA7turkish.txt b/macros/latex/contrib/apa7/config/APA7turkish.txt deleted file mode 100644 index c689591739..0000000000 --- a/macros/latex/contrib/apa7/config/APA7turkish.txt +++ /dev/null @@ -1,77 +0,0 @@ -%% -%% This is file `./config/APA7turkish.txt', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% apa7.dtx (with options: `turkish') -%% ---------------------------------------------------------------------- -%% -%% apa7 - A LaTeX class for formatting documents in compliance with the -%% American Psychological Association's Publication Manual, 7th edition -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% ---------------------------------------------------------------------- -%% -\ProvidesFile{APA7turkish.txt}[2019/12/29 v1.00 apa7 configuration for Turkish] - -\renewcommand{\acksname}{Yazar Notu}% Author Note -\renewcommand{\keywordname}{Anahtar Kelimeler}% Keywords -\renewcommand{\notesname}{Dipnotlar}% Footnotes - -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% -%% This work is "maintained" (as per LPPL maintenance status) by -%% Daniel A. Weiss. -%% -%% This work consists of the file apa7.dtx -%% and the derived files apa7.ins, -%% apa7.cls, -%% apa7.pdf, -%% README, -%% APA7american.txt, -%% APA7british.txt, -%% APA7dutch.txt, -%% APA7english.txt, -%% APA7german.txt, -%% APA7ngerman.txt, -%% APA7greek.txt, -%% APA7czech.txt, -%% APA7turkish.txt, -%% APA7endfloat.cfg, -%% Figure1.pdf, -%% shortsample.tex, -%% longsample.tex, and -%% bibliography.bib. -%% -%% -%% End of file `./config/APA7turkish.txt'. diff --git a/macros/latex/contrib/apa7/samples/bibliography.bib b/macros/latex/contrib/apa7/samples/bibliography.bib deleted file mode 100644 index 9c27070e82..0000000000 --- a/macros/latex/contrib/apa7/samples/bibliography.bib +++ /dev/null @@ -1,233 +0,0 @@ -%% -%% This is file `./samples/bibliography.bib', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% apa7.dtx (with options: `bibliography') -%% ---------------------------------------------------------------------- -%% -%% apa7 - A LaTeX class for formatting documents in compliance with the -%% American Psychological Association's Publication Manual, 7th edition -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% ---------------------------------------------------------------------- -%% - -@ARTICLE{Borst2011a, - author = {Borst, Gr\'{e}goire and Kosslyn, Stephen M. and Kievit, Rogier A. and Thompson, William L.}, - title = {A fictitious entry to demonstrate complicated bibliographies}, - journal = {Journal of Nothingness}, - year = {2011}, - volume = {1}, - pages = {2--3} -} - -@ARTICLE{Borst2011b, - author = {Borst, Gr\'{e}goire and Kievit, Rogier A. and Thompson, William L. and - Kosslyn, Stephen M.}, - title = {Mental rotation is not easily cognitively penetrable}, - journal = {Journal of Cognitive Psychology}, - year = {2011}, - volume = {23}, - pages = {60--75} -} - -@ARTICLE{Borst2011c, - author = {Borst, Gr\'{e}goire and Thompson, William L. and Kosslyn, Stephen M.}, - title = {Understanding the dorsal and ventral systems of the human cerebral -cortex: {B}eyond dichotomies}, - journal = {American Psychologist}, - year = {2011}, - volume = {66}, - pages = {624--632} -} - -@ARTICLE{deWaal2009, - author = {de Waal, Elda and Grosser, M. M.}, - title = {Safety and security at school: {A} pedagogical perspective}, - journal = {Teaching and Teacher Education}, - year = {2009}, - volume = {25}, - pages = {697--706} -} - -@ARTICLE{Franklin2010, - author = {Franklin, Jr., Robert G. and Adams, Jr., Reginald B.}, - title = {The two sides of beauty: {L}aterality and the duality of facial attractiveness}, - journal = {Brain and Cognition}, - year = {2010}, - volume = {72}, - pages = {300--305} -} - -@ARTICLE{Gilbert2004, - author = {Gilbert, David and McClernon, Joseph and Rabinovich, Norka and Sugai, Chihiro - and Plath, Louisette and Asgaard, Greg and Zuo, Yantao and Huggenvik, Jodi and Botros, Nazeih}, - title = {Effects of quitting smoking on {EEG} activation and attention last for more than 31 - days and are more severe with stress, dependence, {DRD2 A1} allele, and depressive traits}, - journal = {Nicotine \& Tobacco Research}, - year = {2004}, - volume = {6}, - pages = {249--267}, - number = {2}, - doi = {10.1080/14622200410001676305} -} - -@INBOOK{Haybron2008, - author = {Haybron, Daniel M.}, - title = {Philosophy and the science of subjective well-being}, - editor = {Eid, Michael and Larsen, Randy J.}, - booktitle = {The science of subjective well-being}, - year = {2008}, - pages = {17--43}, - publisher = {Guilford Press}, - address = {New York, NY} -} - -@ARTICLE{Herbst-Damm2005, - author = {Herbst-Damm, Kathryn L. and Kulik, James A.}, - title = {Volunteer support, marital status, and the survival times of terminally ill patients}, - journal = {Health Psychology}, - year = {2005}, - volume = {24}, - pages = {225--229}, - number = {2} -} - -@ARTICLE{Lassen2006, - author = {Lassen, Stephen R. and Steele, Michael M. and Sailor, Wayne}, - title = {The relationship of school-wide positive behavior support to academic achievement in - an urban middle school}, - journal = {Psychology in the Schools}, - year = {2006}, - volume = {43}, - pages = {701--712}, - number = {6} -} - -@ARTICLE{JRLevin2000, - author = {Levin, Joel R. and O'Donnell, Angela M.}, - title = {What to do about educational research's credibility gaps?}, - journal = {Journal of Cognitive Education and Psychology}, - year = {2000}, - volume = {1}, - pages = {201--256} -} - -@ARTICLE{MLevin1990, - author = {Levin, Mary E. and Levin, Joel R.}, - title = {Scientific mnemonomies: {M}ethods for maximizing more than memory}, - journal = {American Educational Research Journal}, - year = {1990}, - volume = {27}, - pages = {301--321} -} - -@ARTICLE{MayerInPressA, - author = {Mayer, Richard E.}, - title = {Fake article to illustrate in-press citations}, - journal = {Journal of Cognitive Psychology}, - year = {in press} -} - -@ARTICLE{MayerInPressB, - author = {Mayer, Richard E.}, - title = {Second fake article to illustrate in-press citations}, - journal = {Journal of Educational Psychology}, - year = {in press} -} - -@ARTICLE{Mayer2008a, - author = {Mayer, Richard E.}, - title = {Applying the science of learning: {E}vidence-based principles for -the design of multimedia instruction}, - journal = {American Psychologist}, - year = {2008}, - volume = {63}, - pages = {760--769} -} - -@ARTICLE{Mayer2008b, - author = {Mayer, Richard E.}, - title = {Old advice for new researchers}, - journal = {Educational Psychology Review}, - year = {2008}, - volume = {20}, - pages = {19--28} -} - -@BOOK{Shotton1989, - author = {Shotton, Margaret A.}, - title = {Computer addiction? {A} study of computer dependency}, - publisher = {Taylor \& Francis}, - year = {1989}, - location = {London, England} -} - -@ARTICLE{vonDavier2011, - author = {von Davier, Matthias and Xu, Xueli and Carstensen, Claus H.}, - title = {Measuring growth in a longitudinal large-scale assessment with a - general latent variable model}, - journal = {Psychometrika}, - year = {2011}, - volume = {76}, - pages = {318--336} -} - -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% -%% This work is "maintained" (as per LPPL maintenance status) by -%% Daniel A. Weiss. -%% -%% This work consists of the file apa7.dtx -%% and the derived files apa7.ins, -%% apa7.cls, -%% apa7.pdf, -%% README, -%% APA7american.txt, -%% APA7british.txt, -%% APA7dutch.txt, -%% APA7english.txt, -%% APA7german.txt, -%% APA7ngerman.txt, -%% APA7greek.txt, -%% APA7czech.txt, -%% APA7turkish.txt, -%% APA7endfloat.cfg, -%% Figure1.pdf, -%% shortsample.tex, -%% longsample.tex, and -%% bibliography.bib. -%% -%% -%% End of file `./samples/bibliography.bib'. diff --git a/macros/latex/contrib/apa7/samples/longsample.pdf b/macros/latex/contrib/apa7/samples/longsample.pdf Binary files differindex 331640c4ac..2d327622a4 100644 --- a/macros/latex/contrib/apa7/samples/longsample.pdf +++ b/macros/latex/contrib/apa7/samples/longsample.pdf diff --git a/macros/latex/contrib/apa7/samples/longsample.tex b/macros/latex/contrib/apa7/samples/longsample.tex deleted file mode 100644 index 960d53823a..0000000000 --- a/macros/latex/contrib/apa7/samples/longsample.tex +++ /dev/null @@ -1,227 +0,0 @@ -%% -%% This is file `./samples/longsample.tex', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% apa7.dtx (with options: `longsample') -%% ---------------------------------------------------------------------- -%% -%% apa7 - A LaTeX class for formatting documents in compliance with the -%% American Psychological Association's Publication Manual, 7th edition -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% ---------------------------------------------------------------------- -%% -\documentclass[man]{apa7} - -\usepackage{lipsum} - -\usepackage[american]{babel} - -\usepackage{csquotes} -\usepackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex} -\DeclareLanguageMapping{american}{american-apa} -\addbibresource{bibliography.bib} - -\title{Sample APA-Style Document Using the \textsf{apa7} Package} -\shorttitle{Sample Document} - -\author{Daniel A. Weiss} -\affiliation{A University Somewhere} - -\leftheader{Weiss} - -\abstract{\lipsum[1]} - -\keywords{APA style, demonstration} - -\authornote{ - \addORCIDlink{Daniel A. Weiss}{0000-0000-0000-0000} - - Correspondence concerning this article should be addressed to Daniel A. Weiss, Department of Educational Psychology, Counseling and - Special Education, A University Somewhere, 123 Main St., Oneonta, NY - 13820. E-mail: daniel.weiss.led@gmail.com} - -\begin{document} -\maketitle -\lipsum[2] - -\Textcite{vonDavier2011} said this, -too \parencite{vonDavier2011,Lassen2006}. Further evidence comes from -other sources \parencite{Shotton1989,Lassen2006}. \lipsum[3] - -\section{Method} -\subsection{Participants} -\lipsum[4] - -\subsection{Materials} -\lipsum[5] - -\subsection{Design} -\lipsum[6] - -\subsection{Procedure} -\lipsum[7] - -\subsubsection{Instrument \#1} -\lipsum[8] - -\paragraph{Reliability} -\lipsum[9] - -\subparagraph{Inter-rater reliability} -\lipsum[10] - -\subparagraph{Test-retest reliability} -\lipsum[11] - -\paragraph{Validity} -\lipsum[12] - -\subparagraph{Face validity} -\lipsum[13] - -\subparagraph{Construct validity} -\lipsum[14] - -\section{Results} -Table~\ref{tab:BasicTable} summarizes the data. \lipsum[15] - -\begin{table} - \caption{Sample Basic Table} - \label{tab:BasicTable} - \begin{tabular}{@{}llr@{}} \toprule - \multicolumn{2}{c}{Item} \\ \cmidrule(r){1-2} - Animal & Description & Price \\ \midrule - Gnat & per gram & 13.65 \\ - & each & 0.01 \\ - Gnu & stuffed & 92.50 \\ - Emu & stuffed & 33.33 \\ - Armadillo & frozen & 8.99 \\ \bottomrule - \end{tabular} -\end{table} - -\begin{figure} - \caption{This is my first figure caption.} - \includegraphics[bb=0in 0in 2.5in 2.5in, height=2.5in, width=2.5in]{Figure1.pdf} - \label{fig:Figure1} -\end{figure} - -Figure~\ref{fig:Figure1} shows this trend. \lipsum[16] - -\section{Discussion} -\lipsum[17] - -\lipsum[18] - -\lipsum[19] - -\printbibliography - -\appendix - -\section{Instrument} -\label{app:instrument} - -As shown in Figure~\ref{fig:Figure2}, these results are impressive. \lipsum[20] - -\begin{figure} - \caption{This is my second figure caption.} - \includegraphics[bb=0in 0in 2.5in 2.5in, height=2.5in, width=2.5in]{Figure1.pdf} - \label{fig:Figure2} -\end{figure} - -\lipsum[21] -\section{Pilot Data} -\label{app:surveydata} - -The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] - -\begin{table} - \begin{threeparttable} - \caption{A More Complex Decked Table} - \label{tab:DeckedTable} - \begin{tabular}{@{}lrrr@{}} \toprule - Distribution type & \multicolumn{2}{l}{Percentage of} & Total number \\ - & \multicolumn{2}{l}{targets with} & of trials per \\ - & \multicolumn{2}{l}{segment in} & participant \\ \cmidrule(r){2-3} - & Onset & Coda & \\ \midrule - Categorical -- onset\tabfnm{a} & 100 & 0 & 196 \\ - Probabilistic & 80 & 20\tabfnm{*} & 200 \\ - Categorical -- coda\tabfnm{b} & 0 & 100\tabfnm{*} & 196 \\ \midrule - \end{tabular} - \begin{tablenotes}[para,flushleft] - {\small - \textit{Note.} All data are approximate. - - \tabfnt{a}Categorical may be onset. - \tabfnt{b}Categorical may also be coda. - - \tabfnt{*}\textit{p} < .05. - \tabfnt{**}\textit{p} < .01. - } - \end{tablenotes} - \end{threeparttable} -\end{table} - -\lipsum[23] - -\end{document} - -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% -%% This work is "maintained" (as per LPPL maintenance status) by -%% Daniel A. Weiss. -%% -%% This work consists of the file apa7.dtx -%% and the derived files apa7.ins, -%% apa7.cls, -%% apa7.pdf, -%% README, -%% APA7american.txt, -%% APA7british.txt, -%% APA7dutch.txt, -%% APA7english.txt, -%% APA7german.txt, -%% APA7ngerman.txt, -%% APA7greek.txt, -%% APA7czech.txt, -%% APA7turkish.txt, -%% APA7endfloat.cfg, -%% Figure1.pdf, -%% shortsample.tex, -%% longsample.tex, and -%% bibliography.bib. -%% -%% -%% End of file `./samples/longsample.tex'. diff --git a/macros/latex/contrib/apa7/samples/shortsample.pdf b/macros/latex/contrib/apa7/samples/shortsample.pdf Binary files differindex 86bd2a0488..7a69897514 100644 --- a/macros/latex/contrib/apa7/samples/shortsample.pdf +++ b/macros/latex/contrib/apa7/samples/shortsample.pdf diff --git a/macros/latex/contrib/apa7/samples/shortsample.tex b/macros/latex/contrib/apa7/samples/shortsample.tex deleted file mode 100644 index d4fdf3f533..0000000000 --- a/macros/latex/contrib/apa7/samples/shortsample.tex +++ /dev/null @@ -1,175 +0,0 @@ -%% -%% This is file `./samples/shortsample.tex', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% apa7.dtx (with options: `shortsample') -%% ---------------------------------------------------------------------- -%% -%% apa7 - A LaTeX class for formatting documents in compliance with the -%% American Psychological Association's Publication Manual, 7th edition -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% ---------------------------------------------------------------------- -%% -\documentclass[jou]{apa7} - -\usepackage[american]{babel} - -\usepackage{csquotes} -\usepackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex} -\DeclareLanguageMapping{american}{american-apa} -\addbibresource{bibliography.bib} - -\title{Sample APA-Style Document Using the \textsf{apa7} Package} - -\author{Daniel A. Weiss} -\affiliation{A University Somewhere} - -\leftheader{Weiss} - -\abstract{This demonstration paper uses the \textsf{apa7} \LaTeX\ - class to format the document in compliance with the 7th Edition of - the American Psychological Assocation's \textit{Publication Manual.} - The references are managed using \textsf{biblatex}.} - -\keywords{APA style, demonstration} - -\begin{document} -\maketitle -We begin with \textcite{Shotton1989}. We can also cite this work in -parenthesis, like this: \parencite{Shotton1989}. - -A three-author paper \parencite[e.g.,][]{Lassen2006} lists all -three authors for the first citation, then only the first author -on all subsequent citations \parencite{Lassen2006}. - -Note the use of five heading levels throughout this demonstration -Method section. - -\section{Method} -\subsection{Participants} -We had a lot of people in this study. - -\subsection{Materials} -Several materials were used for this project. Some of themwere -already created for prior research. - -\subsubsection{Paper-and-Pencil Instrument} -We used an instrument that we found to be highly successful. - -\paragraph{Reliability} -The reliability of this instrument is extraordinary. - -\paragraph{Validity} -We now discuss the validity of our instrument. - -\subparagraph{Face validity} The face validity is exceptionally -strong. Everyone should be impressed. - -\subparagraph{Construct validity} Also very strong. - -\subsection{Design} -This section describes the study's design. - -\subsection{Procedure} -The procedure was fairly straightforward, yet required -attention to detail. - -\section{Results} -Table \ref{tab:ComplexTable} contains some sample data. Our -statistical prowess in analyzing these data is unmatched. - -\begin{table}[htbp] - \vspace*{2em} - \begin{threeparttable} - \caption{A Complex Table} - \label{tab:ComplexTable} - \begin{tabular}{@{}lrrr@{}} \toprule - Distribution type & \multicolumn{2}{l}{Percentage of} & Total number \\ - & \multicolumn{2}{l}{targets with} & of trials per \\ - & \multicolumn{2}{l}{segment in} & participant \\ \cmidrule(r){2-3} - & Onset & Coda & \\ \midrule - Categorical -- onset\tabfnm{a} & 100 & 0 & 196 \\ - Probabilistic & 80 & 20\tabfnm{*} & 200 \\ - Categorical -- coda\tabfnm{b} & 0 & 100\tabfnm{*} & 196 \\ \midrule - \end{tabular} - \begin{tablenotes}[para,flushleft] - {\small - \textit{Note.} All data are approximate. - - \tabfnt{a}Categorical may be onset. - \tabfnt{b}Categorical may also be coda. - - \tabfnt{*}\textit{p} < .05. - \tabfnt{**}\textit{p} < .01. - } - \end{tablenotes} - \end{threeparttable} -\end{table} - -\section{Discussion} -This is a lengthy and erudite discussion. It demonstrates amazing -skill in interpreting the results for the masses. - -\printbibliography - -\end{document} - -%% -%% Copyright (C) 2019 by Daniel A. Weiss <daniel.weiss.led at gmail.com> -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% Users may freely modify these files without permission, as long as the -%% copyright line and this statement are maintained intact. -%% -%% This work is not endorsed by, affiliated with, or probably even known -%% by, the American Psychological Association. -%% -%% -%% This work is "maintained" (as per LPPL maintenance status) by -%% Daniel A. Weiss. -%% -%% This work consists of the file apa7.dtx -%% and the derived files apa7.ins, -%% apa7.cls, -%% apa7.pdf, -%% README, -%% APA7american.txt, -%% APA7british.txt, -%% APA7dutch.txt, -%% APA7english.txt, -%% APA7german.txt, -%% APA7ngerman.txt, -%% APA7greek.txt, -%% APA7czech.txt, -%% APA7turkish.txt, -%% APA7endfloat.cfg, -%% Figure1.pdf, -%% shortsample.tex, -%% longsample.tex, and -%% bibliography.bib. -%% -%% -%% End of file `./samples/shortsample.tex'. diff --git a/macros/latex/contrib/denisbdoc/README.md b/macros/latex/contrib/denisbdoc/README.md index 60046634c7..40d091b202 100644 --- a/macros/latex/contrib/denisbdoc/README.md +++ b/macros/latex/contrib/denisbdoc/README.md @@ -1,8 +1,8 @@ -denisbdoc - A personal package for documenting classes and packages, v. 0.7 +denisbdoc - A personal package for documenting classes and packages, v. 0.8 =========================================================================== -**The (quick 'n dirty) `denisbdoc` package is just for documenting the classes -I've written.** +**The sole purpose of this (quick 'n dirty) `denisbdoc` package is for +documenting the classes written by its author (Denis Bitouz'e).** The class is supplied in `.dtx` format. If you want to unpack the `.dtx` yourself, running: diff --git a/macros/latex/contrib/denisbdoc/denisbdoc.dtx b/macros/latex/contrib/denisbdoc/denisbdoc.dtx index c7d530e326..0607fdcc22 100644 --- a/macros/latex/contrib/denisbdoc/denisbdoc.dtx +++ b/macros/latex/contrib/denisbdoc/denisbdoc.dtx @@ -3,11 +3,11 @@ \iffalse %</internal> %<*readme> -denisbdoc - A personal package for documenting classes and packages, v. 0.7 +denisbdoc - A personal package for documenting classes and packages, v. 0.8 =========================================================================== -**The (quick 'n dirty) `denisbdoc` package is just for documenting the classes -I've written.** +**The sole purpose of this (quick 'n dirty) `denisbdoc` package is for +documenting the classes written by its author (Denis Bitouz'e).** The class is supplied in `.dtx` format. If you want to unpack the `.dtx` yourself, running: @@ -30,18 +30,19 @@ This package is currently not documented. \askforoverwritefalse \preamble ----------------------------------------------------------------------------- -denisbdoc --- A personal dirty package for documenting packages, version 0.7 +denisbdoc --- A personal dirty package for documenting personal classes, + version 0.8 Maintained by Denis Bitouz'e -E-mail: denis.bitouze@lmpa.univ-littoral.fr +E-mail: denis.bitouze@univ-littoral.fr Released under the LaTeX Project Public License v1.3c or later See http://www.latex-project.org/lppl.txt ----------------------------------------------------------------------------- \endpreamble \postamble -Copyright (C) 2015, 2016, 2017 by - Denis Bitouz'e <denis.bitouze@lmpa.univ-littoral.fr> +Copyright (C) 2015-2020 by + Denis Bitouz'e <denis.bitouze@univ-littoral.fr> It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of @@ -107,8 +108,8 @@ This work consists of the file denisbdoc.dtx %\author{^^A % Denis Bitouz'e\thanks % {^^A -% E-mail: \href{mailto:denis.bitouze@lmpa.univ-littoral.fr} -% {\texttt{denis.bitouze@lmpa.univ-littoral.fr}}^^A +% E-mail: \href{mailto:denis.bitouze@univ-littoral.fr} +% {\texttt{denis.bitouze@univ-littoral.fr}}^^A % }^^A %} %\date{Released \filedate} @@ -122,6 +123,7 @@ This work consists of the file denisbdoc.dtx %\changes{v0.5}{2016/10/30}{Fifth CTAN version} %\changes{v0.6}{2016/12/08}{Sixth CTAN version} %\changes{v0.7}{2017/01/01}{Seventh CTAN version} +%\changes{v0.8}{2020/03/27}{Eighth CTAN version} % %\begin{abstract} % ... @@ -148,7 +150,7 @@ This work consists of the file denisbdoc.dtx % % The package requires \LaTeX3 support as provided in the % \pkg{l3kernel} and \pkg{l3packages} bundles. Both of these are available -% on \href{http://www.ctan.org}{\textsc{ctan}} as ready-to-install +% on \href{http://ctan.org}{\textsc{ctan}} as ready-to-install % zip files. Suitable versions are available in MiK\TeX{}~2.9 and % \TeX{}~Live 2014 (updating the relevant packages online may be % necessary). \LaTeX3, and so \pkg{denisbdoc}, requires the \eTeX{} @@ -192,7 +194,7 @@ This work consists of the file denisbdoc.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {denisbdoc} {2017/01/01} {0.7} +\ProvidesExplPackage {denisbdoc} {2020/03/27} {0.8} {A personal package for documenting packages} % \end{macrocode} % @@ -221,6 +223,8 @@ This work consists of the file denisbdoc.dtx yad .bool_gset:N = \g_@@_yad_bool, gzt .bool_gset:N = \g_@@_gzt_bool, nwejm .bool_gset:N = \g_@@_nwejm_bool, + studentreport .bool_gset:N = \g_@@_studentreport_bool, + lscape .bool_gset:N = \g_@@_lscape_bool, } % \end{macrocode} % @@ -236,12 +240,13 @@ This work consists of the file denisbdoc.dtx % % \begin{macrocode} \sys_if_engine_pdftex:TF - { - \RequirePackage[T1]{fontenc} - \RequirePackage[utf8]{inputenc} - }{ - \RequirePackage{fontspec} - } +{ + \RequirePackage{cmap} + \RequirePackage[T1]{fontenc} + \RequirePackage[utf8]{inputenc} +}{ + \RequirePackage{fontspec} +} \RequirePackage{xpatch}% \AtEndPreamble{% \RequirePackage{mweights}% @@ -251,12 +256,25 @@ This work consists of the file denisbdoc.dtx % \let\task\relax % \RequirePackage{exsheets} % \let\task\denisbdoc@ORI@task -\RequirePackage{parskip}% -% \RequirePackage{amsthm}% -% \RequirePackage{thmtools}% \RequirePackage{fixfoot}% -\RequirePackage{marginnote} -\RequirePackage[inline]{enumitem}% +% +% \end{macrocode} +% +% For all the conditional ×\@ifclassloaded{beamer}{...}{...}× , we the following +% trick needed because patching commands when ×#× is involved can't happen in +% the argument to another command (see +% \url{https://tex.stackexchange.com/a/167107/18401}). +% \begin{macrocode} +\newif\if@DBD@beamer@not@loaded@ +\@DBD@beamer@not@loaded@true +\@ifclassloaded{beamer}{\@DBD@beamer@not@loaded@false}{\@DBD@beamer@not@loaded@true} +% +\if@DBD@beamer@not@loaded@ +\RequirePackage{parskip}% + \RequirePackage{marginnote} + \RequirePackage{mparhack} + \RequirePackage[inline]{enumitem} +\fi% \RequirePackage{afterpage}% \RequirePackage{calc}% % \RequirePackage[lining]{libertine}% @@ -265,19 +283,28 @@ This work consists of the file denisbdoc.dtx \RequirePackage{booktabs}% \RequirePackage{multirow}% \RequirePackage[xr]{zref}% -\RequirePackage[multiple]{footmisc}% -% \RequirePackage[multiple,bottom]{footmisc}% -\RequirePackage{rotating}% -\RequirePackage{pdflscape}% +\if@DBD@beamer@not@loaded@ + \RequirePackage[multiple]{footmisc}% + \RequirePackage{rotating}% +\fi% +\bool_if:nTF {\g_@@_lscape_bool} {% + \RequirePackage{lscape}% +}{% + \RequirePackage{pdflscape}% +} \RequirePackage{xspace}% \RequirePackage{accsupp} +\RequirePackage{newunicodechar} \RequirePackage{hologo}% \RequirePackage{xifthen}% \RequirePackage{refcount}% +\RequirePackage{etoolbox}% \RequirePackage{iflang}% \RequirePackage{ifpdf}% \RequirePackage{amssymb}% -\RequirePackage{tocvsec2}% +\if@DBD@beamer@not@loaded@ + \RequirePackage{tocvsec2}% +\fi \RequirePackage{ltxcmds}% \RequirePackage{csquotes}% \RequirePackage{tikz}% @@ -316,7 +343,6 @@ This work consists of the file denisbdoc.dtx \_@@_printbibliography_ORI[heading=bibintoc,#1]% \pagestyle{ordinary}% }% - }{% }% }% }{% @@ -340,8 +366,10 @@ This work consists of the file denisbdoc.dtx % % \Pkg{tocbibind} should be loaded before \pkg{imakeidx}, otherwise it would % destroy the |\indexprologue| feature of the latter. -\RequirePackage{tocbibind}% -\RequirePackage[xindy]{imakeidx} +\if@DBD@beamer@not@loaded@ + \RequirePackage{tocbibind}% + \RequirePackage[xindy]{imakeidx} +\fi% % % \@ifpackageloaded{hypdoc}{% % }{% @@ -358,13 +386,16 @@ This work consists of the file denisbdoc.dtx }{% \RequirePackage[hyperfootnotes=false,hyperindex=false]{hyperref}% }% -\RequirePackage{attachfile2} \@ifpackageloaded{nameref}{% +\RequirePackage{attachfile2}% +\@ifpackageloaded{nameref}{% }{% \RequirePackage{nameref}% }% \@ifpackageloaded{hypcap}{% }{% - \RequirePackage[all]{hypcap}% + \if@DBD@beamer@not@loaded@ + \RequirePackage[all]{hypcap}% + \fi% }% \@ifpackageloaded{bookmark}{% }{% @@ -375,6 +406,15 @@ This work consists of the file denisbdoc.dtx % \RequirePackage{glossaries}% \RequirePackage[xindy,hyperfirst=false,toc=false]{glossaries-extra}% \makeglossaries% + \newglossaryentry{zip}{% + name=zip,% + category={format},% + description={format~ de~ fichier~ permettant~ l'archivage~ (utilisation~ + d'un~ seul~ fichier~ pour~ stocker~ plusieurs~ fichiers)~ et~ la~ + compression~ de~ données~ (diminution~ de~ l'espace~ occupé~ sur~ le~ + support~ numérique)~ sans~ perte~ de~ qualité},% + text={zip}% + }% \setglossarystyle{indexhypergroup}% \setabbreviationstyle[acronym]{long-short-sc}% \newcommand*{\formatfont}[1]{\textsc{#1}}% @@ -395,20 +435,22 @@ This work consists of the file denisbdoc.dtx % Some code stolen from \pkg{hypdoc} in order page numbers in change history are % hyperlinks. % \begin{macrocode} -\def\hdpindex#1#2{% - \csname\ifx\\#1\\relax\else#1\fi\endcsname{% - \hyperpage{#2}% - }% -} -\let\HDorg@wrglossary\@wrglossary -\def\@wrglossary#1{% - \let\HDorg@encapchar\encapchar - \def\encapchar##1\encapchar##2\@nil{% - \HDorg@encapchar - hdpindex{##1}% - }% - \HDorg@wrglossary{#1\encapchar\encapchar\@nil}% -} +\if@DBD@beamer@not@loaded@ + \def\hdpindex#1#2{% + \csname\ifx\\#1\\relax\else#1\fi\endcsname{% + \hyperpage{#2}% + }% + } + \let\HDorg@wrglossary\@wrglossary + \def\@wrglossary#1{% + \let\HDorg@encapchar\encapchar + \def\encapchar##1\encapchar##2\@nil{% + \HDorg@encapchar + hdpindex{##1}% + }% + \HDorg@wrglossary{#1\encapchar\encapchar\@nil}% + } +\fi% % \end{macrocode} % % \begin{macrocode} @@ -417,7 +459,7 @@ This work consists of the file denisbdoc.dtx % % % Some hacks to avoid issues of \pkg{hypdoc} reported by me at % % \url{https://github.com/ho-tex/oberdiek/issues} (currently not used because -% % this package has to much issues)). +% % this package has to much issues). % % \begin{macrocode} % \@ifpackageloaded{hypdoc}{% % % \let\theglossary\HDorg@theglossary @@ -510,7 +552,7 @@ This work consists of the file denisbdoc.dtx % \url{http://tex.stackexchange.com/q/309680/18401}), hence we rely on % \Package{ltxcmds} for this: % \begin{macrocode} -\ltx@iffilelater{frenchb.ldf}{2016/03/20}{% +\ltx@iffilelater{french.ldf}{2016/03/20}{% }{% \DeclareRobustCommand*{\NoAutoSpacing}{\FBAutoSpaceGuillfalse% \ifFB@active@punct\noautospace@beforeFDP\shorthandoff{;:!?}\fi% @@ -529,12 +571,6 @@ This work consists of the file denisbdoc.dtx \tcbuselibrary{listingsutf8} \else \tcbuselibrary{listings} -\pdftex_if_engine:TF - { - \lstMakeShortInline[style=dbtex]| - }{ - \lstMakeShortInline[style=dbtex]× - } \fi \tcbuselibrary{% documentation,theorems,breakable,skins,xparse% @@ -572,14 +608,19 @@ This work consists of the file denisbdoc.dtx % if odd page or oneside={flushright upper}{flushright upper}, % doc@marginnote,#1]#2\end{tcolorbox}}} \tcbset{doc marginnote={if odd page or oneside={flushright upper}{flushright upper}}} -\patchcmd{\@mn@margintest}{\@tempswafalse}{\@tempswatrue}{}{} -\patchcmd{\@mn@margintest}{\@tempswafalse}{\@tempswatrue}{}{} \reversemarginpar +\pretocmd{\tcbdocmarginnote}{% + \patchcmd{\@mn@margintest}{\@tempswafalse}{\@tempswatrue}{}{} + \patchcmd{\@mn@margintest}{\@tempswafalse}{\@tempswatrue}{}{} + \reversemarginpar% +}{}{} +\@ifpackageloaded{geometry}{% + \geometry{marginparwidth=.65in}% +}{} % \end{macrocode} % % \begin{macrocode} -\DeclareTotalTCBox{\commandshell}{ v } -{ commandshell}{#1} +\DeclareTotalTCBox{\commandshell}{ v }{ commandshell}{#1} \newtcblisting{listingshell}[1][]{% % colback=black, % colupper=white, @@ -619,6 +660,7 @@ This work consists of the file denisbdoc.dtx % (cf. \url{http://tex.stackexchange.com/q/335522/18401}) that will be inserted % inside the (level 0) |\targetindexentry| command below. % \begin{macrocode} +\if@DBD@beamer@not@loaded@ \newcommand{\indexmark}[1]{\hypertarget{index:#1}{#1}\markboth{#1}{#1}} % \end{macrocode} % @@ -646,12 +688,13 @@ This work consists of the file denisbdoc.dtx % |\lettergroup| in the customized |theindex| environment (defined in the % customized index style \File{denisbdoc.xdy}). % \begin{macrocode} -\xpretocmd{\printindex}{\def\DBD@index@symbolic@name{#1}}{}{} + \xpretocmd{\printindex}{\edef\DBD@index@symbolic@name{#1}}{}{\aaa} + % \xpretocmd{\printindex}{\edef\DBD@index@symbolic@name{#1}}{}{\aaa} % \end{macrocode} % % We patch the |\indexprologue| command in order to provide a navigation line at % the start of the index with links to each group that is present in the index -% (see \url{http://tex.stackexchange.com/q/334200/18401})). +% (see \url{http://tex.stackexchange.com/q/334200/18401}). % \begin{macrocode} % \renewcommand*{\marginfont}{\normalsize} % \renewcommand*{\marginnotevadjust}{.625\baselineskip} @@ -666,14 +709,14 @@ This work consists of the file denisbdoc.dtx #2 \par\bigskip \csuse{DBD@indexnavigation@\csuse{DBD@index@symbolic@name}}% -}{}{}% +}{}{\aaa}% % \end{macrocode} % % We create a boolean which tests if the letter in the navigation bar is the 1st % one or not (in the latter case, a newline is added). % \begin{macrocode} -\newif\if@DBD@no@first@letter@ -\@DBD@no@first@letter@false + \newif\if@DBD@no@first@letter@ + \@DBD@no@first@letter@false % \end{macrocode} % % \begin{macrocode} @@ -692,7 +735,7 @@ This work consists of the file denisbdoc.dtx \fi \hyperlink{#2:#1}{\textbf{#1}}% }% -} +}% % \end{macrocode} % % \begin{macrocode} @@ -780,6 +823,8 @@ This work consists of the file denisbdoc.dtx \colorlet{en-arborescence}{red!20} \colorlet{a-plat}{blue!20} \colorlet{texcs}{blue} +\colorlet{directive}{texcs} +\colorlet{mandatory-argument}{red} \colorlet{environment}{teal} \colorlet{key}{purple} \colorlet{value}{violet} @@ -809,7 +854,7 @@ This work consists of the file denisbdoc.dtx \lstdefinelanguage[extLaTeX]{TeX}[LaTeX]{TeX}{% moretexcs={% footnotesize,huge,Huge,large,Large,LARGE,large,Large,scriptsize,tiny,% - includegraphics,cite,ttwplink,vref,LTXtable,tableofcontents,frontmatter,mainmatter,% + includegraphics,cite,ttwplink,cref,vref,LTXtable,tableofcontents,frontmatter,mainmatter,% part,chapter,section,subsection,subsubsection,paragraph,subparagraph,RequirePackage,% listoftables,listoffigures,lstlistingname,si,SI,ohm,num,space,shorthandon,shorthandoff,% abstractname,appendixname,contentsname,listfigurename,listtablename,indexname,% @@ -819,9 +864,9 @@ This work consists of the file denisbdoc.dtx @pnumwidth,bookmarksetup,DeclareTextCommand,text,iiint,NewPairedDelimiter,% norm,lnorm,llnorm,lpnorm,supnorm,abs,prt,brk,brc,lrangle,leqgeq,% norm*,lnorm*,llnorm*,lpnorm*,supnorm*,abs*,prt*,brk*,brc*,lrangle*,leqgeq*,% - pdfobjcompresslevel,chaptermark% + pdfobjcompresslevel,chaptermark,PassOptionsToClass% },% - morekeywords=[1]{% Environments' names + morekeywords={[1]% Environments' names tabular,tabulary,math,document,minipage,eqnarray,eqnarray*,align,align*,% equation,gather,multline,flalign,equation*,gather*,multline*,flalign*,% itemize,itemize*,enumerate,enumerate*,description,description*,% @@ -847,7 +892,7 @@ This work consists of the file denisbdoc.dtx acrfullpl,Acrfullpl,% Acrlong*,acronymtype,printacronyms,printsymbols% },% - % Environments' names + % Mandatory arguments (other than environments' names) morekeywords={% },% % Mots-clés de niveau 2 : arguments obligatoires et environnements @@ -869,11 +914,58 @@ This work consists of the file denisbdoc.dtx {% % Séquences de contrôles (communément appelées commandes ou macros) moretexcs={% - printbibliography,SetCiteCommand,autocite,addbibresource,fullcite,% - textcite,cite,citeauthor% + cite,Cite,parencite,Parencite,footcite,footcitetext,% + smartcite,Smartcite,% + textcite,Textcite,supercite,cites,Cites,parencites,% + Parencites,footcitesfootcitetexts,textcites,Textcites,% + supercites,autocite,Autocite,autocite*,Autocite*,autocites,% + Autocites,citeauthor,Citeauthor,citetitle,citetitle*,% + citeyear,citeurl,parentext,brackettext,nocite,fullcite,% + footfullcite,volcite,Volcite,pvolcite,Pvolcite,fvolcite,% + ftvolcite,tvolcite,Tvolcite,avolcite,Avolcite,notecite,% + Notecite,pnotecite,Pnotecite,fnotecite,citename,citelist,% + citefield,printbibliography,bibliography,citedate,% + ExecuteBibliographyOptions,defbibnote,psq,psqq,addbibresource% },% - % Mots-clés de niveau 1 : arguments optionnels - morekeywords={% + % morekeywords={% + % @article,@book,@inbook,@bookinbook,@suppbook,@booklet,@collection,% + % @conference,@incollection,@suppcollection,@manual,@misc,@online,% + % @patent,@periodical,@suppperiodical,@proceedings,@inproceedings,% + % @reference,@inreference,@report,@thesis,@unpublished,@masterthesis,% + % @phdthesis,% + % @Article,@Book,@Inbook,@Bookinbook,@Suppbook,@Booklet,@Collection,% + % @conference,@Incollection,@Suppcollection,@Manual,@Misc,@Online,% + % @patent,@Periodical,@Suppperiodical,@Proceedings,@Inproceedings,% + % @reference,@Inreference,@Report,@Thesis,@Unpublished,@Masterthesis,% + % @Phdthesis,% + % @ARTICLE,@BOOK,@INBOOK,@BOOKINBOOK,@SUPPBOOK,@BOOKLET,@COLLECTION,% + % @CONFERENCE,@INCOLLECTION,@SUPPCOLLECTION,@MANUAL,@MISC,@ONLINE,% + % @PATENT,@PERIODICAL,@SUPPPERIODICAL,@PROCEEDINGS,@INPROCEEDINGS,% + % @REFERENCE,@INREFERENCE,@REPORT,@THESIS,@UNPUBLISHED,@MASTERTHESIS,% + % @PHDTHESIS,% + % @string,@String,@STRING,@comment% + % },% + % directives + directives={% + article,book,inbook,bookinbook,suppbook,booklet,collection,% + conference,incollection,suppcollection,manual,misc,online,% + patent,periodical,suppperiodical,proceedings,inproceedings,% + reference,inreference,report,thesis,unpublished,masterthesis,% + phdthesis,% + Article,Book,Inbook,Bookinbook,Suppbook,Booklet,Collection,% + conference,Incollection,Suppcollection,Manual,Misc,Online,% + patent,Periodical,Suppperiodical,Proceedings,Inproceedings,% + reference,Inreference,Report,Thesis,Unpublished,Masterthesis,% + Phdthesis,% + ARTICLE,BOOK,INBOOK,BOOKINBOOK,SUPPBOOK,BOOKLET,COLLECTION,% + CONFERENCE,INCOLLECTION,SUPPCOLLECTION,MANUAL,MISC,ONLINE,% + PATENT,PERIODICAL,SUPPPERIODICAL,PROCEEDINGS,INPROCEEDINGS,% + REFERENCE,INREFERENCE,REPORT,THESIS,UNPUBLISHED,MASTERTHESIS,% + PHDTHESIS,% + string,String,STRING,comment% + },% + % Mots-clés de niveau 1 : attributs et options de biblatex + morekeywords=[2]{% abstract,addendum,afterword,annotation,annotator,author,authortype,% bookauthor,bookpagination,booksubtitle,booktitle,booktitleaddon,% chapter,commentator,date,doi,edition,editor,editora,editorb,% @@ -893,36 +985,76 @@ This work consists of the file denisbdoc.dtx archiveprefix,journal,key,pdf,primaryclass,school,address,% % backend,style,citestyle,bibstyle,sorting,maxnames,minnames,maxitems,minitems,% - backref,abbreviate,firstinits,prenote,postnote,useprefix% + backref,abbreviate,firstinits,prenote,postnote,useprefix,autopunct% + },% + % Mots-clés de niveau 3 : valeurs des attributs identifiées + morekeywords=[3]{% + submitted,inpress,danish dutch,american,USenglish,english,% + british,UKenglish,canadian,australian,newzealand,finnish,french,% + francais,canadien,german,ngerman,austrian,naustrian,greek,% + italian,norsk,nynorsk,brazil,portuges,spanish,swedish,% + % + biber,numeric,numeric-comp,numeric-verb,alphabetic,% + alphabetic-verb,authoryear,authoryear-comp,authoryear-ibid,% + authoryear-icomp,authortitle,authortitle-comp,authortitle-ibid,% + authortitle-icomp,authortitle-terse,authortitle-tcomp,% + authortitle-ticomp,verbose,verbose-ibid,verbose-note,% + verbose-inote,verbose-trad1,verbose-trad2,verbose-trad3,% + reading,draft,debug,% + inline,footnote,superscript,plain,% + nyt,ynt,none,false% + },% + alsoletter={-123},% + sensitive,% + delim=*[directive]@ + % +}[keywords,directives,tex,comments]% +% +\lstdefinelanguage[csquotes]{TeX}[LaTeX]{TeX}% +{% + % Séquences de contrôles (communément appelées commandes ou macros) + moretexcs={% + enquote,textelp,textins,blockcquote,SetCiteCommand% + },% + % Mots-clés de niveau 1 : arguments optionnels + morekeywords={% },% % Mots-clés de niveau 2 : arguments obligatoires et environnements morekeywords=[2]{% % title, - heading,refsegment% },% % Mots-clés de niveau 3 : arguments optionnels valeurs de clés dans clé=valeur morekeywords=[3]{% - bibintoc,skipbib,chapter% + skipbib% + },% + % Mots-clés de niveau 4 : arguments optionnels valeurs de clés dans clé=valeur + morekeywords=[4]{% },% sensitive% }[keywords,tex,comments]% % -\lstdefinelanguage[csquotes]{TeX}[LaTeX]{TeX}% +\lstdefinelanguage[colophon]{TeX}[LaTeX]{TeX}% {% % Séquences de contrôles (communément appelées commandes ou macros) moretexcs={% - enquote,textelp,textins,blockcquote% + colophontitle,colophontitlestyle,colophontitlesize,colophonmidspace,% + colophonpagestyle,colophontitlealign,colophonpretitlehook,colophonposttitlehook,% + colophonparstyle,colophonparsize,colophonparlead,colophonnofirstindent,colophonpreparhook,% + colophonpostparhook,colophonparalign,colophonnofullpage,colophonnoclrdblpg,colophonclrpg,% + colophontopspace,colophonbotspace% },% % Mots-clés de niveau 1 : arguments optionnels morekeywords={% },% % Mots-clés de niveau 2 : arguments obligatoires et environnements morekeywords=[2]{% - % title, + colophon, },% % Mots-clés de niveau 3 : arguments optionnels valeurs de clés dans clé=valeur morekeywords=[3]{% - skipbib% + titlestyle,titlesize,aftertitle,pagestyle,titlealign,% + parstyle,parsize,parlead,nofirstindent,nofullpage,noclrdblpg,% + clrpg,topspace,botspace% },% % Mots-clés de niveau 4 : arguments optionnels valeurs de clés dans clé=valeur morekeywords=[4]{% @@ -1011,7 +1143,12 @@ This work consists of the file denisbdoc.dtx },% % Mots-clés de niveau 2 : arguments obligatoires et environnements morekeywords=[2]{% - breaklinks,colorlinks,bookmarks,pdfborderstyle,pdfborder,all% + breaklinks,colorlinks,bookmarks,pdfborderstyle,pdfborder,all,pdfencoding,final,% + hidelinks,linktoc,% + },% + % Mots-clés de niveau 3 : arguments optionnels valeurs de clés dans clé=valeur + morekeywords=[3]{% + unicode% },% sensitive% }[keywords,tex,comments]% @@ -1026,7 +1163,7 @@ This work consists of the file denisbdoc.dtx laboratory,dedication,frontepigraph,keywords,subject,expression,tableofcontents,submissiondate,% maketitle,makedisclaimer,makekeywords,makelaboratory,makeabstract,makededications,% makefrontepigraphs,makebackcover,ordernumber,chapter*,disclaimer,newglssymbol,yadsetup,% - comue,% + comue,newcorporation% % acknowledgements,frenchabstract,foreword,preface,caution, },% % Environments' names @@ -1045,7 +1182,7 @@ This work consists of the file denisbdoc.dtx address,telephone,fax,email,type,acronym,heading,nowarning,noerror,nofrontcover,role,% hyperfootnotes,hyperindex,plainpages,pdfpagemode,pdfpagelayout,locale,gray,frametitle,% graphicx,adjustbox,setspace,xcolor,datatool,titleps,draftwatermark,babel,datetime,% - bookmark,fncychap,localtocs,localbibs,localbibs*% + bookmark,fncychap,localtocs,localtocs/depth,localbibs,localbibs*% },% morekeywords=[3]{% Values of key-value lists single,onehalf,double,doctor,yadsymbolstyle,% @@ -1069,7 +1206,7 @@ This work consists of the file denisbdoc.dtx comonitor*,supervisor,supervisor*,academicfield,doctoralschool,keywords,% ordernumber,committeepresident,committeepresident*,speciality% },% - alsoletter={!-*1234560}% + alsoletter={!-*1234560/}% }% % \end{macrocode} % @@ -1088,7 +1225,7 @@ This work consists of the file denisbdoc.dtx vec,surname,usetikzlibrary,arccos,arcsin,arctan,log,lg,le,leq,ge,geq,% gztverb,th,epigraph% },% - % Environments' names + % Mandatory arguments (other than environments' names) morekeywords={% gzt,gztarticle% },% @@ -1130,11 +1267,13 @@ This work consists of the file denisbdoc.dtx printauthorsdetails,date,title,author,maketitle,item,printbibliography,% vec,surname,usetikzlibrary,arccos,arcsin,arctan,log,lg,le,leq,ge,geq,set,% nwejmverb,th,epigraph,keywords,msc,acknowledgments,E,I,grad,Div,curl,rot,supp,% - DeclareMathOperator,BinaryOperators,dif,articlesetup% + DeclareMathOperator,BinaryOperators,dif,articlesetup,% + bbN,bbZ,bbD,bbQ,bbR,bbC,bbK,% + newenumeration% },% - % Environments' names + % Mandatory arguments (other than environments' names) morekeywords={% - nwejm,nwejmart,assertions,hypotheses% + nwejm,nwejmart,% },% morekeywords=[1]{% Environments' names abstract,minitoclist,bookreview,bookadvertisement,% @@ -1142,14 +1281,15 @@ This work consists of the file denisbdoc.dtx theorem,theoreme,corollary,corollaire,conjecture,proposition,% lemma,lemme,axiom,axiome,definition,remark,remarque,example,exemple,notation,% theorem*,theoreme*,corollary*,corollaire*,conjecture*,proposition*,proof,preuve,% - lemma*,lemme*,axiom*,axiome*,definition*,remark*,remarque*,example*,exemple*,notation*% + lemma*,lemme*,axiom*,axiome*,definition*,remark*,remarque*,example*,exemple*,notation*,% + assertions,hypotheses% },% morekeywords=[2]{% Keys of key-value lists number,month,year,publisher,address,phone,fax,email,url,issn,isbn,short,minishort,notintoc,% abstract,frenchtitle,englishtitle,% title,label,% pictogram,list,help,diameter,textwidth,xshift,yshift,% affiliation,affiliationtagged,email,minibio,photo,webpage,frontcover,bibkey,copyright,% - gradient% + gradient,title/french,style,title,title-plural,singular,plural,label% },% morekeywords=[3]{% Values of key-value lists true,false,theorem,definition,proof% @@ -1157,6 +1297,29 @@ This work consists of the file denisbdoc.dtx morekeywords=[4]{% Class and packages options pagegrid,forprinter,cover,forauthors,% },% + alsoletter={!-*1234560/}% +}% +% \end{macrocode} +% +% Definition of the \enquote{studentreport} \TeX{} dialect. +% \begin{macrocode} +\lstdefinelanguage[studentreport]{TeX}[LaTeX]{TeX}{% + moretexcs={% Control sequences' names + reportsetup,daterange,professionaladvisor,academicadvisor,companylogo% + },% + % Mandatory arguments (other than environments' names) + morekeywords={% + },% + morekeywords=[1]{% Environments' names + },% + morekeywords=[2]{% Keys of key-value lists + institute,subinstitute,subsubinstitute,year,10pt,11pt,12pt,internship,project,layout,% + strings,pretitle,company,advisor,advisors,before~start~date,before~end~date,date,% + logos,logosheights,,% + },% + morekeywords=[3]{% Values of key-value lists + ulco,iutlco,gte,gim,% + },% alsoletter={!-*1234560}% }% % \end{macrocode} @@ -1210,14 +1373,17 @@ This work consists of the file denisbdoc.dtx % % \renewcommand{\generalname}{Général}% % -\xapptocmd{\@chapter}{% -% \xapptocmd{\@section}{% - \addtocontents{dbwarninglist}{\protect\addvspace{10\p@}}% - \addtocontents{dbremarklist}{\protect\addvspace{10\p@}}% - \addtocontents{dbexamplelist}{\protect\addvspace{10\p@}}% - \addtocontents{dbfaqlist}{\protect\addvspace{10\p@}}% - \addtocontents{dbtablist}{\protect\addvspace{10\p@}}% -}{}{} +\if@DBD@beamer@not@loaded@ +\ifcsdef{@chapter}{ + \xapptocmd{\@chapter}{% + \addtocontents{dbwarninglist}{\protect\addvspace{10\p@}}% + \addtocontents{dbremarklist}{\protect\addvspace{10\p@}}% + \addtocontents{dbexamplelist}{\protect\addvspace{10\p@}}% + \addtocontents{dbfaqlist}{\protect\addvspace{10\p@}}% + \addtocontents{dbtablist}{\protect\addvspace{10\p@}}% + }{}{} +}{} +\fi% % \sisetup{locale=FR,detect-all} % \floatsetup[table]{style=plaintop} @@ -1238,25 +1404,23 @@ This work consists of the file denisbdoc.dtx % % prebreak={\c_space_tl\Righttorque}, % % postbreak={\c_space_tl\Lefttorque} % }% -\lstdefinestyle{dbtex}{% +\lstdefinestyle{pre-dbtex}{% escapechar=", language=[LaTeX]TeX, alsolanguage=[extLaTeX]TeX, - alsolanguage=[glossaries]TeX, - alsolanguage=[biblatex]TeX, + % alsolanguage=[glossaries]TeX, + % alsolanguage=[biblatex]TeX, alsolanguage=[csquotes]TeX, - alsolanguage=[tcolorbox]TeX, - alsolanguage=[listings]TeX, - alsolanguage=[xcolor]TeX, - alsolanguage=[hyperref]TeX, - alsolanguage=[yad]TeX, - alsolanguage=[gzt]TeX, - alsolanguage=[nwejm]TeX, + % alsolanguage=[tcolorbox]TeX, + % alsolanguage=[listings]TeX, + % alsolanguage=[xcolor]TeX, + % alsolanguage=[hyperref]TeX, texcsstyle=*\color{texcs}, breaklines=true, basicstyle=\normalfont\ttfamily, commentstyle=\color{comment}\itshape, - keywordstyle={\color{environment}}, + directivestyle={\color{directive}}, + keywordstyle={\color{red}}, keywordstyle={[1]\color{environment}}, keywordstyle={[2]\color{key}}, keywordstyle={[3]\color{value}}, @@ -1272,8 +1436,41 @@ This work consists of the file denisbdoc.dtx aboveskip=\c_@@_listings_aboveskip_skip, belowskip=\c_@@_listings_belowskip_skip }% +\bool_if:nT {\g_@@_yad_bool} {% + \lstdefinestyle{dbtex}{% + style=pre-dbtex,% + alsolanguage=[yad]TeX,% + alsolanguage=[colophon]TeX,% + moretexcs={printbibliography,autocite},% + } +} +\bool_if:nT {\g_@@_gzt_bool} {% + \lstdefinestyle{dbtex}{% + style=pre-dbtex,% + alsolanguage=[gzt]TeX,% + } +} +\bool_if:nT {\g_@@_nwejm_bool} {% + \lstdefinestyle{dbtex}{% + style=pre-dbtex,% + alsolanguage=[nwejm]TeX,% + } +} +\bool_if:nT {\g_@@_studentreport_bool} {% + \lstdefinestyle{dbtex}{% + style=pre-dbtex,% + alsolanguage=[studentreport]TeX,% + } +} \lstset{style=dbtex} -% \lstMakeShortInline[style=dbtex]| +\sys_if_engine_pdftex:TF +{ + \ExplSyntaxOff + \lstMakeShortInline[style=dbtex]| + \ExplSyntaxOn +}{ + \lstMakeShortInline[style=dbtex]× +} % \end{macrocode} % % \begin{macrocode} @@ -1282,7 +1479,14 @@ This work consists of the file denisbdoc.dtx fonttitle=\bfseries, enlarge~top~by=1mm, separator~sign~dash, - label~separator=- + label~separator=-, + before~title={% + \hypersetup{hidelinks}% + \tcbset{% + color~definition=white, + color~hyperlink=white, + }% + }% }% }% % @@ -1355,7 +1559,7 @@ Nouv.~:}~#1} % références qui devront être labellisées au moyen de la commande % ×\zlabel× du \Package{zref} (ce dernier devant être chargé dans le % \File{.tex} externe du \File{.pdf} avec les options ×user× et -% ×abspage×). +% ×abspage×). Cf. \url{https://tex.stackexchange.com/a/31489/18401}. % \begin{macrocode} \define@key{Gin}{bylabel}{% \edef\@tempa{{Gin}{page=\zref@extract{#1}{abspage}}}% @@ -1385,14 +1589,16 @@ Nouv.~:}~#1} % % Some hacks to avoid "\makeindex"'s “title” option from \pkg{imakeidx} ignored % if \pkg{tcolorbox}' indexation is used (see -% \url{http://tex.stackexchange.com/q/332284/18401})). +% \url{http://tex.stackexchange.com/q/332284/18401}). % \begin{macrocode} -\expandafter\AtBeginDocument\expandafter{% - \expandafter\def\expandafter\theindex\expandafter{\theindex}% -} -\expandafter\AtBeginDocument\expandafter{% - \expandafter\def\expandafter\endtheindex\expandafter{\endtheindex}% -} +\@ifclassloaded{beamer}{% +}{% + \expandafter\AtBeginDocument\expandafter{% + \expandafter\def\expandafter\theindex\expandafter{\theindex}% + } + \expandafter\AtBeginDocument\expandafter{% + \expandafter\def\expandafter\endtheindex\expandafter{\endtheindex}% + } % \end{macrocode} % % Hack of \pkg{imakeidx} in order different indices have different extensions @@ -1401,80 +1607,84 @@ Nouv.~:}~#1} % extensions of input and output files are specified by new |extin| and |extout| % options of |\makeindex|. % \begin{macrocode} -\ExplSyntaxOff -\def\imki@finalmessage#1{}% since you're using latexmk -\def\imki@startidx#1#2{% - \if@filesw + \ExplSyntaxOff + \def\imki@finalmessage#1{}% since you're using latexmk + \def\imki@startidx#1#2{% + \if@filesw \def\index{\@bsphack \@ifnextchar [{\@index}{\@index[\imki@jobname]}} \expandafter\newwrite\csname #1@idxfile\endcsname \immediate\openout \csname #1@idxfile\endcsname #1.#2\relax \typeout{Writing index file #1.#2}% - \fi} -\xpatchcmd\imki@makeindex + \fi} + \xpatchcmd\imki@makeindex {\imki@startidx\imki@name} {\imki@startidx\imki@name\imki@extout} {}{} -\xpatchcmd\imki@build + \xpatchcmd\imki@build {\imki@dokey\imki@title} {\imki@dokey\imki@title - \imki@dokey\imki@extin - \imki@dokey\imki@extout} + \imki@dokey\imki@extin + \imki@dokey\imki@extout} {}{} -\xpatchcmd{\imki@putindex} + \xpatchcmd{\imki@putindex} {\imki@options} {\c_space_tl~ -o~ #1.\imki@extin\imki@options} {}{} -\xpatchcmd{\imki@putindex} + \xpatchcmd{\imki@putindex} {.idx} {.\imki@extout} {}{} -\xpatchcmd{\imki@putindex} + \xpatchcmd{\imki@putindex} {.ind} {.\imki@extin} {}{} -\def\imki@extout{idx}\def\imki@extin{ind} -\define@key{imki}{extout}{\def\imki@extout{#1}} -\define@key{imki}{extin}{\def\imki@extin{#1}} + \def\imki@extout{idx}\def\imki@extin{ind} + \define@key{imki}{extout}{\def\imki@extout{#1}} + \define@key{imki}{extin}{\def\imki@extin{#1}} +}% \ExplSyntaxOn % \end{macrocode} % % \begin{macrocode} -\cs_new_protected:Nn \_@@_alert:n -{ - \begingroup - \color{red} - #1 - \endgroup -}% -\NewDocumentCommand \alert {m} -{ - \_@@_alert:n {#1} -}% -\DeclareDocumentCommand \changes { smmm } { - \IfBooleanTF {#1} +\@ifclassloaded{beamer}{% +}{% + \cs_new_protected:Nn \_@@_alert:n { - \tl_set:Nn \l_tmpa_tl {\alert{#4}} - }{ - \tl_set:Nn \l_tmpa_tl {#4} + \begingroup + \color{red} + #1 + \endgroup + }% + \NewDocumentCommand \alert {m} + { + \_@@_alert:n {#1} + }% + \DeclareDocumentCommand \changes { smmm } { + \IfBooleanTF {#1} + { + \tl_set:Nn \l_tmpa_tl {\alert{#4}} + }{ + \tl_set:Nn \l_tmpa_tl {#4} + } + \ifx\@onlypreamble\@notprerr + \index[\jobname-changes]{\texttt{#2}~(#3)!\l_tmpa_tl} + \else + \index[\jobname-changes]{\texttt{#2}~(#3)!\emph{Globalement}!\l_tmpa_tl|gobble} + \fi } - \ifx\@onlypreamble\@notprerr - \index[\jobname-changes]{\texttt{#2}~(#3)!\l_tmpa_tl} - \else - \index[\jobname-changes]{\texttt{#2}~(#3)!\emph{Globalement}!\l_tmpa_tl|gobble} - \fi -} -\DeclareDocumentCommand \PrintChanges { O{} } { - \indexprologue{#1} + \DeclareDocumentCommand \PrintChanges { !O{} } { + \indexprologue{#1} % \end{macrocode} % % The changes are printed in a numbered chapter hence subject to % cross-references. % \begin{macrocode} - \def\imki@indexlevel{\chapter} - \printindex[\jobname-changes] - \def\imki@indexlevel{\chapter*} -} + \def\imki@indexlevel{\chapter} + \printindex[\jobname-changes] + \def\imki@indexlevel{\chapter*} + } +}% % \@ifpackageloaded{doc}{% % \renewcommand*{\changes@}[3]{% % \protected@edef\@tempa{% @@ -1521,7 +1731,7 @@ Nouv.~:}~#1} % % This saves the url with all characters catcode other: % \begin{macrocode} -\tl_const:Nx \c_@@_standard_url_tl { \tl_to_str:n { http://www.ctan.org/pkg/ } } +\tl_const:Nx \c_@@_standard_url_tl { \tl_to_str:n { http://ctan.org/pkg/ } } % \end{macrocode} % Separate formatting: % #1: package or class name @@ -1570,16 +1780,16 @@ Nouv.~:}~#1} } {#4} } -\NewDocumentCommand{\package}{ s t+ O{} m O{package} O{} O{} } { +\NewDocumentCommand{\package}{ s t+ O{} m !O{package} !O{} !O{} } { \_@@_package:nnnnnnn {#1}{#2}{#3}{#4}{package}{#6}{#7} } -\NewDocumentCommand{\Package}{ s t+ O{} m O{package} O{} O{} } { +\NewDocumentCommand{\Package}{ s t+ O{} m !O{package} !O{} !O{} } { \IfLanguageName{french}{package~}{}% \_@@_package:nnnnnnn {#1}{#2}{#3}{#4}{package}{#6}{#7} \IfLanguageName{english}{~package}{}% } % -\NewDocumentCommand{\class}{ s t+ O{} m O{} O{} O{} } { +\NewDocumentCommand{\class}{ s t+ O{} m !O{} !O{} !O{} } { \IfLanguageName{french}{% \_@@_package:nnnnnnn {#1}{#2}{#3}{#4}{classe}{#6}{#7} }{}% @@ -1587,7 +1797,7 @@ Nouv.~:}~#1} \_@@_package:nnnnnnn {#1}{#2}{#3}{#4}{class}{#6}{#7} }{}% } -\NewDocumentCommand{\Class}{ s t+ O{} m O{} O{} O{} } { +\NewDocumentCommand{\Class}{ s t+ O{} m !O{} !O{} !O{} } { \IfLanguageName{french}{% classe~% \_@@_package:nnnnnnn {#1}{#2}{#3}{#4}{classe}{#6}{#7} @@ -1634,35 +1844,35 @@ Nouv.~:}~#1} } \NewDocumentCommand{\Folder}{ m } {% - \IfLanguageName{french}{répertoire~}{}% + \IfLanguageName{french}{dossier~}{}% \_@@_file:n {#1}% \IfLanguageName{english}{~directory}{}% }% % -\NewDocumentCommand \ie { s } {% - \IfBooleanTF {#1} - { - \IfLanguageName{french}{% - c'est-\`{a}-dire - }{}% - \IfLanguageName{english}{% - id est - }{}% - } - { - \IfLanguageName{french}{% - c.-à-d - }{}% - \IfLanguageName{english}{% - i.e - }{}% - \@ifnextchar.% - { - }{ - .\xspace - }% - } -} +% \NewDocumentCommand \ie { s } {% +% \IfBooleanTF {#1} +% { +% \IfLanguageName{french}{% +% c'est-\`{a}-dire +% }{}% +% \IfLanguageName{english}{% +% id est +% }{}% +% } +% { +% \IfLanguageName{french}{% +% c.-à-d +% }{}% +% \IfLanguageName{english}{% +% i.e +% }{}% +% \@ifnextchar.% +% { +% }{ +% .\xspace +% }% +% } +% } % \NewDocumentCommand{\program}{ m } { @@ -1772,7 +1982,7 @@ Nouv.~:}~#1} { \hyperref[sec-comm-oblig]{% \textcolor{red!75!black}{ - % \pdftex_if_engine:TF + % \sys_if_engine_pdftex:TF % { % % \string! % \ding{52} @@ -1787,9 +1997,17 @@ Nouv.~:}~#1} \fi% }% } -\NewDocumentCommand{\mandatory}{ } +\cs_new_protected:Nn \_@@_mandatory_no_link: { - \_@@_mandatory: {} + \textcolor{red!75!black}{ + \faLock + } +} +\NewDocumentCommand{\mandatory}{ s } +{ + \IfBooleanTF {#1} + { \_@@_mandatory_no_link: {} } + { \_@@_mandatory: {} } }% % \NewDocumentCommand{\unixtldirectory}{} @@ -1966,13 +2184,22 @@ Nouv.~:}~#1} \pdfsuppresswarningpagegroup=1 % \end{macrocode} % +% We want to make the angle brackets generated by ×\meta× to be copied and +% pasted as they are, and not replaced by "h" and "i" +% (cf. \url{https://tex.stackexchange.com/q/18146/18401}). +% \begin{macrocode} +\newunicodechar{〈}{$\langle$} +\newunicodechar{〉}{$\rangle$} +% \end{macrocode} +% % \begin{macrocode} \cs_new_protected:Nn \_@@_meta:nn { \bgroup% \normalfont \ttfamily% - \textcolor{#1}{$\langle$\emph{#2}$\rangle$}% + \itshape% + \textcolor{#1}{$\langle$#2$\rangle$}% \egroup% } \AtBeginDocument{% @@ -1985,12 +2212,12 @@ Nouv.~:}~#1} % \subsection{Environments} % % \begin{macrocode} -\NewTCBListing{preamblecode}{ O{} }{% +\NewTCBListing{preamblecode}{ !O{} }{% codes,% drop~lifted~shadow, #1% } -\NewTCBListing{bodycode}{ O{} }{% +\NewTCBListing{bodycode}{ !O{} }{% codes,% #1% } @@ -2039,9 +2266,14 @@ Nouv.~:}~#1} % % \begin{macrocode} \tl_new:N \g_@@_number_within_tl -\tl_set:Nn \g_@@_number_within_tl {chapter} +\ifcsdef{chapter}{ + \tl_set:Nn \g_@@_number_within_tl {chapter} +}{ + \tl_set:Nn \g_@@_number_within_tl {section} +} \@ifclassloaded{gztarticle}{\tl_set:Nn \g_@@_number_within_tl {section}}{}% \@ifclassloaded{nwejmart}{\tl_set:Nn \g_@@_number_within_tl {section}}{}% +\@ifclassloaded{beamer}{\tl_set:Nn \g_@@_number_within_tl {section}}{}% % \end{macrocode} % % \begin{macrocode} @@ -2116,7 +2348,8 @@ Nouv.~:}~#1} { menufont = \sffamily , menusep = ${}\to{}$ - }% \end{macrocode} + } +% \end{macrocode} \menuentryset{inputsep=>} % % \section{Definitions specific to peticular classes or packages} @@ -2341,7 +2574,7 @@ Nouv.~:}~#1} \providecommand*\lettergroup[1]{% \belowpdfbookmark{#1}{\csuse{DBD@index@symbolic@name}:#1}% \par\indexheading{#1}{\csuse{DBD@index@symbolic@name}}\par - \nopagebreak + % \nopagebreak } ~n" :close "~n~n\end{theindex}~n" diff --git a/macros/latex/contrib/kvmap/kvmap.dtx b/macros/latex/contrib/kvmap/kvmap.dtx index efa6b2e481..b5fa08b04f 100644 --- a/macros/latex/contrib/kvmap/kvmap.dtx +++ b/macros/latex/contrib/kvmap/kvmap.dtx @@ -1,5 +1,5 @@ % \iffalse meta-comment -% This is kvmap, (c) 2019 Ben Frank +% This is kvmap, (c) 2020 Ben Frank % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -15,7 +15,7 @@ \input l3docstrip.tex \askforoverwritefalse \preamble -Copyright (C) 2019 Ben Frank +Copyright (C) 2020 Ben Frank It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of @@ -102,7 +102,7 @@ End of file %<*pkg> %<@@=kvmap> \RequirePackage{expl3} -\ProvidesExplPackage{kvmap}{2019/12/26}{0.3.2}{Drawing karnaugh maps with LaTeX} +\ProvidesExplPackage{kvmap}{2020/03/27}{0.3.3}{Drawing karnaugh maps with LaTeX} %</pkg> % \fi % @@ -212,6 +212,10 @@ End of file % With |color| you may change the color of the border and |reducespace| % allows you to specify whether you want the package to be narrower or wider. % \par +% When using |invert|, the package tries to determine where to invert +% automatically. Sometimes it fails with the guesswork. You can manually +% disable the horizontal inversion part with |hinvert=false| (idem for the +% vertical inversion part with |vinvert=false|).\par % Warning: This package is unable to draw a bundle including all four corners % this way. If you need this specific edge case, please use TikZ to draw it % yourself (see the last example in \autoref{sec:examples}). @@ -447,7 +451,8 @@ End of file % \subsection{Implicant-related code} % \begin{macro}[updated=2018-03-17]{\bundle} % \changes{v0.1.1}{2018/03/17}{Correct dimensions} -% \changes{v0.2.1}{2018/09/20}{Fix inversion} +% \changes{v0.2.1}{2018/09/20}{Fix inversion} +% \changes{v0.3.3}{2020/03/27}{Introduce hinvert and vinvert} % Draw a bundle with given corners. % \begin{arguments} % \item key-value pairs @@ -476,6 +481,18 @@ End of file invert .default:n = true, invert .initial:n = false, % \end{macrocode} +% |vinvert|: perform inversion vertically +% \begin{macrocode} + vinvert .bool_set:N = \l_@@_bundle_vinvert_bool, + vinvert .default:n = true, + vinvert .initial:n = true, +% \end{macrocode} +% |hinvert|: perform inversion horizontally +% \begin{macrocode} + hinvert .bool_set:N = \l_@@_bundle_hinvert_bool, + hinvert .default:n = true, + hinvert .initial:n = true, +% \end{macrocode} % |overlapmargins|: intrude into margin (when inverted) % \begin{macrocode} overlapmargins .dim_set:N = \l_@@_bundle_overlapmargins_dim, @@ -525,6 +542,7 @@ End of file { \int_compare_p:n { \l_@@_matrix_height_int - 1 = \l_@@_bundle_maxy_int } && \int_compare_p:n { 0 = \l_@@_bundle_miny_int } + && \l_@@_bundle_vinvert_bool } { \draw[draw=\l_@@_bundle_color_tl,kvbundle] ~ @@ -569,6 +587,7 @@ End of file { \int_compare_p:n { \l_@@_matrix_width_int - 1 = \l_@@_bundle_maxx_int } && \int_compare_p:n { 0 = \l_@@_bundle_minx_int } + && \l_@@_bundle_hinvert_bool } { \draw[draw=\l_@@_bundle_color_tl,kvbundle] ~ diff --git a/macros/latex/contrib/kvmap/kvmap.ins b/macros/latex/contrib/kvmap/kvmap.ins index 57689e0fce..17c7f53e83 100644 --- a/macros/latex/contrib/kvmap/kvmap.ins +++ b/macros/latex/contrib/kvmap/kvmap.ins @@ -1,7 +1,7 @@ \input l3docstrip.tex \askforoverwritefalse \preamble -Copyright (C) 2019 Ben Frank +Copyright (C) 2020 Ben Frank It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of diff --git a/macros/latex/contrib/kvmap/kvmap.pdf b/macros/latex/contrib/kvmap/kvmap.pdf Binary files differindex 2325b05114..ca8a7b82c4 100644 --- a/macros/latex/contrib/kvmap/kvmap.pdf +++ b/macros/latex/contrib/kvmap/kvmap.pdf diff --git a/macros/latex/contrib/lwarp/README.txt b/macros/latex/contrib/lwarp/README.txt index c268cd3712..1a9232fc82 100644 --- a/macros/latex/contrib/lwarp/README.txt +++ b/macros/latex/contrib/lwarp/README.txt @@ -1,5 +1,5 @@ -LaTeX lwarp package v0.82 README.txt +LaTeX lwarp package v0.83 README.txt Files included are: diff --git a/macros/latex/contrib/lwarp/lwarp.dtx b/macros/latex/contrib/lwarp/lwarp.dtx index a4c164964e..26c58843b5 100644 --- a/macros/latex/contrib/lwarp/lwarp.dtx +++ b/macros/latex/contrib/lwarp/lwarp.dtx @@ -16,7 +16,7 @@ % \iffalse %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<package>\ProvidesPackage{lwarp} -%<package> [2020/03/25 v0.82 Allows LaTeX to directly produce HTML5 output.] +%<package> [2020/03/25 v0.83 Allows LaTeX to directly produce HTML5 output.] % %<*driver> \documentclass{ltxdoc} @@ -2925,7 +2925,7 @@ This boolean may be tested by the user for later use. %<*package> % \fi % -% \CheckSum{43557} +% \CheckSum{43597} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -3050,6 +3050,7 @@ This boolean may be tested by the user for later use. % \changes{v0.80}{2020/02/19}{\ 2020/02/19} % \changes{v0.81}{2020/03/04}{\ 2020/03/04} % \changes{v0.82}{2020/03/25}{\ 2020/03/25} +% \changes{v0.83}{2020/03/27}{\ 2020/03/27} @@ -3272,6 +3273,14 @@ This boolean may be tested by the user for later use. % % \begin{description} % \needspace{2\baselineskip} +% \item[v0.83:] \pkg{memoir} fixes. +% \begin{itemize} +% \item \pkg{memoir}: Various fixes and updates, but subcaption labels +% \margintag{packages} +% still need work. (Out of time\dots) +% \item \pkg{physunits}: Updated to v1.0.4. +% \end{itemize} +% \needspace{2\baselineskip} % \item[v0.82:] \brand{MathJax} notes, \pkg{xpinyin} improvements, various updates. % \begin{itemize} % \item Improved footnotes with \brand{MathJax}. @@ -18605,7 +18614,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.6/MathJax.js?config=TeX- -- Copyright 2016-2020 Brian Dunn -printversion = "v0.82" +printversion = "v0.83" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -49394,7 +49403,7 @@ name = \chemmacros_translate:n {scheme-name} % % % \begin{macrocode} -\RequirePackage{xcolor}% for \convertcolorspec +\AtBeginDocument{\RequirePackage{xcolor}}% for \convertcolorspec \LWR@ProvidesPackagePass{fancyvrb}[2008/02/07] % \end{macrocode} @@ -51613,7 +51622,7 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space % Accept all options for \pkg{lwarp-framed}: % \begin{macrocode} \LWR@ProvidesPackagePass{framed}[2011/10/22] -\RequirePackage{xcolor}% for \convertcolorspec +\AtBeginDocument{\RequirePackage{xcolor}}% for \convertcolorspec % \end{macrocode} @@ -64322,11 +64331,12 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % is emulated for \brand{MathJax}. % % \changes{v0.81}{2020/02/29}{\pkg{physunits}: Added.} +% \changes{v0.83}{2020/03/26}{\pkg{physunits}: Updated to v1.0.4.} % % \codehtml % % \begin{macrocode} -\LWR@ProvidesPackagePass{physunits}[2020/01/26] +\LWR@ProvidesPackagePass{physunits}[2020/03/26] % \end{macrocode} % % \begin{macrocode} @@ -64350,7 +64360,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', \CustomizeMathJax{\newcommand{\J}[1][ ]{\,\mathrm{#1J}}} \CustomizeMathJax{\newcommand{\Joule}[1][ ]{\,\mathrm{#1J}}} \CustomizeMathJax{\newcommand{\erg}{\,\mathrm{erg}}} -\CustomizeMathJax{\newcommand{\kcal}[1]{\,\mathrm{kcal}}}% bug +\CustomizeMathJax{\newcommand{\kcal}{\,\mathrm{kcal}}} \CustomizeMathJax{\newcommand{\Cal}{\,\mathrm{Cal}}} \CustomizeMathJax{\newcommand{\calorie}[1][ ]{\,\mathrm{#1cal}}} \CustomizeMathJax{\newcommand{\BTU}{\,\mathrm{BTU}}} @@ -64396,9 +64406,9 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', \CustomizeMathJax{\newcommand{\ftpss}{\,\mathrm{ft}\,\mathrm{s}^{-2}}} \CustomizeMathJax{\newcommand{\K}[1][ ]{\,\mathrm{#1K}}} \CustomizeMathJax{\newcommand{\Kelvin}[1][ ]{\,\mathrm{#1K}}} -\CustomizeMathJax{\newcommand{\Celcius}{^\circ{\,\mathrm{C}}}}% move space -\CustomizeMathJax{\newcommand{\Rankine}{^\circ{\,\mathrm{R}}}}% move space -\CustomizeMathJax{\newcommand{\Fahrenheit}{^\circ{\,\mathrm{F}}}}% move space +\CustomizeMathJax{\newcommand{\Celcius}{\,^\circ{\mathrm{C}}}} +\CustomizeMathJax{\newcommand{\Rankine}{\,^\circ{\mathrm{R}}}} +\CustomizeMathJax{\newcommand{\Fahrenheit}{\,^\circ{\mathrm{F}}}} \CustomizeMathJax{\newcommand{\rpm}{\,\mathrm{rev}\,\Min^{-1}}} @@ -77206,17 +77216,26 @@ height:\LWR@printlength{\LWR@tempheight}% % version of each, which happens to avoid \pkg{memoir}'s emulation system. % \begin{macrocode} \RequirePackage{lwarp-abstract}% req'd -\RequirePackage{lwarp-array}% req'd +% \RequirePackage{lwarp-array}% no longer req'd \RequirePackage{lwarp-booktabs}% req'd % \RequirePackage{lwarp-ccaption}% emualated below \RequirePackage{lwarp-changepage}% req'd \RequirePackage{lwarp-crop} -\RequirePackage{lwarp-dcolumn}% req'd +% \RequirePackage{lwarp-dcolumn}% no longer req'd \RequirePackage{lwarp-enumerate}% req'd \RequirePackage{lwarp-epigraph}% req'd \RequirePackage{lwarp-fancyvrb}% req'd \RequirePackage{lwarp-footmisc}% req'd +% \end{macrocode} +% +% \changes{v0.83}{2020/03/27}{\pkg{lwarp-patch-memoir}: Fixed \pkg{framed}.} +% \begin{macrocode} +\let\framed\relax \let\endframed\relax +\let\shaded\relax \let\endshaded\relax +\let\leftbar\relax \let\endleftbar\relax +\let\snugshade\relax \let\endsnugshade\relax \RequirePackage{lwarp-framed}% req'd + \RequirePackage{lwarp-hanging}% req'd \RequirePackage{lwarp-makeidx}% req'd \DisemulatePackage{moreverb} @@ -77228,37 +77247,19 @@ height:\LWR@printlength{\LWR@tempheight}% \RequirePackage{lwarp-parskip} \RequirePackage{lwarp-setspace}% req'd \RequirePackage{lwarp-showidx} +\RequirePackage{lwarp-subcaption}% req'd for \subfloat % \end{macrocode} -% Avoids a conflict with \pkg{memoir}: -% \changes{v0.79}{2020/01/06}{\pkg{subcaption}: Fix with \pkg{memoir}.} -% \begin{macrocode} -\AtBeginDocument{% - \@ifpackageloaded{subcaption}{}{ - \RequirePackage{lwarp-subfigure} - \let\subfigure\subbottom - \let\subtable\subtop - }% -}% -% \end{macrocode} -% +% \changes{v0.83}{2020/03/27}{\pkg{lwarp-patch-memoir}: No longer require \pkg{subfigure}.} + % ^^A Not sure why this is here: % \begin{macrocode} \makeindex % \end{macrocode} % -% \pkg{subfigure} is emulated via \pkg{subfig}, which pre-defines -% |subfigure| and |subtable|, but \pkg{memoir} does not, so -% they must be tested for here: +% % \begin{macrocode} -\LetLtxMacro\LWR@memorignewsubfloat\newsubfloat -\RenewDocumentCommand{\newsubfloat}{O{} m}{% - \@ifundefined{c@sub#2}{% - \LWR@memorignewsubfloat[#1]{#2}% - }{}% -} - -\RequirePackage{lwarp-tabularx}% req'd +% \RequirePackage{lwarp-tabularx}% no longer req'd \RequirePackage{lwarp-titling}% req'd % \RequirePackage{lwarp-tocbibind}% not emulated by memoir \RequirePackage{lwarp-tocloft}% req'd @@ -77286,24 +77287,29 @@ height:\LWR@printlength{\LWR@tempheight}% % % \subsection{Page layout} % +% \changes{v0.83}{2020/03/27}{\pkg{lwarp-patch-memoir}: Updated for new sizes.} % \begin{macrocode} \renewcommand*{\stockavi}{} \renewcommand*{\stockav}{} \renewcommand*{\stockaiv}{} \renewcommand*{\stockaiii}{} +\renewcommand*{\stockavii}{} \renewcommand*{\stockbvi}{} \renewcommand*{\stockbv}{} \renewcommand*{\stockbiv}{} \renewcommand*{\stockbiii}{} +\renewcommand*{\stockbvii}{} % \renewcommand*{\stockmetriccrownvo}{}% in docs but not in the package \renewcommand*{\stockmlargecrownvo}{} \renewcommand*{\stockmdemyvo}{} \renewcommand*{\stockmsmallroyalvo}{} \renewcommand*{\pageavi}{} +\renewcommand*{\pageavii}{} \renewcommand*{\pageav}{} \renewcommand*{\pageaiv}{} \renewcommand*{\pageaiii}{} \renewcommand*{\pagebvi}{} +\renewcommand*{\pagebvii}{} \renewcommand*{\pagebv}{} \renewcommand*{\pagebiv}{} \renewcommand*{\pagebiii}{} @@ -77435,7 +77441,13 @@ height:\LWR@printlength{\LWR@tempheight}% \let\DoubleSpacing\doublespacing \renewcommand*{\setPagenoteSpacing}[1]{} \renewcommand*{\setFloatSpacing}[1]{} -\let\SingleSpacing\singlespacing +% \end{macrocode} +% +% \changes{v0.83}{2020/03/27}{\pkg{lwarp-patch-memoir}: Updated.} +% \begin{macrocode} +\renewcommand{\SingleSpacing}{\@ifstar\singlespacing\singlespacing} +% \end{macrocode} +% \begin{macrocode} \let\setSingleSpace\SetSinglespace \let\SingleSpace\singlespace \let\endSingleSpace\endsinglespace @@ -77477,6 +77489,11 @@ height:\LWR@printlength{\LWR@tempheight}% % \newlength{\thanksmarksep}% already provided by memoir % \end{macrocode} + +% \changes{v0.83}{2020/03/27}{\pkg{lwarp-patch-memoir}: Updated.} +% \begin{macrocode} +\renewcommand\titlingpageend[2]{} +% \end{macrocode} % % \subsection{Abstracts} % \begin{macrocode} @@ -78106,8 +78123,11 @@ height:\LWR@printlength{\LWR@tempheight}% \renewcommand{\flegfigure}{\figurename} \renewcommand{\flegtoctable}{} \renewcommand{\flegtocfigure}{} - - +% \end{macrocode} +% +% \cs{subfloat} is from the \pkg{subcaption} package. +% \changes{v0.83}{2020/03/27}{\pkg{lwarp-patch-memoir}: Use \pkg{subcaption} instead of \pkg{subfig}.} +% \begin{macrocode} \renewcommand{\subcaption}[2][]{% \ifblank{#1}{\subfloat[#2]{}}{\subfloat[#1][#2]{}}% } @@ -78419,7 +78439,8 @@ height:\LWR@printlength{\LWR@tempheight}% \LWR@new@label{LWRindex-\arabic{LWR@autoindex}}% % \ifshowindexmark\@showidx{#1}\fi \protected@write\@auxout{}% - {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}% +% {\string\@@wrindexm@m{\@idxfile}{#1}{\thepage}}% + {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}% \endgroup \@esphack}% % \end{macrocode} @@ -78436,16 +78457,34 @@ height:\LWR@printlength{\LWR@tempheight}% \LWR@new@label{LWRindex-\arabic{LWR@autoindex}}% % \ifshowindexmark\@showidx{#1}\fi \protected@write\@auxout{}% - {% -% \string\@@wrindexm@m{\@idxfile}{#1}{\@nameuse{the\@sptheidx}}% - \string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}% - }% +% {\string\@@wrindexm@m{\@idxfile}{#1}{\@nameuse{the\@sptheidx}}}% + {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}% \endgroup \@esphack}% }% \AtBeginDocument % \end{macrocode} + +% Patched to append |_html| to the file: +% \changes{v0.83}{2020/03/26}{\pkg{lwarp-patch-memoir}: Fixed: \cs{specialindex}.} +% \begin{macrocode} +\renewcommand{\@spindex}[2]{% + \@ifundefined{#1@idxfile}% + {\ifreportnoidxfile + \@memwarn{Undefined index file #1}% + \fi + \begingroup + \@sanitize + \@nowrindex}% + {\def\@idxfile{#1_html}% + \def\@sptheidx{#2}% + \begingroup + \@sanitize + \@wrspindex}} +% \end{macrocode} + + % Patched to use |_html| filename and \cs{BaseJobname}: % \changes{v0.58}{2018/06/22}{\pkg{lwarp-patch-memoir}: Fix for multiple indexes.} % \begin{macrocode} @@ -78618,17 +78657,21 @@ height:\LWR@printlength{\LWR@tempheight}% \RenewDocumentCommand{\subbottom}{O{} O{} m}{% \subfloat[#1][#2]{#3}% } - +% \end{macrocode} +% +% \changes{v0.83}{2020/03/27}{\pkg{lwarp-patch-memoir}: Fixed: \cs{contsubtop}, \cs{contsubbottom}.} +% \begin{macrocode} \renewcommand{\contsubtop}{% - \ContinuedFloat\addtocounter{\@captype}{1}% + \ContinuedFloat \subtop% } \renewcommand{\contsubbottom}{% - \ContinuedFloat\addtocounter{\@captype}{1}% + \ContinuedFloat \subbottom% } - +% \end{macrocode} +% \begin{macrocode} \renewcommand{\subconcluded}{} \let\contsubtable\contsubtop diff --git a/macros/latex/contrib/lwarp/lwarp.pdf b/macros/latex/contrib/lwarp/lwarp.pdf Binary files differindex 0256496dc7..18cd82265d 100644 --- a/macros/latex/contrib/lwarp/lwarp.pdf +++ b/macros/latex/contrib/lwarp/lwarp.pdf diff --git a/macros/latex/contrib/lwarp/lwarpmk.lua b/macros/latex/contrib/lwarp/lwarpmk.lua index 2ace342c56..dcf139cf61 100755 --- a/macros/latex/contrib/lwarp/lwarpmk.lua +++ b/macros/latex/contrib/lwarp/lwarpmk.lua @@ -2,7 +2,7 @@ -- Copyright 2016-2020 Brian Dunn -printversion = "v0.82" +printversion = "v0.83" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () |