summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-10-09 03:01:25 +0000
committerNorbert Preining <norbert@preining.info>2019-10-09 03:01:25 +0000
commit8d5625f5e48587e6ca4304739304ed11b17cb26c (patch)
treef2c8b0e5f20681e9a35e6c3d33d2ec6a81d05e22 /macros
parente5ffc42ed260285f76383ae18dd0f4a603c07fa8 (diff)
CTAN sync 201910090301
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/apxproof/Makefile20
-rw-r--r--macros/latex/contrib/apxproof/README.md2
-rw-r--r--macros/latex/contrib/apxproof/apxproof.dtx268
-rw-r--r--macros/latex/contrib/apxproof/apxproof.ins4
-rw-r--r--macros/latex/contrib/apxproof/apxproof.pdfbin559200 -> 561064 bytes
-rw-r--r--macros/latex/contrib/booktabs/README6
-rw-r--r--macros/latex/contrib/booktabs/booktabs.dtx20
-rw-r--r--macros/latex/contrib/booktabs/booktabs.ins6
-rw-r--r--macros/latex/contrib/booktabs/booktabs.pdfbin295150 -> 296459 bytes
-rw-r--r--macros/latex/contrib/fei/fei-template-sublist.tex5
-rw-r--r--macros/latex/contrib/fei/fei-template.tex14
-rw-r--r--macros/latex/contrib/fei/fei.dtx48
-rw-r--r--macros/latex/contrib/fei/fei.pdfbin437718 -> 439956 bytes
-rw-r--r--macros/latex/contrib/fei/referencias.bib15
-rw-r--r--macros/latex/contrib/lwarp/README.txt2
-rw-r--r--macros/latex/contrib/lwarp/lwarp.dtx177
-rw-r--r--macros/latex/contrib/lwarp/lwarp.pdfbin2488031 -> 2486196 bytes
-rwxr-xr-xmacros/latex/contrib/lwarp/lwarpmk.lua2
18 files changed, 385 insertions, 204 deletions
diff --git a/macros/latex/contrib/apxproof/Makefile b/macros/latex/contrib/apxproof/Makefile
deleted file mode 100644
index d24336a7d7..0000000000
--- a/macros/latex/contrib/apxproof/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-all: apxproof.pdf apxproof.sty
-
-clean:
- -rm -f *.aux *.log *.gl? *.idx *.ilg *.fls *.ind *.axp *.bbl *.blg *.hd *.out
-
-ctan:
- git archive --format zip master --prefix=apxproof/ --output apxproof.zip
-
-%.pdf: %.dtx %.sty
- pdflatex $<
- makeindex -s gind.ist $(patsubst %.pdf,%.idx,$@)
- makeindex -s gglo.ist -o $(patsubst %.pdf,%.gls,$@) $(patsubst %.pdf,%.glo,$@)
- bibtex $(patsubst %.pdf,%,$@)
- bibtex bu1
- pdflatex $<
- pdflatex $<
-
-%.sty: %.ins %.dtx
- -rm $@
- latex $<
diff --git a/macros/latex/contrib/apxproof/README.md b/macros/latex/contrib/apxproof/README.md
index 512574166a..d8cef5cda4 100644
--- a/macros/latex/contrib/apxproof/README.md
+++ b/macros/latex/contrib/apxproof/README.md
@@ -20,12 +20,12 @@ In addition to a working installation of LaTeX2e, `apxproof` relies on a
few other packages, which should be provided by all reasonable LaTeX
distributions:
- `amsthm`
- - `bibunits`
- `environ`
- `etoolbox`
- `fancyvrb`
- `ifthen`
- `kvoptions`
+ - `bibunits` (optional, only if the `bibliography` option is set to `separate`)
## Manual installation
diff --git a/macros/latex/contrib/apxproof/apxproof.dtx b/macros/latex/contrib/apxproof/apxproof.dtx
index 25de2a7dcb..2385984fd8 100644
--- a/macros/latex/contrib/apxproof/apxproof.dtx
+++ b/macros/latex/contrib/apxproof/apxproof.dtx
@@ -24,7 +24,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<package>\ProvidesPackage{apxproof}
-%<package> [2019/01/28 v1.1.1 Automatic proofs in appendix]
+%<package> [2019/10/08 v1.2.0 Automatic proofs in appendix]
%
%<*driver>
\documentclass{ltxdoc}
@@ -45,7 +45,7 @@
%</driver>
% \fi
%
-% \CheckSum{729}
+% \CheckSum{787}
%
% \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
@@ -200,7 +200,7 @@ This proof is in the appendix.
% \item \meta{name} (e.g., |theorem|) is the name of an environment that is created for this kind of
% theorem;
% \item \meta{counter} (e.g., |definition|) is an optional counter describing
-% from which kind of environment should the numbering of these environments be
+% from which kind of environment the numbering of these environments should be
% inherited;
% \item \meta{title}
% (e.g., |Theorem|) is
@@ -350,7 +350,7 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% \item[|append|] This is the default.
% Appendix material gathered by \textsf{apxproof} is appended to
% the main text.
-% \item[|inline|] In this mode, \textsf{apxproof} simply inline the
+% \item[|inline|] In this mode, \textsf{apxproof} simply inlines the
% content along with the main text.
% \item[|strip|] This mode functions similarly to |append| except that
% the appendix is not appended at the end of the document. All appendix
@@ -362,6 +362,10 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% \textsf{apxproof} provides a few macros that can be redefined (using
% |\renewcommand|) to customize the appearance of the appendix:
% \begin{description}
+% \item[\textbackslash|mainbodyrepeatedtheorem|]\DescribeMacro{\mainbodyrepeatedtheorem}
+% is a macro that is executed at the beginning of the body of every
+% repeated theorem. This can be used to notify the reader that the
+% theorem is repeated in appendix in some way, e.g., with a margin note.
% \item[\textbackslash|appendixsectionformat|\marg{number}\marg{title}]\DescribeMacro{\appendixsectionformat} is a macro
% that indicates how to format the section titles in the Appendix, given
% the number and title of the section in the main text. By
@@ -387,7 +391,7 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% Another customization capability concerns \emph{numbered equations} that are present
% within repeated theorems. An optional |repeqn| option can be specified
% when loading the package, which controls whether
-% equation numbers should be as in the same text (by setting this option
+% equation numbers should be as in the main text (by setting this option
% to |same|, the default) or independently
% numbered (by setting this option to |independent|). In the latter case,
% whenever a referenceable counter is set with |\label{|\meta{counter}|}|,
@@ -396,8 +400,8 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% (except in |inline| mode, where both have the same effect).
%
% \subsection{Advanced Features}
-% We now describe a few advanced macros and environments, whose usage is limited to
-% special cases:
+% We now describe a few advanced macros and environments, the usage of
+% which is limited to special cases:
% \begin{description}
% \item[|nestedproof|]\DescribeEnv{nestedproof} is an environment that
% can be used within a |proof| environment deferred in the appendix; this
@@ -405,7 +409,7 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% be nested within a deferred |proof| environment.
% \item[\textbackslash|noproofinappendix|]\DescribeMacro{\noproofinappendix}
% can be used inside repeated theorems that are not followed by a
-% |proof| or |appendixproof| theorem; the point is to ensure that a further
+% |proof| or |appendixproof| environment; the point is to ensure that a further
% |proof| environment cannot be mistakenly understood as a proof of the repeated
% theorem. It should not be needed in most situations as
% \textsf{apxproof} tries figuring out when a proof follows a repeated
@@ -452,6 +456,11 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% which source line has produced which box does not work for appendix
% content managed by \textsf{apxproof} or repeated theorems. No obvious
% fix is known, though this issue will be investigated in the long term.
+% \item Unless the |bibliography| option is set to |common|, the
+% \textsf{bibunits} package
+% is used to generate a second bibliography. This means any package, such
+% as \textsf{biblatex}, that is incompatible with \textsf{bibunits} will not be
+% compatible with \textsf{apxproof} unless |bibliography| is set to |common|.
% \end{itemize}
%
% Issues not listed here should be reported to the author.
@@ -493,11 +502,6 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% \subsection{Dependencies}
% We first load a few package dependencies:
% \begin{itemize}
-% \item \textsf{bibunits} to add a second bibliography for the appendix
-% material.
-% \begin{macrocode}
-\RequirePackage{bibunits}
-% \end{macrocode}
% \item \textsf{environ} to easily define the repeated theorem
% environments.
% \begin{macrocode}
@@ -602,6 +606,13 @@ This is a citation in the appendix~\cite{proofsAreHard}.
package apxproof}
}}}
\ifthenelse{\equal{\axp@bibliography}{separate}}{
+% \end{macrocode}
+% The external \textsf{bibunits} package
+% is used to add a second bibliography for the appendix material.
+% \changes{v1.2.0}{2019/04/17}{Do not load \textsf{binunits} if
+% \texttt{bibliography} is set to \texttt{common}}
+% \begin{macrocode}
+ \RequirePackage{bibunits}
\message{apxproof: Separate bibliography for appendix material}
}{\ifthenelse{\equal{\axp@bibliography}{common}}{
\message{apxproof: Common bibliography for appendix and main text}
@@ -619,6 +630,34 @@ This is a citation in the appendix~\cite{proofsAreHard}.
}}
% \end{macrocode}
% \subsection{Macros Common to All Compilation Modes}
+% \begin{macro}{\axp@newtheoremrep@definetheorem}
+% \changes{v1.2.0}{2019/10/01}{Restore predefined theorem counters}
+% Common to all compilation modes, we define
+% |\axp@newtheoremrep@definetheorem|.
+% When called with first argument |foobar|, we first undefine the existing
+% |foobar| environment (and its counter) if it has already been defined (e.g., by the
+% document class), then invoke |\axp@newtheorem| for the regular version
+% of the theorem |foobar|, saving and restoring any existing theorem counter unless the
+% |\newtheoremdep| redefines the base counter.
+% \begin{macrocode}
+\def\axp@newtheoremrep@definetheorem#1#2#3#4{%
+ \expandafter\let\csname #1\endcsname\undefined
+ \ifcsname c@#1\endcsname
+ \expandafter\expandafter\expandafter\let\expandafter\expandafter
+ \csname c@axp@#1\endcsname\csname c@#1\endcsname
+ \expandafter\let\csname c@#1\endcsname\undefined
+ \fi
+ \axp@newtheorem{#1}{#2}{#3}{#4}%
+ \ifcsname c@axp@#1\endcsname
+ \ifx\relax#2\relax
+ \expandafter\expandafter\expandafter\let\expandafter\expandafter
+ \csname c@#1\endcsname\csname c@axp@#1\endcsname
+ \else
+ \fi
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\axp@newtheorem}
% \changes{v1.0.6}{2018/05/10}{Introduce intermediary command for theorem
% macro}
@@ -630,6 +669,7 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% definition depending on the document class. This command uses two
% intermediary commands, |\@axp@newtheorem| and |\@@axp@newtheorem|, for
% the non-starred and starred versions.
+% \begin{macrocode}
\def\axp@newtheorem{\@ifstar\@@axp@newtheorem\@axp@newtheorem}
\def\@axp@newtheorem#1#2#3#4{%
\ifx\relax#4\relax
@@ -641,6 +681,7 @@ This is a citation in the appendix~\cite{proofsAreHard}.
\def\@@axp@newtheorem#1#2{%
\newtheorem*{#1}{#2}%
}
+% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
@@ -669,20 +710,8 @@ This is a citation in the appendix~\cite{proofsAreHard}.
\newenvironment{proofsketch}{\begin{axp@oldproof}[Proof sketch]}{\end{axp@oldproof}}
% \end{macrocode}
% \end{environment}
-% \begin{macro}{\thmhead}
-% \changes{v1.0.2}{2016/12/13}{Fix display of repeated theorem counter in
-% some document classes}
-% We redefine AMS-\LaTeX{}'s |\thmhead| to use a format where the
-% repeated version of a theorem, using a theorem note, can look exactly
-% like the original version of the theorem and its theorem counter.
-% \begin{macrocode}
-\AtBeginDocument{%
- \def\thmhead#1#2#3{%
- \thmname{#1}\thmnumber{\@ifnotempty{#1}{ }\@upn{#2}}%
- \thmnote{ #3}}%
-}
-% \end{macrocode}
-% \end{macro}
+% \begin{macro}{\mainbodyrepeatedtheorem}
+% \changes{v1.2.0}{2019/09/21}{Configurable repeated theorem command}
% \begin{macro}{\appendixrefname}
% \begin{macro}{\appendixbibliographystyle}
% \begin{macro}{\appendixbibliographyprelim}
@@ -691,10 +720,11 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% \begin{macro}{\appendixsectionformat}
% \changes{v1.1.0}{2018/07/17}{Fix missing space in default
% \cs{appendixsectionformat}}
-% We provide sensible defaults for these four user-customizable macros.
-% Even though they are only useful in append mode, we define them for
+% We provide sensible defaults for these user-customizable macros.
+% Even though they are not all useful in all modes, we define them for
% all modes so that a |\renewcommand| works in all cases.
% \begin{macrocode}
+\newcommand{\mainbodyrepeatedtheorem}{}
\newcommand{\appendixrefname}{References for the Appendix}
\newcommand{\appendixbibliographystyle}{alpha}
\newcommand{\appendixbibliographyprelim}{}
@@ -706,6 +736,7 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
% \begin{environment}{axp@oldproof}
% We save the definition of the existing |proof| environment.
% \begin{macrocode}
@@ -721,10 +752,13 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% \changes{v1.1.0}{2018/07/04}{Fix \cs{label} not being disabled
% in \textsf{amsmath} environments, where \cs{label@in@display} is
% used instead (K. D. Bauer)}
+% \changes{v1.2.0}{2019/02/15}{Fix extra spacing erroneously
+% introduced within the \texttt{\textbackslash axp@redefinelabels}
+% macro}
% \begin{macrocode}
\newcommand{\axp@redefinelabels}{%
- \providecommand\label@in@display{}
- \ifthenelse{\equal{\axp@appendix}{inline}}{
+ \providecommand\label@in@display{}%
+ \ifthenelse{\equal{\axp@appendix}{inline}}{%
\let\axp@oldlabel\label
\let\axp@oldlabel@in@display\label@in@display
\renewcommand\label[1]{%
@@ -745,7 +779,7 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% \end{macrocode}
% \end{macro}
% \subsubsection{Class-Specific Behavior}
-% Finally, some class-specific behavior common to all compilation modes
+% Finally, some class-specific behavior common to all compilation modes.
% \paragraph{\textsf{llncs} and other Springer document classes}
% \changes{v1.0.6}{2018/05/10}{Better support of Springer document
% classes}
@@ -774,20 +808,19 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \begin{macro}{proofsketch}
+% \changes{v1.2.0}{2019/02/15}{Fix proof sketches in inline
+% compilation mode for Springer document classes}
+% We redefine the |proofsketch| environment, which is used
+% differently in the base class.
+% \begin{macrocode}
+\renewenvironment{proofsketch}{\begin{axp@oldproof}[sketch]}{\end{axp@oldproof}}
+% \end{macrocode}
+% \end{macro}
% We have to redefine the macro |\@thmcountersep| for proper sectioned
% counters.
% \begin{macrocode}
\def\@thmcountersep{.}
-% \end{macrocode}
-% We remove the parentheses added by default for theorem notes, which are
-% not compatible with the use of theorem notes by \textsf{apxproof}.
-% \begin{macrocode}
-\def\@Opargbegintheorem#1#2#3#4{#4\trivlist
- \item[\hskip\labelsep{#3#1}]{#3 #2\@thmcounterend\ }}
-\def\@spopargbegintheorem#1#2#3#4#5{\trivlist
- \item[\hskip\labelsep{#4#1\ #2}]{#4 #3\@thmcounterend\ }#5}
-% \end{macrocode}
-% \begin{macrocode}
\fi
% \end{macrocode}
% \subsection{Inline Compilation Mode}
@@ -795,19 +828,23 @@ This is a citation in the appendix~\cite{proofsAreHard}.
\ifthenelse{\equal{\axp@appendix}{inline}}{
% \end{macrocode}
% \begin{macro}{\axp@newtheoremrep}
-% In inline mode, |\axp@newtheoremrep| undefines the existing
-% theorem environment if it has already been defined (e.g., by the
-% document class), invokes |\newtheorem| and creates a repeated theorem
+% In inline mode, |\axp@newtheoremrep| uses
+% |\axp@newtheoremrep@definetheorem| to define the regular theorem
+% environment and creates a repeated theorem
% environment that behaves exactly as the regular theorem environment,
% while calling |\axp@redefinelabels| to make sure that |-axp| variants
% of equation counters are defined.
+% \changes{v1.2.0}{2019/02/15}{Fix formatting of theorems without
+% notes in some document classes in inline mode}
% \begin{macrocode}
\def\axp@newtheoremrep#1[#2]#3[#4]{%
- \expandafter\let\csname #1\endcsname\undefined
- \expandafter\let\csname c@#1\endcsname\undefined
- \axp@newtheorem{#1}{#2}{#3}{#4}%
+ \axp@newtheoremrep@definetheorem{#1}{#2}{#3}{#4}%
\NewEnviron{#1rep}[1][]{%
- \begin{#1}[##1]\axp@redefinelabels\BODY\end{#1}%
+ \ifx\relax##1\relax
+ \begin{#1}\axp@redefinelabels\BODY\end{#1}%
+ \else
+ \begin{#1}[##1]\axp@redefinelabels\BODY\end{#1}%
+ \fi
}
}
% \end{macrocode}
@@ -883,7 +920,7 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% \end{macro}
% \end{environment}
% \begin{macro}{\axp@unactivateeightbit}
-% \changes{v1.1.0-dev}{2019/01/28}{Fix compilation of non-ASCII
+% \changes{v1.1.0}{2019/01/28}{Fix compilation of non-ASCII
% characters with \texttt{\textbackslash usepackage[utf8]\{inputenc\}}}
% We need an auxiliary macro to disable active characters that have the
% high bit set when writing to the |.axp| file. See
@@ -901,7 +938,7 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% \begin{environment}{axp@VerbatimOut}
% \begin{macro}{\FVB@axp@VerbatimOut}
% \begin{macro}{\FVE@axp@VerbatimOut}
-% \changes{v1.1.0-dev}{2018/10/02}{Make \textsf{apxproof} compatible with
+% \changes{v1.1.0}{2018/10/02}{Make \textsf{apxproof} compatible with
% independent use of \textsf{fancyvrb}}
% Using the functionalities of the \textsf{fancyvrb} package, we define a
% custom verbatim environment |axp@VerbatimOut| that writes every line
@@ -959,24 +996,22 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% \end{macro}
% \end{macro}
% \begin{macro}{axp@newtheoremrep}
-% When called with first argument |foobar|, we first undefine the existing
-% |foobar| environment (and its counter) if it has already been defined (e.g., by the
-% document class), then invoke |\newtheorem| for the regular version
-% of the theorem |foobar| (patching the |\begin{foobar}| so as not to
-% expect a proof in the appendix) and |\newtheorem*| for an internal version |axp@foobarrp| that
+% With first argument |foobar|, we use
+% |\axp@newtheoremrep@definetheorem| to define the regular version of the
+% theorem |foobar|. We then patch |\begin{foobar}| so as not to
+% expect a proof in the appendix and define an internal theorem |axp@foobarrp| that
% will be used in the appendix to restate the existing theorem.
% \begin{macrocode}
\def\axp@newtheoremrep#1[#2]#3[#4]{%
- \expandafter\let\csname #1\endcsname\undefined
- \expandafter\let\csname c@#1\endcsname\undefined
- \axp@newtheorem{#1}{#2}{#3}{#4}%
+ \axp@newtheoremrep@definetheorem{#1}{#2}{#3}{#4}%
\expandafter\pretocmd\csname #1\endcsname{\noproofinappendix}{}{}%
\axp@newtheorem*{axp@#1rp}{#3}%
\axp@forward@setup{#1}{#2}{#3}{#4}%
% \end{macrocode}
% We then define a |foobarrep| environment that increments the
% |axp@rpcounter| and typeset the regular |foobar| theorem with a label
-% derived from the counter. We distinguish the case when the theorem
+% derived from the counter, along with a possible custom command to
+% identify repeated theorems. We distinguish the case when the theorem
% argument has a note and when it does not.
% \changes{v1.0.6}{2018/05/10}{Better handling of note-free theorems in
% document classes that treat theorems differently when they have an
@@ -991,10 +1026,12 @@ This is a citation in the appendix~\cite{proofsAreHard}.
}{}%
\addtocounter{axp@rpcounter}{1}%
\ifx\relax##1\relax
- \axp@with@forward{#1}{\begin{#1}}\label{axp@r\roman{axp@rpcounter}}\BODY\end{#1}%
+ \axp@with@forward{#1}{\begin{#1}}\label{axp@r\roman{axp@rpcounter}}%
\else
- \axp@with@forward{#1}{\begin{#1}[##1]}\label{axp@r\roman{axp@rpcounter}}\BODY\end{#1}%
- \fi
+ \axp@with@forward{#1}{\begin{#1}[##1]}\label{axp@r\roman{axp@rpcounter}}%
+ \fi
+ \mainbodyrepeatedtheorem
+ \BODY\end{#1}%
% \end{macrocode}
% We set the |axp@seenreptheorem| toggle to indicate that we are looking
% for the proof of the theorem, then store in a macro the content of the
@@ -1009,11 +1046,23 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% repeated version of the theorem using the |axp@foobarrp| environment
% and a reference to the previously defined label.
% We use |\axp@redefinelabels| in this environment to avoid multiply
-% defined labels.
+% defined labels. We have to deal in a careful way with theorem notes: we
+% want to use a theorem note to display the number of the repeated
+% theorem, but theorem notes are usually typeset in a much
+% different way (different font, parentheses) than theorem
+% headings. In the case of the Springer document
+% classes, we use the |\theopargself| macro to disable parentheses. For
+% other document classes, we need to manually patch the |\thmhead|
+% command at the right time. We also specially cover the case of
+% the ACM document class where |\@acmplainnotefont| is used instead
+% of |\thm@notefont|.
% \changes{v1.0.2}{2016/12/13}{Fix missing space between repeated theorem
% counter and theorem note}
+% \changes{v1.0.2}{2016/12/13}{Fix display of repeated theorem counter in
+% some document classes}
% \changes{v1.0.6}{2018/05/10}{Fix incorrect use of \texttt{\textbackslash noexpand}
% in optional argument of macro environment}
+% \changes{v1.2.0}{2019/10/07}{Fix display of theorem notes}
% \begin{macrocode}
\axp@writesection%
\ifthenelse{\equal{\axp@repeqn}{same}}{%
@@ -1022,16 +1071,40 @@ This is a citation in the appendix~\cite{proofsAreHard}.
\noexpand\setcounter{equation}{\theaxp@equation}%
}%
}{}%
- \immediate\write\axp@proofsfile{%
+ \immediate\write\axp@proofsfile{{%
+ \ifdefined\theopargself
+ \noexpand\theopargself
+ \else
+ \noexpand\pretocmd{\noexpand\@begintheorem}{%
+ \noexpand\patchcmd{\noexpand\thmhead}{\noexpand\@acmplainnotefont}{}{}{}%
+ \noexpand\patchcmd{\noexpand\thmhead}{\noexpand\the\noexpand\thm@notefont}{}{}{}%
+ \noexpand\patchcmd{\noexpand\thmhead}{(}{}{}{}%
+ \noexpand\patchcmd{\noexpand\thmhead}{)}{}{}{}%
+ }{}{}
+ \fi
\noexpand\begin{axp@#1rp}
- [\noexpand\ref{axp@r\roman{axp@rpcounter}}%
- \@ifnotempty{##1}{ \unexpanded{##1}}]%
+ [%
+ \noexpand\ref{axp@r\roman{axp@rpcounter}}%
+ \@ifnotempty{##1}{%
+ \ifdefined\theopargself
+ \else
+ \ifdefined\@acmplainnotefont
+ \noexpand\@acmplainnotefont
+ \else
+ \noexpand\ifdefined\noexpand\thm@notefont
+ \noexpand\the\noexpand\thm@notefont
+ \noexpand\fi
+ \fi
+ \fi
+ {} (\unexpanded{##1})%
+ }%
+ ]%
\noexpand\axp@forward@target{axp@fw@r\roman{axp@rpcounter}}{}%
\noexpand\axp@redefinelabels
\expandafter\noexpand\csname rplet\roman{axp@rpcounter}%
\endcsname
\noexpand\end{axp@#1rp}
- }%
+ }}%
\ifthenelse{\equal{\axp@repeqn}{same}}{%
\immediate\write\axp@proofsfile{%
\noexpand\setcounter{equation}{\value{axp@equationx}}%
@@ -1350,15 +1423,18 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% \end{macrocode}
% \begin{macro}{\axp@oldbibliography}
% \begin{macro}{\bibliography}
-% Thanks to \textsf{bibunits}'s |\defaultbibliography| macro, we set the appendix
-% bibliography source to be the same as that of the main text.
-% \begin{macrocode}
- \let\axp@oldbibliography\bibliography
- \renewcommand\bibliography[1]{%
- \defaultbibliography{#1}%
- \axp@oldbibliography{#1}%
- }
-% \end{macrocode}
+% Unless the |bibliography| option is set to |common|, we need to set the
+% appendix bibliography source to be the same as that of the main
+% text, thanks to \textsf{bibunits}'s |\defaultbibliography| macro.
+% \begin{macrocode}
+ \ifthenelse{\equal{\axp@bibliography}{separate}}{
+ \let\axp@oldbibliography\bibliography
+ \renewcommand\bibliography[1]{%
+ \defaultbibliography{#1}%
+ \axp@oldbibliography{#1}%
+ }
+ }{}
+% \end{macrocode}
% \end{macro}
% \end{macro}
% After the end of the main text, we add the appendix (after the command
@@ -1445,30 +1521,8 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% \begin{macrocode}
\fi
% \end{macrocode}
-% \paragraph{ACM Document Classes (new version)}
% \changes{v1.0.6}{2018/05/10}{Support of new ACM document class
% (\texttt{acmart.cls})}
-% Again, we adjust the styling of theorems for the needs of \textsf{apxproof}.
-% \begin{macrocode}
- \@ifclassloaded{acmart}{
-% \end{macrocode}
-% \begin{macrocode}
- \newtheoremstyle{mystyle}
- {.5\baselineskip\@plus.2\baselineskip
- \@minus.2\baselineskip}
- {.5\baselineskip\@plus.2\baselineskip
- \@minus.2\baselineskip}
- {\@acmplainbodyfont}
- {\@acmplainindent}
- {\@acmplainheadfont}
- {.}
- {.5em}
- {\thmname{#1}\thmnumber{ #2}\thmnote{ {\@acmplainheadfont #3}}}
- \theoremstyle{mystyle}
-% \end{macrocode}
-% \begin{macrocode}
- }{}
-% \end{macrocode}
% \paragraph{\textsf{lipcs}}
% \begin{macrocode}
\ifdefined\lipics@opterrshort
@@ -1487,22 +1541,6 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% \end{macro}
% \begin{macrocode}
\fi
-% \end{macrocode}
-% \paragraph{\textsf{llncs}}
-% \begin{macrocode}
- \@ifclassloaded{llncs}{
-% \end{macrocode}
-% \begin{macro}{proofsketch}
-% We redefine the |proofsketch| environment, which is used
-% differently in the base class.
-% \begin{macrocode}
- \renewenvironment{proofsketch}{\begin{axp@oldproof}[sketch]}{\end{axp@oldproof}}
-% \end{macrocode}
-% \end{macro}
-% \begin{macrocode}
- }{}
-% \end{macrocode}
-% \begin{macrocode}
}
% \end{macrocode}
% \Finale
diff --git a/macros/latex/contrib/apxproof/apxproof.ins b/macros/latex/contrib/apxproof/apxproof.ins
index 77e0ce981b..23cc7248a0 100644
--- a/macros/latex/contrib/apxproof/apxproof.ins
+++ b/macros/latex/contrib/apxproof/apxproof.ins
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2016-2017 by Pierre Senellart
+%% Copyright (C) 2016-2019 by Pierre Senellart
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -26,7 +26,7 @@
\preamble
-Copyright (C) 2016-2017 by Pierre Senellart
+Copyright (C) 2016-2019 by Pierre Senellart
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/apxproof/apxproof.pdf b/macros/latex/contrib/apxproof/apxproof.pdf
index 0a0de8d3ee..6ae1a640f6 100644
--- a/macros/latex/contrib/apxproof/apxproof.pdf
+++ b/macros/latex/contrib/apxproof/apxproof.pdf
Binary files differ
diff --git a/macros/latex/contrib/booktabs/README b/macros/latex/contrib/booktabs/README
index fb43faf3ac..94a47a0d47 100644
--- a/macros/latex/contrib/booktabs/README
+++ b/macros/latex/contrib/booktabs/README
@@ -13,7 +13,7 @@ This package provide some additional commands to enhance
the quality of tables in LaTeX. Guidelines are given as
to what constitutes a good table in this context.
-Copyright: (C) 1995--2016 Simon Fear
+Copyright: (C) 1995--2019 Simon Fear
Licence: GPL
FILES IN DISTRIBUTION
@@ -21,10 +21,12 @@ FILES IN DISTRIBUTION
BASE DISTRIBUTION:
- README This file.
+ README.md This file.
booktabs.ins Package installation file.
booktabs.dtx Package source file.
+ STYLE FILE
+
booktabs.sty Package style file. It was produced by
executing "latex booktabs.ins".
diff --git a/macros/latex/contrib/booktabs/booktabs.dtx b/macros/latex/contrib/booktabs/booktabs.dtx
index e599a2d7c9..de915565e7 100644
--- a/macros/latex/contrib/booktabs/booktabs.dtx
+++ b/macros/latex/contrib/booktabs/booktabs.dtx
@@ -1,8 +1,8 @@
% \iffalse (meta-comment)
% -----------------------------------------------------------------
% booktabs.dtx
-% Copyright (C) 1995--2016 Simon Fear
-% Maintained by Danie Els <dnjels@sun.ac.za>
+% Copyright (C) 1995--2019 Simon Fear
+% Maintained by Danie Els <dnjels@gmail.com>
%
% This file is part of the booktabs package for publication
% quality tables for LaTeX
@@ -27,12 +27,12 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{booktabs}
%<*package>
- [2016/04/27 v1.618033 publication quality tables]
+ [2019/10/08 v1.6180339 publication quality tables]
%</package>
%
%<*driver>
\documentclass{ltxdoc}
- \usepackage{booktabs}[2016/04/27]
+ \usepackage{booktabs}[2019/10/08]
\EnableCrossrefs
\CodelineIndex
\RecordChanges
@@ -48,7 +48,7 @@
%</driver>
% \fi
%
-% \CheckSum{489}
+% \CheckSum{497}
% \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
% Lower-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
@@ -91,7 +91,7 @@
% Releases (Versions 1.618, 1.6180, 1.61803 and 1.618033) are
% only bug patches, support for the =colortbl= package and better
% compatability with =longtable=.\footnote{By Danie Els
-% (\texttt{dnjels@sun.ac.za}) in the absence of the author.}
+% (\texttt{dnjels@gmail.com}) in the absence of the author.}
% \end{abstract}
%
% \bigskip
@@ -746,6 +746,7 @@
% \begin{macro}{\@BTrule}
% All the rules (except =\addlinespace=) share this code.
% \changes{v1.618033}{2016/04/27}{Rearranged and added \cmd{\nobreak} within longtable (Morten H{\o}gholm)}
+% \changes{v1.6180339}{2019/10/08}{Add test for xltabular (Herbert Voss)}
% \begin{macrocode}
\def\@BTrule[#1]{%
% \end{macrocode}
@@ -771,8 +772,11 @@
\nobreak
\let\@BTswitch\@BLTrule
\else
- \let\@BTswitch\@BTnormal
- \fi\fi
+ \ifx\xltabular\undefined
+ \let\@BTswitch\@BTnormal
+ \else
+ \let\@BTswitch\@BLTrule
+ \fi\fi\fi
% \end{macrocode}
% Call =\@BTswitch= at end of macro
% \begin{macrocode}
diff --git a/macros/latex/contrib/booktabs/booktabs.ins b/macros/latex/contrib/booktabs/booktabs.ins
index deac64347b..e1bd227c15 100644
--- a/macros/latex/contrib/booktabs/booktabs.ins
+++ b/macros/latex/contrib/booktabs/booktabs.ins
@@ -5,7 +5,7 @@
%% TeX.
%% --------------------------------------------------------------------
%%
-%% Copyright (C) 1995--2016 Simon Fear
+%% Copyright (C) 1995--2019 Simon Fear
%% Maintained by Danie Els <dnjels@sun.ac.za>
%%
%% This file is part of the booktabs package for publication quality
@@ -26,11 +26,11 @@
\input docstrip.tex
\keepsilent
-\usedir{tex/latex/skeleton}
+\usedir{tex/latex/booktabs}
\preamble
-Copyright (C) 1995--2016 Simon Fear
+Copyright (C) 1995--2019 Simon Fear
Maintained by Danie Els <dnjels@sun.ac.za>
This file may be distributed and/or modified under the conditions of the
diff --git a/macros/latex/contrib/booktabs/booktabs.pdf b/macros/latex/contrib/booktabs/booktabs.pdf
index 0628380fff..ab17c10ee9 100644
--- a/macros/latex/contrib/booktabs/booktabs.pdf
+++ b/macros/latex/contrib/booktabs/booktabs.pdf
Binary files differ
diff --git a/macros/latex/contrib/fei/fei-template-sublist.tex b/macros/latex/contrib/fei/fei-template-sublist.tex
index a6fe886b9b..344dea299f 100644
--- a/macros/latex/contrib/fei/fei-template-sublist.tex
+++ b/macros/latex/contrib/fei/fei-template-sublist.tex
@@ -85,7 +85,10 @@ Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos
Vivamus vel erat erat. Integer venenatis nisl velit, vel commodo lectus condimentum ac. Aliquam id magna at tellus sagittis tempus id quis ante. Maecenas bibendum ipsum nec urna condimentum mollis. In venenatis eget nunc ac adipiscing. Vivamus faucibus vel orci mattis egestas. In hac habitasse platea dictumst. Nulla faucibus neque eu fermentum luctus. Duis ipsum nunc, congue vel justo nec, faucibus iaculis erat. Integer sit amet augue nec enim blandit placerat. Sed bibendum feugiat eros.
\end{agradecimentos}
-\epigrafe{A good scientist is a person with original ideas. A good engineer is a person who makes a design that works with as few original ideas as possible. There are no prima donnas in engineering.}{Freeman Dyson \nocite{dyson_disturbing_1979}}
+\begin{epigrafe}
+ \epig{Beware of bugs in the above code; I have only proved it correct, not tried it.}{Donald E. Knuth \nocite{knuth77}}
+ \epig{Something is rotten in the state of Denmark.}{William Shakespeare \nocite{shakespeare1885tragedy}}
+\end{epigrafe}
\begin{resumo}
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean quam turpis, ullamcorper quis laoreet ac, malesuada sed mi. Quisque orci nunc, placerat quis mauris vel, luctus dictum tellus. Ut aliquam dui nunc, quis commodo justo mattis aliquam. Nam congue libero nec dui auctor pharetra. Sed sit amet justo sodales, elementum massa quis, luctus ipsum. Ut et libero mattis, rhoncus nisi vitae, facilisis sapien. Aliquam erat volutpat. Mauris eget libero egestas, ullamcorper leo quis, convallis libero. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
diff --git a/macros/latex/contrib/fei/fei-template.tex b/macros/latex/contrib/fei/fei-template.tex
index e2559be5df..cef47bc504 100644
--- a/macros/latex/contrib/fei/fei-template.tex
+++ b/macros/latex/contrib/fei/fei-template.tex
@@ -1,13 +1,4 @@
-\begin{filecontents*}{\jobname.xmpdata}
- \Title {Minha tese-dissertação-monografia}
- \Author {Meu Nome\sep Nome Do Outro Integrante\sep Nome do Terceiro}
- \Copyright {Copyright \copyright\ 2019 "Douglas De Rizzo Meneghetti"}
- \Keywords {manual\sep latex\sep tipografia}
- \Language {pt-BR}
- \Subject {Resumo vai aqui em uma única linha corrida.}
-\end{filecontents*}
-
\documentclass[xindy,acronym,symbols]{fei}
\usepackage[utf8]{inputenc}
@@ -72,7 +63,10 @@ Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos
Vivamus vel erat erat. Integer venenatis nisl velit, vel commodo lectus condimentum ac. Aliquam id magna at tellus sagittis tempus id quis ante. Maecenas bibendum ipsum nec urna condimentum mollis. In venenatis eget nunc ac adipiscing. Vivamus faucibus vel orci mattis egestas. In hac habitasse platea dictumst. Nulla faucibus neque eu fermentum luctus. Duis ipsum nunc, congue vel justo nec, faucibus iaculis erat. Integer sit amet augue nec enim blandit placerat. Sed bibendum feugiat eros.
\end{agradecimentos}
-\epigrafe{A good scientist is a person with original ideas. A good engineer is a person who makes a design that works with as few original ideas as possible. There are no prima donnas in engineering.}{Freeman Dyson \nocite{dyson_disturbing_1979}}
+\begin{epigrafe}
+ \epig{Beware of bugs in the above code; I have only proved it correct, not tried it.}{Donald E. Knuth \nocite{knuth77}}
+ \epig{Something is rotten in the state of Denmark.}{William Shakespeare \nocite{shakespeare1885tragedy}}
+\end{epigrafe}
\begin{resumo}
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean quam turpis, ullamcorper quis laoreet ac, malesuada sed mi. Quisque orci nunc, placerat quis mauris vel, luctus dictum tellus. Ut aliquam dui nunc, quis commodo justo mattis aliquam. Nam congue libero nec dui auctor pharetra. Sed sit amet justo sodales, elementum massa quis, luctus ipsum. Ut et libero mattis, rhoncus nisi vitae, facilisis sapien. Aliquam erat volutpat. Mauris eget libero egestas, ullamcorper leo quis, convallis libero. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
diff --git a/macros/latex/contrib/fei/fei.dtx b/macros/latex/contrib/fei/fei.dtx
index 60b93ba5e7..3fae8c81a8 100644
--- a/macros/latex/contrib/fei/fei.dtx
+++ b/macros/latex/contrib/fei/fei.dtx
@@ -49,7 +49,7 @@ See http://www.latex-project.org/lppl.txt
\endpreamble
\postamble
-Copyright (C) 2017 by Douglas De Rizzo Meneghetti <douglasrizzo@fei.edu.br>
+Copyright (C) 2019 by Douglas De Rizzo Meneghetti <douglasrizzo@fei.edu.br>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License (LPPL), either
@@ -173,7 +173,13 @@ literate=
\begin{agradecimentos}
Agradecemos a Donald Knuth pela criação do \TeX{}, a Leslie Lamport pelo \LaTeX{} e a toda a comunidade de desenvolvedores que continua dando suporte e criando pacotes para melhorar a qualidade dos documentos escritos. Agradecimentos especiais são estendidos aos membros da \TeX{} \emph{Stack Exchange} pela divisão do fardo de criar documentos com belas tipografias. Agradece-se também os mantenedores da \gls{ctan}, por hospedar a classe e garantir sua distribuição em todas as maiores distribuições de \LaTeX{} nos principais sistemas operacionais, além de enviar-me e-mails toda vez que subo uma versão errada da classe.
\end{agradecimentos}
-\epigrafe{A good scientist is a person with original ideas. A good engineer is a person who makes a design that works with as few original ideas as possible. There are no prima donnas in engineering.}{Freeman Dyson \nocite{dyson_disturbing_1979}}
+
+\begin{epigrafe}
+ \epig{Beware of bugs in the above code; I have only proved it correct, not tried it.}{Donald E. Knuth \nocite{knuth77}}
+ \epig{Something is rotten in the state of Denmark.}{William Shakespeare \nocite{shakespeare1885tragedy}}
+\end{epigrafe}
+
+% \epigrafe{A good scientist is a person with original ideas. A good engineer is a person who makes a design that works with as few original ideas as possible. There are no prima donnas in engineering.}{Freeman Dyson \nocite{dyson_disturbing_1979}}
\begin{resumo}
O \TeX{} é um sistema de formatação de textos baseado em uma \emph{mark-up language}, criado em 1978 por Donald Knuth e ampliado com uma série de macros por Leslie Lamport, dando à luz o \LaTeX{}. Utilizado com frequência na área acadêmica, foram criadas classes em \LaTeX{} para satisfazer às regras de formatação dos mais variados órgãos, sociedades, institutos e universidades. Baseada nos padrões da ABNT, a biblioteca da FEI criou seu próprio guia para formatação de trabalhos acadêmicos, o qual originou, extra-oficialmente, a classe \texttt{fei.cls}. Neste guia, os usuários serão guiados no uso dessa classe, desde a criação de elementos pré-textuais (capa, folha de rosto, ficha catalográfica, epígrafe, dedicatória, sumário, listas de figuras, tabelas, algoritmos, siglas e símbolos), passando pelo corpo do texto e elementos pós-textuais (índice remissivo, referências bibliográficas, apêndices e anexos) e terminando com uma explicação referente à instalação dos pré-requisitos e compilação de um trabalho dissertativo com todos os recursos que a classe pode oferecer.
@@ -337,8 +343,9 @@ A classe da FEI pode receber as seguintes opções:
\item \texttt{sublist}: configura o pacote \texttt{glossaries} para que sub-listas de símbolos sejam usadas. Mais sobre sub-listas na seção \ref{sec:sublist};
\item \texttt{algo-as-figure}: configura o pacote \texttt{algorithm2e} para que algoritmos sejam listados na lista de ilustrações. Essa configuração é preferível, uma vez que a formatação das legendas e da lista de algoritmos, no presente, não condiz com as recomendações do guia da biblioteca;
\item \texttt{twoside}: a atualização de 2015 do guia da biblioteca recomenda que trabalhos acadêmicos com mais de 100 páginas sejam impressos em formato \index{frente-e-verso}frente-e-verso. Por ser derivada da classe \texttt{memoir}, a classe da FEI pode receber algumas opções nativas de \texttt{memoir}. Um exemplo de opção que pode ser útil é \texttt{twoside}, a qual alterna o tamanho das margens direita e esquerda das páginas, assim como a posição da numeração, permitindo realizar uma impressão frente-e-verso de melhor qualidade. Alterações adicionais foram realizadas para que todos os elementos pré-textuais sejam corretamente iniciados nas páginas ímpares, como recomenda o guia e a norma. É importante reparar, contudo, que a utilização de \texttt{twoside} acarreta no aumento do número de páginas, uma vez que os versos de algumas páginas no pré-texto podem ser deixados em branco em prol da norma.
- \item \texttt{acronym}: sinaliza a configuração da lista de abreviaturas;
- \item \texttt{symbols}: sinaliza a configuração da lista de símbolos.
+ \item \texttt{acronym}: passado para o pacote \texttt{glossaries-extra}, sinaliza o uso de abreviaturas no trabalho;
+ \item \texttt{symbols}: passado para o pacote \texttt{glossaries-extra}, sinaliza o uso de símbolos no trabalho;
+ \item \texttt{record}: passado para o pacote \texttt{glossaries-extra}, sinaliza o uso de um arquivo \texttt{.bib} para definição de símbolos e abreviaturas, a ser compilado pelo programa \index{bib2gls@\texttt{bib2gls}}\texttt{bib2gls}.
\end{enumerate}
\subsection{Nome do autor, e título}
@@ -400,11 +407,19 @@ A quem se deseja agradecer.
\end{lstlisting}
\subsection{Epígrafe}
-A epígrafe possui um formato especial, da mesma forma que a dedicatória. Este comando recebe dois parâmetros, sendo o primeiro a epígrafe e o segundo o autor da mesma.
+
+A página da epígrafe é criada utilizando o ambiente \texttt{epigrafe}. Dentro deste ambiente, uma ou mais citações podem ser inseridas separadamente utilizando o comando \lstinline+\epig{citacao}{Autor}+. Este comando recebe dois parâmetros, sendo o primeiro a citação em si e o segundo o autor da mesma. Apesar do guia de formatação da biblioteca não mencionar a possibilidade de incluir mais que uma cvitação na epígrafe, a classe da FEI disponibiliza esta opção aos seus usuários
\emph{Nota:} O guia da FEI requer que a referência da epígrafe esteja presente no final do trabalho. O comando \lstinline+\nocite{obra}+ pode ser usado para que a referência apareça ao final do texto, sem aparecer na epígrafe.
-Exemplo: \lstinline+\epigrafe{Haw-Haw!}{Nelson Muntz \nocite{muntz_book}}+
+Exemplo de declaração da página de epígrafe com duas citações:
+
+\begin{lstlisting}
+\begin{epigrafe}
+\epig{Epígrafe número um]}{Autor da Silva \nocite{obra_1}}
+\epig{Epígrafe número dois]}{Autor de Souza \nocite{obra_2}}
+\end{epigrafe}
+\end{lstlisting}
\subsection{Resumo e \emph{abstract}}
@@ -1310,7 +1325,7 @@ A seguir, as descrições dos arquivos auxiliares gerados durante o processo de
% \fi
%<*class>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{fei}[2019/05/31 4.5.1 Modelo da FEI]
+\ProvidesClass{fei}[2019/10/03 4.6 Modelo da FEI]
% passa a opção draft para a classe
\DeclareOption{draft}{
@@ -1340,6 +1355,11 @@ A seguir, as descrições dos arquivos auxiliares gerados durante o processo de
\glossariestrue
\PassOptionsToPackage{\CurrentOption}{glossaries-extra}
}
+% opção para configurar a lista de abreviaturas
+\DeclareOption{record}{
+ \glossariestrue
+ \PassOptionsToPackage{\CurrentOption}{glossaries-extra}
+}
% opção para criar sub-listas de símbolos
\newif\ifsublist
\sublistfalse
@@ -1848,13 +1868,12 @@ A seguir, as descrições dos arquivos auxiliares gerados durante o processo de
\end{flushright}
}
-% epígrafe
-\newcommand{\epigrafe}[2]{
- \cleardoublepage
- \thispagestyle{empty}
- \vspace*{\fill}
- \begin{flushright}
- \begin{minipage}[t][0.5\textheight][c]{0.5\textwidth}
+\newenvironment{epigrafe}{\cleardoublepage\pagestyle{empty}\vspace*{\fill}}{\pagestyle{plain}}
+
+\newcommand{\epig}[2]{
+ \vspace{2\baselineskip}
+ \begin{flushright}
+ \begin{minipage}[t]{0.5\textwidth}
``{#1}''
\begin{flushright}
#2
@@ -1862,7 +1881,6 @@ A seguir, as descrições dos arquivos auxiliares gerados durante o processo de
\end{minipage}
\end{flushright}
}
-
% resumo
\newenvironment{resumo}{\part*{Resumo}\pagestyle{empty}}{\cleardoublepage\pagestyle{plain}\setlength{\parindent}{1.25cm}}
diff --git a/macros/latex/contrib/fei/fei.pdf b/macros/latex/contrib/fei/fei.pdf
index 985421e0d6..6f035f5c9f 100644
--- a/macros/latex/contrib/fei/fei.pdf
+++ b/macros/latex/contrib/fei/fei.pdf
Binary files differ
diff --git a/macros/latex/contrib/fei/referencias.bib b/macros/latex/contrib/fei/referencias.bib
index e3ad86ec01..ab8fe38180 100644
--- a/macros/latex/contrib/fei/referencias.bib
+++ b/macros/latex/contrib/fei/referencias.bib
@@ -1,3 +1,18 @@
+@Book{shakespeare1885tragedy,
+ title={Tragedy of Hamlet, prince of Denmark},
+ author={Shakespeare, William},
+ year={1885},
+ publisher={SR Winchell \& Company}
+}
+
+@Unpublished{knuth77,
+ title={Notes on the van Emde Boas construction of priority deques: an instructive use of recursion},
+ author={Knuth, Donald Ervin},
+ year={1977},
+ month=mar,
+ note={Classroom notes}
+}
+
@Book{art1,
title = {The Art of Computer Programming: Fundamental algorithms},
author = {Donald Knuth},
diff --git a/macros/latex/contrib/lwarp/README.txt b/macros/latex/contrib/lwarp/README.txt
index a38ce84fc4..76ba121f6c 100644
--- a/macros/latex/contrib/lwarp/README.txt
+++ b/macros/latex/contrib/lwarp/README.txt
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.75 README.txt
+LaTeX lwarp package v0.76 README.txt
Files included are:
diff --git a/macros/latex/contrib/lwarp/lwarp.dtx b/macros/latex/contrib/lwarp/lwarp.dtx
index 7bedf7e6dd..f06f7506e0 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> [2019/09/23 v0.75 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2019/10/08 v0.76 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -2679,7 +2679,7 @@ This boolean may be tested by the user for later use.
%<*package>
% \fi
%
-% \CheckSum{33352}
+% \CheckSum{33386}
%
% \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
@@ -2797,6 +2797,7 @@ This boolean may be tested by the user for later use.
% \changes{v0.73}{2019/07/11}{\ 2019/07/11}
% \changes{v0.74}{2019/09/02}{\ 2019/09/02}
% \changes{v0.75}{2019/09/23}{\ 2019/09/23}
+% \changes{v0.76}{2019/10/08}{\ 2019/10/08}
@@ -3017,6 +3018,23 @@ This boolean may be tested by the user for later use.
%
% \begin{description}
% \needspace{2\baselineskip}
+% \item[v0.76:] \brand{MathJax}, updates for \LaTeX\ 2019/10 release.
+% \begin{itemize}
+% \item Docs: Expanded documentation regarding the use of multiple projects
+% \margintag{docs}
+% in the same directory. See \cref{sec:multipleprojects}.
+% \item \brand{MathJax}: Updated to v2.7.6.
+% \margintag{\brand{MathJax}}
+% \item \pkg{xr}: Updated to v5.05.
+% \margintag{packages}
+% \item \pkg{xr-hyper}: Updated to v6.1.
+% \item Verified works as-is with \pkg{xcite}.
+% \item \pkg{acro}: Updated to v2.10.
+% \item Currently broken by the 2019/10 \LaTeX\ update:
+% \watchout[broken]
+% \pkg{breqn}, \pkg{grffile}, \pkg{multimedia}, \pkg{movie15}.
+% \end{itemize}
+% \needspace{2\baselineskip}
% \item[v0.75:] \pkg{keyfloat}, \pkg{wrapfig}
% \begin{itemize}
% \item \cs{minipage}: Fix for \cs{linewidth}.
@@ -3149,7 +3167,8 @@ This boolean may be tested by the user for later use.
% is used.
% \item Fixes for \cs{makebox}.
% \item Fixes for \cs{parbox} inside a \element{span}.
-% \item MathJax: Updated to v2.7.5. Loads the \filenm{autoload-all.js} extension.
+% \item \brand{MathJax}: Updated to v2.7.5.
+% Loads the \filenm{autoload-all.js} extension.
% Added \cs{MathJaxFilename} to select custom scripts.
% \item \pkg{textcomp}, \pkg{xunicode}: Fix for \cs{textinterrobang}.
% \margintag{packages}
@@ -4795,8 +4814,8 @@ This boolean may be tested by the user for later use.
% Cross-references: &
% \ipkg{bookmark}, \epkg{breakurl}, \spkg{cleveref}, \epkg{fancyref},
% \ipkg{hypdestopt}, \epkg{hyperref}, \epkg{perpage}, \mpkg{prettyref},
-% \epkg{titleref}, \mpkg{url}, \spkg{varioref}, \mpkg{xr}, \mpkg{xr-hyper},
-% \ipkg{xurl}. \\
+% \epkg{titleref}, \mpkg{url}, \spkg{varioref}, \spkg{xcite},
+% \mpkg{xr}, \mpkg{xr-hyper}, \ipkg{xurl}. \\
%
% \midrule
%
@@ -6180,6 +6199,20 @@ This boolean may be tested by the user for later use.
%
%
% \subsection{Processing multiple projects in the same directory}
+% \label{sec:multipleprojects}
+% \gindex{multiple projects in a directory}
+% \gindex{projects}
+% \gindex{xr=\pkg{xr}}
+% \gindex{xr-hyper=\pkg{xr-hyper}}
+% \gindex{xcite=\pkg{xcite}}
+% \trouble{multiple projects in a directory}
+% \trouble{projects>multiple}
+% \trouble{file>multiple projects in directory}
+% \trouble[\pkg{xr}, \pkg{xr-hyper}, \pkg{xcite}]{xr=\pkg{xr}}
+% \trouble{xr-hyper=\pkg{xr-hyper}}
+% \trouble{xcite=\pkg{xcite}}
+%
+% \changes{v0.76}{2019/10/08}{Docs expanded: Multiple projects.}
%
% It is possible to have several projects in the same directory.
% \prog{lwarpmk} has an optional parameter which is the document to compile.
@@ -6195,8 +6228,25 @@ This boolean may be tested by the user for later use.
%
% To compile each project with |lwarkmk|:
% \userentry{lwarpmk print -p project\_a}
+% \userentry{lwarpmk print -p project\_b}
+% \userentry{lwarpmk html -p project\_a}
% \userentry{lwarpmk html -p project\_b}
%
+% To generate each project's images:
+% \userentry{lwarpmk limages -p project\_a}
+% \userentry{lwarpmk limages -p project\_b}
+%
+% To clean each project's images:
+% \userentry{lwarpmk cleanlimages -p project\_a}
+% \userentry{lwarpmk cleanlimages -p project\_b}
+%
+% To clean each project's auxiliary files:
+% \userentry{lwarpmk cleanall -p project\_a}
+% \userentry{lwarpmk cleanall -p project\_b}
+%
+% If using \prog{bibtex}, for example, the \HTML\ version must also be processed:
+% \userentry{bibtex project\_a\textred{\_html}}
+%
%
% \subsection{Using the \prog{make} utility}
%
@@ -6210,6 +6260,8 @@ This boolean may be tested by the user for later use.
% tags (|project_html.pdf|), then \prog{lwarpmk} may be used to
% convert each target to \HTML\ files.
%
+% \clearpage
+%
% \subsection{What next?}
% \label{sec:whatnext}
%
@@ -8134,6 +8186,11 @@ This boolean may be tested by the user for later use.
% \limitsmanyfootbigfoot
%
%
+% \subsubsection{\pkg{xr}, \pkg{xr-hyper}, and \pkg{xcite} packages}
+%
+% See \cref{sec:multipleprojects}.
+%
+%
% \subsection{Front and back matter}
% \label{sec:frontbackmatter}
%
@@ -8248,7 +8305,7 @@ This boolean may be tested by the user for later use.
% \limitsendnotes
%
%
-% \subsubsection{\brand{BibTeX}}
+% \subsubsection{\prog{BibTeX}}
% \label{sec:limitsbibtex}
% \DescribeMacro{\etalchar} Displays a superscript ``+'' to indicate ``and others''.
% \changes{v0.54}{2018/03/09}{Docs: BibTeX.}
@@ -8256,6 +8313,11 @@ This boolean may be tested by the user for later use.
% \limitsbibtex
%
%
+% \subsubsection{\pkg{xcite} package}
+%
+% See \cref{sec:multipleprojects}.
+%
+%
% \needspace{6\baselineskip}
% \subsubsection{\pkg{gloss} package}
% \label{sec:gloss}
@@ -13327,6 +13389,10 @@ This boolean may be tested by the user for later use.
%
% \changes{v0.34}{2017/08/02}{\pkg{filecontents}: Required. Patched for \pkg{morewrites}.}
%
+% (Recent versions of \LaTeX\ (as of Fall 2019) now include the functionality
+% of the \pkg{filecontents} package, but the package will still be used
+% for those who still have older installations.)
+%
% \begin{macrocode}
\RequirePackage{filecontents}
@@ -15305,6 +15371,7 @@ This boolean may be tested by the user for later use.
% \changes{v0.73}{2019/06/30}{\filenm{lwarp.css}: Improved pkg{tocdata} formatting.}
% \changes{v0.74}{2019/08/04}{\filenm{lwarp.css}: Added \pkg{lyluatex}.}
% \changes{v0.75}{2019/09/22}{\filenm{lwarp.css}: Improved marginblock.}
+% \changes{v0.76}{2019/10/02}{\filenm{lwarp.css}: Fix for small caps.}
%
% ^^A *lwarp.css
%
@@ -15394,6 +15461,12 @@ span.texteb { font-weight: bolder; }
span.textlg { font-weight: lighter; }
+span.textup, div.textup {
+ font-style: normal;
+ font-variant: normal;
+ font-variant-numeric: normal ;
+}
+
span.textsc, div.textsc {
font-variant: small-caps;
font-variant-numeric: oldstyle-nums ;
@@ -15406,12 +15479,6 @@ span.textulc, div.textulc {
span.textsl, div.textsl { font-style: oblique; }
-span.textup, div.textup {
- font-style: normal;
- font-variant: normal;
- font-variant-numeric: normal ;
-}
-
span.textrm, div.textrm {
font-family: "DejaVu Serif", "Bitstream Vera Serif",
"Lucida Bright", Georgia, serif;
@@ -17627,6 +17694,7 @@ page_compositor "."
% \changes{v0.62}{2018/11/05}{File: \filenm{lwarp_mathjax.txt}: Removed inoperable \pkg{siunitx} extension.}
% \changes{v0.70}{2019/03/24}{File: \filenm{lwarp_mathjax.txt}: Updated to MathJax v2.7.5.}
% \changes{v0.70}{2019/03/24}{File: \filenm{lwarp_mathjax.txt}: Loads \filenm{autoload-all.js} extension.}
+% \changes{v0.76}{2019/10/05}{File: \filenm{lwarp_mathjax.txt}: Updated to MathJax v2.7.6.}
%
% ^^A *lwarp_mathjax.txt
%
@@ -17716,7 +17784,7 @@ MathJax.Hub.Config({
<!-- Alternative CDN provider: -->
<script type="text/javascript" async
-src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS_HTML-full">
+src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.6/MathJax.js?config=TeX-AMS_HTML-full">
</script>
<!-- No longer supported after April 30, 2017: -->
@@ -17872,7 +17940,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-
-- Copyright 2016-2019 Brian Dunn
-printversion = "v0.75"
+printversion = "v0.76"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -37797,8 +37865,60 @@ color:\LWR@origpound\LWR@tempcolor%
% \end{macrocode}
% Modified to activate the current font:
+% \changes{v0.76}{2019/10/07}{\pkg{acro}: Updated for v2.10.}
% \begin{macrocode}
\ExplSyntaxOn
+\@ifpackagelater{acro}{2019/09/23}%
+{% v2.10 or later
+\cs_gset_protected:Npn \__acro_typeset:nn #1#2
+ {
+ \mode_if_horizontal:F { \leavevmode }
+ \group_begin:
+ \use:x
+ {
+ \bool_if:cTF {l__acro_custom_#1_format_bool}
+ { \exp_not:v {l__acro_custom_#1_format_tl} }
+ { \exp_not:v {l__acro_#1_format_tl} }
+ {\exp_not:N\LWR@textcurrentfont{#2}}% lwarp
+ }
+ \group_end:
+ }
+
+\cs_gset_protected:Npn \__acro_ending_format:nn #1#2
+ {
+ \bool_if:NTF \l__acro_include_endings_format_bool
+ {
+ \str_case:nn {#1}
+ {
+ {long}
+ {
+ \bool_if:NTF \l__acro_custom_long_format_bool
+ { \l__acro_custom_long_format_tl }
+ {
+ \bool_if:NTF \l__acro_first_instance_bool
+ { \l__acro_first_long_format_tl }
+ { \l__acro_long_format_tl }
+ }
+ }
+ {short}
+ {
+ \bool_if:NTF \l__acro_custom_short_format_bool
+ { \l__acro_custom_short_format_tl }
+ { \l__acro_short_format_tl }
+ }
+ {alt}
+ {
+ \bool_if:NTF \l__acro_custom_alt_format_bool
+ { \l__acro_custom_alt_format_tl }
+ { \l__acro_alt_format_tl }
+ }
+ }
+ }
+ { \use:n }
+ {\exp_not:N\LWR@textcurrentfont{#2}}% lwarp
+ }
+}% v2.10 or later
+{% before v2.10
\cs_gset_protected:Npn \acro_write_short:nn #1#2
{
\mode_if_horizontal:F { \leavevmode }
@@ -37843,6 +37963,7 @@ color:\LWR@origpound\LWR@tempcolor%
}
\group_end:
}
+}% before v2.10
\ExplSyntaxOff
% \end{macrocode}
@@ -69407,28 +69528,29 @@ height:\LWR@printlength{\LWR@tempheight}%
%
% \DescribePackage{xr}
% \pkg{xr} is patched for use by \pkg{lwarp}.
+% The \filenm{*_html.aux} file is used.
+% \cs{externaldocument} is modified to also accept the optional
+% arguments for \pkg{xr-hyper}, which currently uses \pkg{xr} for \HTML\ output.
+%
+% See \cref{sec:multipleprojects}.
%
% \changes{v0.72}{2019/06/05}{\pkg{xr}: Added.}
+% \changes{v0.76}{2019/10/08}{\pkg{xr}: Updated for v5.05 and \pkg{xr-hyper} v6.1.}
%
% \codehtml
%
-% \pkg{lwarp-xr-hyper} also uses \pkg{lwarp-xr}
-% to reuse the following definition.
-% Only load \pkg{xr} if \pkg{xr-hyper} has not been loaded:
% \begin{macrocode}
-\ifdef{\externaldocument}{}{
- \LWR@ProvidesPackagePass{xr}[2019/01/05]
-}
+\LWR@ProvidesPackagePass{xr}[2019/07/22]%
% \end{macrocode}
%
% \begin{macrocode}
\LetLtxMacro\LWR@orig@externaldocument\externaldocument
-\renewcommand*{\externaldocument}[2][]{%
+\RenewDocumentCommand{\externaldocument}{O{} O{} m O{}}{%
\ifblank{#1}{%
- \LWR@orig@externaldocument{#2_html}%
+ \LWR@orig@externaldocument{#3_html}%
}{%
- \LWR@orig@externaldocument[#1]{#2_html}%
+ \LWR@orig@externaldocument[#1]{#3_html}%
}%
}
% \end{macrocode}
@@ -69452,14 +69574,19 @@ height:\LWR@printlength{\LWR@tempheight}%
% \credits{David Carlisle}
%
% \DescribePackage{xr-hyper}
-% \pkg{xr-hyper} is patched for use by \pkg{lwarp}.
+% \pkg{xr-hyper} is replaced by \pkg{xr}, which is modified to
+% accept the optional arguments for \cs{externaldocument}.
+% So far, no hyperlinks are provided for citations.
+%
+% See \cref{sec:multipleprojects}.
%
% \changes{v0.72}{2019/06/05}{\pkg{xr-hyper}: Added.}
+% \changes{v0.76}{2019/10/08}{\pkg{xr-hyper}: Updated for v6.1.}
%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{xr-hyper}[2000/03/22]
+\LWR@ProvidesPackageDrop{xr-hyper}[2019/10/03]%
\LWR@origRequirePackage{lwarp-xr}
% \end{macrocode}
diff --git a/macros/latex/contrib/lwarp/lwarp.pdf b/macros/latex/contrib/lwarp/lwarp.pdf
index 5b3f9d64b1..9f7650452e 100644
--- a/macros/latex/contrib/lwarp/lwarp.pdf
+++ b/macros/latex/contrib/lwarp/lwarp.pdf
Binary files differ
diff --git a/macros/latex/contrib/lwarp/lwarpmk.lua b/macros/latex/contrib/lwarp/lwarpmk.lua
index 329fa4f3f1..e0477be8a6 100755
--- a/macros/latex/contrib/lwarp/lwarpmk.lua
+++ b/macros/latex/contrib/lwarp/lwarpmk.lua
@@ -2,7 +2,7 @@
-- Copyright 2016-2019 Brian Dunn
-printversion = "v0.75"
+printversion = "v0.76"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()