diff options
author | Norbert Preining <norbert@preining.info> | 2020-11-17 03:00:38 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-11-17 03:00:38 +0000 |
commit | ae5cb0f32e931708a1fe4e7e84793590c0d59df4 (patch) | |
tree | ca7c24224dd6563eee7e67d5ead99aaf3369d678 /macros/latex/contrib | |
parent | 1e974f97ab28af897be376bdbd15593048fa45ea (diff) |
CTAN sync 202011170300
Diffstat (limited to 'macros/latex/contrib')
34 files changed, 327 insertions, 208 deletions
diff --git a/macros/latex/contrib/acmart/README b/macros/latex/contrib/acmart/README index 67302fa174..8d0b3f9c28 100644 --- a/macros/latex/contrib/acmart/README +++ b/macros/latex/contrib/acmart/README @@ -277,4 +277,7 @@ Version 1.73 Bug fixes for affiliations Version 1.74 Bug fixes. A regression introduced in the font changes - is reverted.
\ No newline at end of file + is reverted. + +Version 1.75. \country is now obligatory for addresses. + Added \AtBeginMaketitle diff --git a/macros/latex/contrib/acmart/acmart.dtx b/macros/latex/contrib/acmart/acmart.dtx index a901526f72..f895373409 100644 --- a/macros/latex/contrib/acmart/acmart.dtx +++ b/macros/latex/contrib/acmart/acmart.dtx @@ -104,6 +104,7 @@ % Andrew Black, % Joachim Breitner, % Benjamin Byholm, +% John Collins, % Nils Anders Danielsson, % Michael Ekstrand, % Matthew Fluet, @@ -635,8 +636,9 @@ % automatically. % % The fields \cs{institution}, \cs{city} and \cs{country} are -% mandatory. If they are not provided, the warning is issued. In the -% future ACM might decide to change the warning to the error. +% mandatory. If they are not provided, an error or a warning is +% issued. Currently the absence of \cs{country} produces and error; +% ACM may change this in the future. % % % An example of the author block: @@ -1686,7 +1688,7 @@ % You should not load |amssymb| package since the package |acmart| % defines the corresponding symbols itself. % -%\subsection{A note for wizards: \texttt{acmart-preload-hook.tex}} +%\subsection{Notes for wizards} %\label{sec:ug_preload} % % Sometimes you need to change the behavior of |acmart|. The @@ -1728,6 +1730,13 @@ % \emph{do not ask for support.} If you decide to use this hook, you % are on your own. % +% \DescribeMacro{\AtBeginMaketitle}% +% Another hook is \cs{AtBeginMaketitle}. The commands in this hook +% are executed before \cs{maketitle}, for example, +% \begin{verbatim} +% \AtBeginMaketitle{\acmPrice{125.00}} +% \end{verbatim} +% % %\subsection{Currently supported publications} %\label{sec:pubs} @@ -1886,7 +1895,7 @@ \ProvidesFile{acmart.dtx} %</gobble> %<class>\ProvidesClass{acmart} -[2020/10/25 v1.74 Typesetting articles for the Association for Computing Machinery] +[2020/11/15 v1.75 Typesetting articles for the Association for Computing Machinery] % \end{macrocode} % % \changes{v1.00}{2016/04/14}{First released version} @@ -1990,7 +1999,9 @@ % \changes{1.71}{2020/05/01}{Retired sigchi and sigchi-a} % \changes{1.71}{2020/05/02}{Bibliography change: volume for % @inproceedings is now in brackets together with series} -% \changes{1.71}{2020/05/02}{LuaTeX now uses the OTF versions of fonts} +% \changes{1.71}{2020/05/02}{LuaTeX now uses the OTF versions of +% fonts} +% \changes{1.75}{2020/10/29}{Documentation update} % % And the driver code: % \begin{macrocode} @@ -5130,8 +5141,34 @@ % % \end{macro} % +% +%\subsection{Maketitle hook} +%\label{sec:hook} +% +% The current \LaTeX\ provides a nice |lthooks| mechanism. However, +% since it is relatively new, we will use oldfashioned approach---at +% least for now. +% +% \begin{macro}{\@beginmaketitlehook} +% \changes{v1.75}{2020/11/15}{Introduced macro} +% The hook +% \begin{macrocode} +\ifx\@beginmaketitlehook\@undefined + \let\@beginmaketitlehook\@empty +\fi +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\AtBeginMaketitle} +% \changes{v1.75}{2020/11/15}{Introduced macro} +% Adding to the hook +% \begin{macrocode} +\def\AtBeginMaketitle{\g@addto@macro\@beginmaketitlehook} +% \end{macrocode} +% \end{macro} +% % \subsection{Typesetting top matter} -% \label{sec:makefile} +% \label{sec:maketitle} % % \begin{macro}{\mktitle@bx} % Some of our formats use a two-column design. Some use a one-column @@ -5178,6 +5215,7 @@ % (Scott Pakin)} % \changes{v1.73}{2020/09/07}{Do not check again the presense of % address fields} +% \changes{v1.75}{2020/11/15}{Added \cs{@beginmaketitlehook}} % The (in)famous \cs{maketitle}. Note that in |sigchi-a| mode, authors % are \emph{not} in the title box. % @@ -5186,7 +5224,7 @@ % and therefore belong to the copyright/permission block. By the % way, this was the default behavior of the old ACM classes. % \begin{macrocode} -\def\maketitle{% +\def\maketitle{\@beginmaketitlehook \@ACM@maketitle@typesettrue \if@ACM@anonymous % Anonymize omission of \author-s @@ -5837,6 +5875,7 @@ % % \begin{macro}{\@ACM@checkaffil} % \changes{v1.73}{2020/09/07}{Added macro} +% \changes{v1.75}{2020/11/15}{Changed warning to error for country} % Check affiliation flags % \begin{macrocode} \def\@ACM@checkaffil{% @@ -5847,7 +5886,8 @@ \ClassWarningNoLine{\@classname}{No city present for an affiliation}% \fi \if@ACM@countrypresent\else - \ClassWarningNoLine{\@classname}{No country present for an affiliation}% + \ClassError{\@classname}{No country present for an affiliation}{ACM + requires each author to indicate their country using country macro.}% \fi } % \end{macrocode} diff --git a/macros/latex/contrib/acmart/acmart.pdf b/macros/latex/contrib/acmart/acmart.pdf Binary files differindex 97af4bc0b9..8c026173ab 100644 --- a/macros/latex/contrib/acmart/acmart.pdf +++ b/macros/latex/contrib/acmart/acmart.pdf diff --git a/macros/latex/contrib/acmart/acmguide.pdf b/macros/latex/contrib/acmart/acmguide.pdf Binary files differindex 974e50ecb0..c298d7f1f8 100644 --- a/macros/latex/contrib/acmart/acmguide.pdf +++ b/macros/latex/contrib/acmart/acmguide.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf Binary files differindex 6da30912f5..e8643fa668 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf Binary files differindex 2e3826f380..4ce5a1ee2f 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf Binary files differindex 380e3c4054..b972760d2b 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf Binary files differindex 3b982c2b9c..489df51096 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf Binary files differindex eb5aa9d0e3..fea344a4f6 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-authordraft.pdf b/macros/latex/contrib/acmart/samples/sample-authordraft.pdf Binary files differindex 39ddfcb499..c066231c03 100644 --- a/macros/latex/contrib/acmart/samples/sample-authordraft.pdf +++ b/macros/latex/contrib/acmart/samples/sample-authordraft.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-lualatex.pdf b/macros/latex/contrib/acmart/samples/sample-lualatex.pdf Binary files differindex 67ab63ed06..3d93e76394 100644 --- a/macros/latex/contrib/acmart/samples/sample-lualatex.pdf +++ b/macros/latex/contrib/acmart/samples/sample-lualatex.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf Binary files differindex e2349dd0aa..7568fd5412 100644 --- a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf +++ b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf Binary files differindex 3114e63ddc..cdd63d36ee 100644 --- a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf +++ b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf Binary files differindex 2d4b6a5a54..49bd68a9fd 100644 --- a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf +++ b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-xelatex.pdf b/macros/latex/contrib/acmart/samples/sample-xelatex.pdf Binary files differindex a6840bf543..2e56644b58 100644 --- a/macros/latex/contrib/acmart/samples/sample-xelatex.pdf +++ b/macros/latex/contrib/acmart/samples/sample-xelatex.pdf diff --git a/macros/latex/contrib/bookcover/bookcover-example1.pdf b/macros/latex/contrib/bookcover/bookcover-example1.pdf Binary files differindex 91286e1c69..57ce8d14de 100644 --- a/macros/latex/contrib/bookcover/bookcover-example1.pdf +++ b/macros/latex/contrib/bookcover/bookcover-example1.pdf diff --git a/macros/latex/contrib/bookcover/bookcover-example1.tex b/macros/latex/contrib/bookcover/bookcover-example1.tex index 446263394c..9351a8687a 100644 --- a/macros/latex/contrib/bookcover/bookcover-example1.tex +++ b/macros/latex/contrib/bookcover/bookcover-example1.tex @@ -1,46 +1,58 @@ \documentclass[spinewidth=25mm,coverwidth=15cm,coverheight=20cm,flapwidth=6cm]{bookcover} + \newbookcovercomponenttype{center rotate}{ \parbox[t][\partheight][c]{\partwidth}{ \begin{center} - \rotatebox[origin=c]{90}{#1} + \rotatebox[origin=c]{90}{#1} \end{center}}} -\usepackage[outline]{contour} -\usepackage{lipsum} + +\usepackage[outline]{contour}% It doesn't work with xelatex and lualatex \contourlength{1pt} \definecolor{lightbrown}{RGB}{176,88,0} \colorlet{title}{yellow!60!black} +\usepackage[latin]{babel} +\usepackage{lipsum} + \begin{document} \begin{bookcover} +% Remark +\begin{bookcoverelement}{center}{above front} + \textcolor{blue}{A DUST JACKET} +\end{bookcoverelement} + % Black background color on the whole cover -\bookcovercomponent{color}{bg whole}{color=black} +\begin{bookcoverelement}{color}{bg whole} + black +\end{bookcoverelement} % Brown background picture on the whole cover, without the flaps -\bookcovercomponent{picture}{bg whole without flaps}{./figures/bg.jpg} +\begin{bookcoverelement}{picture}{bg whole without flaps} + ./figures/bg.jpg +\end{bookcoverelement} % Vertical light brown transparent trails on the back cover by a tikz code -\bookcovercomponent{tikz}{bg back}{ +\begin{bookcoverelement}{tikz}{bg back} \fill[opacity=0.3,color=lightbrown] - (0mm,0mm) rectangle (20mm,210mm) (100mm,0mm) rectangle (150mm,210mm);} + (0mm,0mm) rectangle (20mm,210mm) (100mm,0mm) rectangle (150mm,210mm); +\end{bookcoverelement} % Vertical light brown transparent trails on the front cover by a tikz code -\bookcovercomponent{tikz}{bg front}{ +\begin{bookcoverelement}{tikz}{bg front} \fill[opacity=0.3,color=lightbrown] - (0mm,0mm) rectangle (50mm,210mm) (130mm,0mm) rectangle (150mm,210mm);} + (0mm,0mm) rectangle (50mm,210mm) (130mm,0mm) rectangle (150mm,210mm); +\end{bookcoverelement} -% Remark -\bookcovercomponent{center}{above front}{ - \color{blue}A DUST JACKET} - -% Picture (cards.png) on the front, behind the title -\bookcovercomponent{normal}{front}{ +% Picture on the front, behind the title +\begin{bookcoverelement}{normal}{front} \vspace{70mm} \centering - \includegraphics[width=8cm]{./figures/cards.png}} + \includegraphics[width=8cm]{./figures/cards.png} +\end{bookcoverelement} % Text on the front cover -\bookcovercomponent{normal}{front}{ +\begin{bookcoverelement}{normal}{front} \centering \vspace{60mm} \color{title}\sffamily\bfseries @@ -49,35 +61,40 @@ \resizebox*{90mm}{40mm}{\parbox{35mm}{ \centering \contour{black}{PROBABILITY}\\ - \contour{black}{THEORY}\\}}} + \contour{black}{THEORY}\\}} +\end{bookcoverelement} % Text on the spine -\bookcovercomponent{center rotate}{spine}{% +\begin{bookcoverelement}{center rotate}{spine} \contour{black}{% - \color{title}\huge\sffamily\bfseries% - Rose Taylor -- Probability Theory}} + \color{title}\huge\sffamily\bfseries + Rose Taylor -- Probability Theory} +\end{bookcoverelement} % Text on the back cover -\bookcovercomponent{normal}{back}{ +\begin{bookcoverelement}{normal}{back} \centering \vspace{20mm} - \parbox{110mm}{\color{white}\lipsum[1]}} + \parbox{110mm}{\color{white}\lipsum[1]} +\end{bookcoverelement} -% Text and picture (dice.png) on the front flap -\bookcovercomponent{normal}{front flap}{ +% Text and picture on the front flap +\begin{bookcoverelement}{normal}{front flap} \centering \vspace{20mm} \parbox{40mm}{\color{white}\lipsum[2]} \vfill \includegraphics[width=30mm]{./figures/dice.png} - \vspace{10mm}} + \vspace{10mm} +\end{bookcoverelement} % Text on the back flap -\bookcovercomponent{normal}{back flap}{ +\begin{bookcoverelement}{normal}{back flap} \centering \vspace{20mm} - \parbox{40mm}{\color{white}\lipsum[2]}} + \parbox{40mm}{\color{white}\lipsum[2]} +\end{bookcoverelement} \end{bookcover} -\end{document}
\ No newline at end of file +\end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/bookcover/bookcover-example2.pdf b/macros/latex/contrib/bookcover/bookcover-example2.pdf Binary files differindex 896896656b..14918ecb48 100644 --- a/macros/latex/contrib/bookcover/bookcover-example2.pdf +++ b/macros/latex/contrib/bookcover/bookcover-example2.pdf diff --git a/macros/latex/contrib/bookcover/bookcover-example2.tex b/macros/latex/contrib/bookcover/bookcover-example2.tex index 9444376f89..7397045035 100644 --- a/macros/latex/contrib/bookcover/bookcover-example2.tex +++ b/macros/latex/contrib/bookcover/bookcover-example2.tex @@ -1,40 +1,39 @@ \documentclass[markcolor=black,spinewidth=15mm]{bookcover} -\usepackage[utf8]{inputenc} -\usepackage[T1]{fontenc} -\usepackage[english]{babel} -\usepackage{url,lipsum} -\definecolor{amiyellow}{cmyk}{0,0,.5,0} +\usepackage[latin]{babel} +\usepackage{lipsum} +\definecolor{amiyellow}{cmyk}{0,0,.6,0} + \begin{document} -% The outside of the book cover +% The outside of the book cover \begin{bookcover} +% Remark +\bookcovercomponent{center}{above front}{ + \textcolor{red}{\textsc{Annales Mathematicae et Informaticae} book cover -- outside}} + % Yellow triangle on the back cover by tikz code \bookcovercomponent{tikz}{bg back}{ - \fill[color=amiyellow](.5,.5)--(17.5,24.5)--(17.5,0)--(.5,0)--cycle;} + \fill[amiyellow](.5,.5)--(17.5,24.5)--(17.5,0)--(.5,0)--cycle;} % Yellow triangle on the front cover by tikz code \bookcovercomponent{tikz}{bg front}{ - \fill[color=amiyellow](0,0)--(0,24.5)--(17,.5)--(17,0)--cycle;} + \fill[amiyellow](0,0)--(0,24.5)--(17,.5)--(17,0)--cycle;} % Yellow background color on the spine -\bookcovercomponent{color}{bg spine}{color=amiyellow} - -% Remark -\bookcovercomponent{center}{above front}{ - \color{red}\textsc{Annales Mathematicae et Informaticae} book cover -- outside} +\bookcovercomponent{color}{bg spine}{amiyellow} % Text on the spine \bookcovercomponent{center}{spine}{ - \rotatebox[origin=c]{90}{\footnotesize\bfseries - ANNALES MATHEMATICAE ET INFORMATICAE 43.\ (2014)}} + \rotatebox[origin=c]{90}{\footnotesize\bfseries + ANNALES MATHEMATICAE ET INFORMATICAE 43.~(2020)}} -% Text and pictures (summa.pdf, ekflogo.pdf) on the front cover +% Text and pictures on the front cover \bookcovercomponent{normal}{front}{ - \vspace{30.5mm} + \vspace{30mm} \centering {\huge\bfseries ANNALES\\ MATHEMATICAE ET\\ INFORMATICAE\\[13mm]} - {\large\bfseries TOMUS 43.\ (2014)}\\[10mm] + {\large\bfseries TOMUS 43.~(2020)}\\[10mm] \includegraphics{./figures/summa.pdf} \vfill {\large COMMISSIO REDACTORIUM}\\[3mm] @@ -43,14 +42,21 @@ {\large\bfseries HUNGARIA} \vspace{10mm}} +% Text on the back cover +\bookcovercomponent{normal}{back}{ + \vspace{30mm} + \centering + {\large\bfseries Contents}\\[5mm] + \parbox{126mm}{\lipsum[1-4]}} + \end{bookcover} -% The inside of the book cover +% The inside of the book cover \begin{bookcover} % Remark \bookcovercomponent{center}{above front}{ - \color{red}\textsc{Annales Mathematicae et Informaticae} book cover -- inside} + \textcolor{red}{\textsc{Annales Mathematicae et Informaticae} book cover -- inside}} % Text on the front cover (it is back of the inside book cover!) \bookcovercomponent{normal}{front}{ @@ -60,7 +66,7 @@ ANNALES MATHEMATICAE ET INFORMATICAE\\[3mm] International journal for mathematics and computer science\\[3mm] Referred by\\ - Zentralblatt für Mathematik\\ + Zentralblatt f\"{u}r Mathematik\\ and\\ Mathematical Reviews\\ \end{center} @@ -71,4 +77,4 @@ \end{bookcover} -\end{document}
\ No newline at end of file +\end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/bookcover/bookcover.dtx b/macros/latex/contrib/bookcover/bookcover.dtx index b9ab7e69cc..876bae7142 100644 --- a/macros/latex/contrib/bookcover/bookcover.dtx +++ b/macros/latex/contrib/bookcover/bookcover.dtx @@ -17,12 +17,12 @@ % \iffalse %<*driver> \ProvidesFile{bookcover.dtx} -\newcommand{\eifiledate}{2020/11/12} -\newcommand{\eifilever}{v2.4} +\newcommand{\eifiledate}{2020/11/16} +\newcommand{\eifilever}{v2.5} %</driver> %<class> -%<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01] -%<class>\ProvidesClass{bookcover}[2020/11/12 v2.4 class for book covers and dust jackets] +%<class>\NeedsTeXFormat{LaTeX2e}[2020/10/01] +%<class>\ProvidesClass{bookcover}[2020/11/16 v2.5 class for book covers and dust jackets] % %<*driver> \documentclass{ltxdoc} @@ -131,7 +131,7 @@ % % \section{Loading class} % The class \texttt{bookcover} requires the services of the class \texttt{article} and the following packages: -% \texttt{kvoptions}, \texttt{geometry}, \texttt{graphicx}, \texttt{calc}, \texttt{ifthen}, \texttt{tikz}, \texttt{fgruler}. +% \texttt{kvoptions}, \texttt{geometry}, \texttt{graphicx}, \texttt{calc}, \texttt{ifthen}, \texttt{tikz}, \texttt{environ}, \texttt{fgruler}. % % \medskip\noindent % Load the class as usual, with @@ -168,26 +168,29 @@ % \end{examplelst} % % \section{Creating book cover}\label{sec:mainmethod} -% \subsection{Commands} -% Use \commandinline{bookcover} environment to make a new book cover. In this environment, you can create a component of the book cover by the following command: +% \subsection{Commands and environments} +% Use \commandinline{bookcover} environment in the body of the document to make a new book cover. In this environment, you can create a component of the book cover by the following command or environment: % \begin{commandlst} % \bookcovercomponent{!<component type>!}{!<part>!}{!<content>!} % \end{commandlst} -% \meta{component type} See Subsection \ref{subsec:componenttypes}. -% -% \medskip\noindent -% \meta{part} See Subsection \ref{subsec:parts-main-method} or Section~\ref{sec:illustration-parts}. +% or +% \begin{commandlst} +% \begin{bookcoverelement}{!<component type>!}{!<part>!} +% !<content>! +% \end{bookcoverelement} +% \end{commandlst} +% See the subsection~\ref{subsec:componenttypes} for the description of \meta{component type}. You can read the description of \meta{part} in subsection~\ref{subsec:parts-main-method} and section~\ref{sec:illustration-parts}. The \meta{content} depends on the \meta{component type} (see subsection~\ref{subsec:componenttypes}). % % \medskip\noindent -% \meta{content} It depends on the \meta{component type}. See Subsection \ref{subsec:componenttypes}. +% Every |\bookcovercomponent| command and |bookcoverelement| environment generates a layer on the sheet. The first one generates the bottom layer and the last one generates the top layer. % % \medskip\noindent -% Every |\bookcovercomponent| generates a layer on the sheet. The first one generates the bottom layer and the last one generates the top layer. +% The following two examples are equivalent. % -% \bigskip\noindent\example +% \medskip\noindent\example % \begin{examplelst} % \begin{bookcover} -% \bookcovercomponent{color}{bg whole}{color=blue} +% \bookcovercomponent{color}{bg whole}{blue} % \bookcovercomponent{normal}{front}{ % \vspace{5cm} % \begin{center} @@ -196,8 +199,29 @@ % \end{bookcover} % \end{examplelst} % +% \noindent\example +% \begin{examplelst} +% \begin{bookcover} +% \begin{bookcoverelement}{color}{bg whole} +% blue +% \end{bookcoverelement} +% \begin{bookcoverelement}{normal}{front} +% \vspace{5cm} +% \begin{center} +% \bfseries\huge Book title +% \end{center} +% \end{bookcoverelement} +% \end{bookcover} +% \end{examplelst} +% +% \noindent Use \commandinline{bookcoverdescription} environment in the body of the document for adding the description of the book cover and other information. Don't use it in |bookcover| environment! You can set the page geometry of the description by the following command: +% \begin{commandlst} +% \bookcoverdescgeometry{!<geometry parameteres>!} +% \end{commandlst} +% See the \meta{geometry parameteres} in the |geometry| package. Its default value is |margin=1in|. See an example in the subsection~\ref{subsec:desc}. +% % \subsection{Parts}\label{subsec:parts-main-method} -% Important: The background parts are expanded onto the bleed, taking account of slight inaccuracy when trimming! +% It is important, that the background parts are expanded onto the bleed, taking account of slight inaccuracy when trimming! % \subsubsection{One-piece background parts} % \commandinline{bg back flap}, \commandinline{bg back}, \commandinline{bg spine}, \commandinline{bg front}, \commandinline{bg front flap} % @@ -223,7 +247,7 @@ % \end{center} % % \subsubsection{Combined parts} -% The following combined parts are defined. You can see illustrations in the Section~\ref{sec:illustration-parts}. +% The following combined parts are defined. You can see illustrations in the section~\ref{sec:illustration-parts}. % \begin{center} % \begin{tabular}{@{}>{\color{command}\ttfamily}l@{\hspace{1cm}}>{\color{command}\ttfamily}l@{}} % {\rmfamily\bfseries\textcolor{black}{background}}&{\rmfamily\bfseries\textcolor{black}{foreground}}\\ @@ -245,14 +269,11 @@ % \subsection{Component types}\label{subsec:componenttypes} % The following component types are defined: \commandinline{color}, \commandinline{picture}, \commandinline{tikz}, \commandinline{tikz clip}, \commandinline{normal}, \commandinline{center}, \commandinline{ruler}. % \subsubsection[color]{Component type: \texttt{color}} -% \begin{commandlst} -% \bookcovercomponent{color}{!<part>!}{!<colors>!} -% \end{commandlst} -% It determines the color of the part. +% It determines the color of the part. The \meta{content} is the options of the |\fill| in the \texttt{tikz} package: % -% \medskip\noindent -% \meta{colors} The options of the |\fill| in the \texttt{tikz} package:\label{page:color}\\ -% \indent\commandinline{color=!<color name>!} See \meta{color name} in the \texttt{xcolor} package.\\ +% \medskip +% \indent\commandinline{!<color name>!} (See it in the \texttt{xcolor} package.)\\ +% \indent\commandinline{color=!<color name>!} (It is equivalent to the previous one.)\\ % \indent\commandinline{top color=!<color name>!}\\ % \indent\commandinline{bottom color=!<color name>!}\\ % \indent\commandinline{middle color=!<color name>!}\\ @@ -261,43 +282,41 @@ % \indent\commandinline{ball color=!<color name>!}\\ % \indent\commandinline{shading angle=!<degree>!} It rotates the shading by the given angle. % -% \pagebreak\bigskip\noindent\example +% \bigskip\noindent\example +% \begin{examplelst} +% \bookcovercomponent{color}{bg whole without flaps}{red} +% \end{examplelst} +% +% \noindent\example\ It is equivalent to the previous example. % \begin{examplelst} -% \begin{bookcover} -% \bookcovercomponent{color}{bg whole without flaps}{ -% top color=white, bottom color=blue!50!black, shading angle=60} -% \end{bookcover} +% \bookcovercomponent{color}{bg whole without flaps}{color=red} +% \end{examplelst} +% +% \noindent\example +% \begin{examplelst} +% \bookcovercomponent{color}{bg whole without flaps}{ +% top color=white, bottom color=blue!50!black, shading angle=60} % \end{examplelst} % % \subsubsection[picture]{Component type: \texttt{picture}} -% \begin{commandlst} -% \bookcovercomponent{picture}{!<part>!}{!<picture file>!} -% \end{commandlst} -% The picture will be rescaled according to the sizes of the \meta{part}. +% The \meta{content} is a picture file, which will be rescaled according to the sizes of the \meta{part}. % % \bigskip\noindent\example % \begin{examplelst} -% \begin{bookcover} -% \bookcovercomponent{picture}{bg front flap}{fig.png} -% \end{bookcover} +% \bookcovercomponent{picture}{bg front flap}{fig.png} % \end{examplelst} % % \subsubsection[tikz]{Component type: \texttt{tikz}} -% \begin{commandlst} -% \bookcovercomponent{tikz}{!<part>!}{!<tikz code>!} -% \end{commandlst} -% The origin of the Ti\emph{k}Z figure is the lower left corner of the \meta{part}. Two rectangle nodes come into being: \commandinline{part} and \commandinline{trimmed part}. (Thanks to Zunbeltz Izaola for the idea.) +% The \meta{content} is a Ti\emph{k}Z code without |\tikz| command and |tikzpicture| environment. The origin of the Ti\emph{k}Z figure is the lower left corner of the \meta{part}. Two rectangle nodes come into being: \commandinline{part} and \commandinline{trimmed part}. (Thanks to Zunbeltz Izaola for the idea.) % % \bigskip\noindent\example % \begin{examplelst} -% \begin{bookcover} % \bookcovercomponent{tikz}{bg whole}{ % \fill[yellow] (part.south west) rectangle (part.north east); % \fill[gray] (trimmed part.south east) rectangle (trimmed part.north west); % \draw[green] (0,0) circle [radius=10mm];} % \bookcovercomponent{tikz}{bg spine}{ % \fill[orange] (part.center) circle [radius=8mm];} -% \end{bookcover} % \end{examplelst} % \begin{center} % \setlength{\fboxsep}{0pt}\setlength{\fboxrule}{.4pt} @@ -305,21 +324,16 @@ % \end{center} % % \subsubsection[tikz clip]{Component type: \texttt{tikz clip}} -% \begin{commandlst} -% \bookcovercomponent{tikz clip}{!<part>!}{!<tikz code>!} -% \end{commandlst} % It works the same as the \texttt{tikz} component type, but it clips the \meta{part}. % % \bigskip\noindent\example % \begin{examplelst} -% \begin{bookcover} % \bookcovercomponent{tikz clip}{bg whole}{ % \fill[yellow] (part.south west) rectangle (part.north east); % \fill[gray] (trimmed part.south east) rectangle (trimmed part.north west); % \draw[green] (0,0) circle [radius=10mm];} % \bookcovercomponent{tikz clip}{bg spine}{ % \fill[orange] (part.center) circle [radius=8mm];} -% \end{bookcover} % \end{examplelst} % \begin{center} % \setlength{\fboxsep}{0pt}\setlength{\fboxrule}{.4pt} @@ -327,43 +341,33 @@ % \end{center} % % \subsubsection[normal]{Component type: \texttt{normal}} -% \begin{commandlst} -% \bookcovercomponent{normal}{!<part>!}{!<content>!} -% \end{commandlst} % In this case, the \meta{content} is not specific. You can choose it as text or picture etc. % % \bigskip\noindent\example % \begin{examplelst} -% \begin{bookcover} -% \bookcovercomponent{normal}{front}{ -% \vspace{5cm} -% \begin{center} -% {\bfseries\huge Book title}\\[5mm] -% \includegraphics[width=6cm]{fig.png} -% \end{center}} -% \end{bookcover} +% \bookcovercomponent{normal}{front}{ +% \vspace{5cm} +% \begin{center} +% {\bfseries\huge Book title}\\[5mm] +% \includegraphics[width=6cm]{fig.png} +% \end{center}} % \end{examplelst} % % \subsubsection[center]{Component type: \texttt{center}} -% \begin{commandlst} -% \bookcovercomponent{center}{!<part>!}{!<content>!} -% \end{commandlst} % It works the same as the \texttt{normal} component type, but the position of the content is the center of the part (horizontally and vertically). % % \bigskip\noindent\example % \begin{examplelst} -% \begin{bookcover} -% \bookcovercomponent{center}{above front}{ -% \color{blue}Remark above front} -% \bookcovercomponent{center}{spine}{ -% \rotatebox[origin=c]{90}{\bfseries\Large Book title}} -% \end{bookcover} +% \bookcovercomponent{center}{above front}{ +% \textcolor{blue}{Remark above front}} +% \bookcovercomponent{center}{spine}{ +% \rotatebox[origin=c]{90}{\bfseries\Large Book title}} % \end{examplelst} % % \subsubsection[ruler]{Component type: \texttt{ruler}} -% Use the \texttt{ruler} component type to check the sizes of the part. +% Use the \texttt{ruler} component type to check the sizes of the part. The \meta{content} is % \begin{commandlst} -% \bookcovercomponent{ruler}{!<part>!}{\setruler[!<unit>!]{!<coordsys>!}{!<shift x>!}{!<shift y>!}{!<color>!}} +% \setruler[!<unit>!]{!<coordsys>!}{!<shift x>!}{!<shift y>!}{!<color>!} % \end{commandlst} % \meta{unit} The ruler unit:\\ % \indent\commandinline{cm} Metric ruler (centimeter). Default value.\\ @@ -382,14 +386,12 @@ % \medskip\noindent % \meta{color} The color of the ruler. % -% \pagebreak\bigskip\noindent\example +% \bigskip\noindent\example % \begin{examplelst} -% \begin{bookcover} -% \bookcovercomponent{ruler}{back}{\setruler{upper left}{0cm}{0cm}{blue}} -% \bookcovercomponent{ruler}{back}{\setruler{upper left}{2cm}{1cm}{black}} -% \bookcovercomponent{ruler}{front}{\setruler{lower right}{0cm}{0cm}{green}} -% \bookcovercomponent{ruler}{front}{\setruler{lower right}{2cm}{1cm}{gray}} -% \end{bookcover} +% \bookcovercomponent{ruler}{back}{\setruler{upper left}{0cm}{0cm}{blue}} +% \bookcovercomponent{ruler}{back}{\setruler{upper left}{2cm}{1cm}{black}} +% \bookcovercomponent{ruler}{front}{\setruler{lower right}{0cm}{0cm}{green}} +% \bookcovercomponent{ruler}{front}{\setruler{lower right}{2cm}{1cm}{gray}} % \end{examplelst} % \begin{center} % \setlength{\fboxsep}{0pt}\setlength{\fboxrule}{.4pt} @@ -467,9 +469,9 @@ % \settrimmedpart{\bleedwidth}{2\bleedwidth}{0pt}{\bleedwidth}\fi} % \begin{document} % \begin{bookcover} -% \bookcovercomponent{tikz}{bg half front}{ -% \fill[blue] (part.south west) rectangle (part.north east); -% \fill[green] (trimmed part.south west) rectangle (trimmed part.north east);} +% \bookcovercomponent{tikz}{bg half front}{ +% \fill[blue] (part.south west) rectangle (part.north east); +% \fill[green] (trimmed part.south west) rectangle (trimmed part.north east);} % \end{bookcover} % \end{document} % \end{examplelst} @@ -482,23 +484,27 @@ % \includepdf[pages=27-35,pagecommand={}]{figures/parts.pdf} % \includepdf[pages=43-52,pagecommand={\subsection{Foreground parts (cover widthout flaps)}}]{figures/parts.pdf} % -% \newpage\section{Full examples} +% \newpage\section{Examples} % \subsection{A dust jacket} -% \lstinputlisting[style=examplefile]{bookcover-example1.tex} % \begin{center} % \setlength{\fboxsep}{0pt}\setlength{\fboxrule}{.4pt} % \fcolorbox{black!50}{white}{\includegraphics[width=\textwidth-.8pt]{bookcover-example1}}\label{page:example1} % \end{center} +% \lstinputlisting[style=examplefile]{bookcover-example1.tex} % -% \subsection{A two-sided book cover} -% \lstinputlisting[style=examplefile]{bookcover-example2.tex} +% \newpage\subsection{A two-sided book cover} % \begin{center} % \setlength{\fboxsep}{0pt}\setlength{\fboxrule}{.4pt}% % \fcolorbox{black!50}{white}{\includegraphics[page=1,width=\textwidth-.8pt]{bookcover-example2}}\\[5mm] % \fcolorbox{black!50}{white}{\includegraphics[page=2,width=\textwidth-.8pt]{bookcover-example2}} % \end{center} +% \newpage\lstinputlisting[style=examplefile]{bookcover-example2.tex} % -% \newpage\subsection{Barcode} +% \subsection{Barcode} +% \begin{center} +% \setlength{\fboxsep}{0pt}\setlength{\fboxrule}{.4pt} +% \fcolorbox{black!50}{white}{\includegraphics[width=\textwidth-.8pt]{figures/barcode}} +% \end{center} % \begin{examplelst} % \documentclass{bookcover} % \usepackage{pst-barcode} @@ -521,11 +527,31 @@ % \end{examplelst} % In this case, the \texttt{pdflatex} or \texttt{lualatex} must be called with the \texttt{-shell-escape} option. % -% \bigskip -% \begin{center} -% \setlength{\fboxsep}{0pt}\setlength{\fboxrule}{.4pt} -% \fcolorbox{black!50}{white}{\includegraphics[width=\textwidth-.8pt]{figures/barcode}} -% \end{center} +% \subsection{Adding description}\label{subsec:desc} +% \begin{examplelst} +% \documentclass{bookcover} +% \usepackage[latin]{babel} +% \usepackage{lipsum,multicol} +% \bookcoverdescgeometry{vmargin=25mm,hmargin=9cm} +% +% \begin{document} +% +% \begin{bookcoverdescription} +% \title{Description} +% \author{John Taylor} +% \date{} +% \maketitle +% \begin{multicols}{3} +% \lipsum +% \end{multicols} +% \end{bookcoverdescription} +% +% \begin{bookcover} +% % book cover components +% \end{bookcover} +% +% \end{document} +% \end{examplelst} % % \StopEventually{} % @@ -552,12 +578,13 @@ %% CLASS AND PACKAGES \LoadClass{article} -\RequirePackage{geometry,graphicx,calc,ifthen,tikz} +\RequirePackage{geometry,graphicx,calc,ifthen,tikz,environ} \RequirePackage[nonefgrulers]{fgruler} %% PAGE STYLE \pagestyle{empty} +\def\ps@plain{} %% NEW IF @@ -606,10 +633,6 @@ paperwidth=2\marklength+2\bleedwidth+2\coverwidth+2\flapwidth+\spinewidth, paperheight=2\marklength+2\bleedwidth+\coverheight} -%% NO PARAGRAPH INDENTATION - -\setlength{\parindent}{0pt} - %% INTERNAL LENGTHS SETTING \def\bookcover@xpos#1{\setlength{\bookcover@xpos@}{#1}} @@ -627,6 +650,18 @@ \let\setpartheight\bookcover@partheight \let\settrimmedpart\bookcover@tikz@trimmed@part@param +%% BOOKCOVERDESCGEOMETRY + +\def\bookcoverdescgeometry#1{\def\bookcover@descgeometry{#1}} +\def\bookcover@descgeometry{margin=1in} + +%% BOOKCOVERDESCRIPTION + +\newenvironment{bookcoverdescription}{% + \if@inbookcoverenv\@latexerr{Don't use 'bookcoverdescription' in 'bookcover' environment!}{}\fi}{} +\AddToHook{env/bookcoverdescription/before}{\expandafter\newgeometry\expandafter{\bookcover@descgeometry}} +\AddToHook{env/bookcoverdescription/after}{\restoregeometry} + %% POSBOX \newcommand{\bookcover@posbox}[4]{% @@ -746,6 +781,7 @@ \def\bookcover{% \@inbookcoverenvtrue% \newpage% + \noindent% \begin{picture}(\paperwidth,\paperheight)(0,-\paperheight)} \def\endbookcover{% @@ -772,6 +808,10 @@ \ifdim\bookcover@partheight@>0mm \csname bookcover@componenttype@#1\endcsname{#3}\fi\fi\fi}}} +%% BOOKCOVERELEMENT ENVIRONMENT + +\NewEnviron{bookcoverelement}[2]{\bookcovercomponent{#1}{#2}{\BODY}} + %% NEW BOOKCOVER PART \def\newbookcoverpart#1#2{ @@ -821,7 +861,7 @@ %% COMPONENT TYPES \newbookcovercomponenttype{color}{ - \tikz\fill[#1] (0,0) rectangle (\bookcover@partwidth@,\bookcover@partheight@);} + \tikz\fill\expandafter[#1] (0,0) rectangle (\bookcover@partwidth@,\bookcover@partheight@);} \newbookcovercomponenttype{picture}{ \includegraphics[width=\bookcover@partwidth@,height=\bookcover@partheight@]{#1}} diff --git a/macros/latex/contrib/bookcover/bookcover.pdf b/macros/latex/contrib/bookcover/bookcover.pdf Binary files differindex 997c774ba3..b6c800cfc6 100644 --- a/macros/latex/contrib/bookcover/bookcover.pdf +++ b/macros/latex/contrib/bookcover/bookcover.pdf diff --git a/macros/latex/contrib/bookcover/figures/barcode.pdf b/macros/latex/contrib/bookcover/figures/barcode.pdf Binary files differindex 8ebc815498..f06b38799f 100644 --- a/macros/latex/contrib/bookcover/figures/barcode.pdf +++ b/macros/latex/contrib/bookcover/figures/barcode.pdf diff --git a/macros/latex/contrib/mismath/mismath.dtx b/macros/latex/contrib/mismath/mismath.dtx index 769ee63a87..a2c59ce7e8 100644 --- a/macros/latex/contrib/mismath/mismath.dtx +++ b/macros/latex/contrib/mismath/mismath.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2019 by Antoine Missier <antoine.missier@ac-toulouse.fr> +% Copyright (C) 2019-2020 by Antoine Missier <antoine.missier@ac-toulouse.fr> % % This file may be distributed and/or modified under the conditions of % the LaTeX Project Public License, either version 1.3 of this license @@ -20,7 +20,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{mismath} - [2019/12/27 v1.7 .dtx mismath file] + [2020/11/15 v1.8 .dtx mismath file] %</package> %<*driver> \documentclass{ltxdoc} @@ -58,7 +58,7 @@ %</driver> % \fi % -%% \CheckSum{1867} +%% \CheckSum{419} % % \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 @@ -94,6 +94,8 @@ % \changes{v1.5}{2019/06/22}{small corrections in documentation} % \changes{v1.6}{2019/09/06}{Removing mathfixs package} % \changes{v1.7}{2019/12/27}{Adding a table of contents to the documentation} +% \changes{v1.8}{2020/11/15}{Incompatibility and solution mentioned when using i +% with accent in beamer titles small changes in documentation} % % \GetFileInfo{mismath.sty} % @@ -101,7 +103,7 @@ % corresponds to \textsf{mismath}~\fileversion, dated \filedate. % Thanks to François Bastouil for help in English translation.}} % \author{Antoine Missier \\ \texttt{antoine.missier@ac-toulouse.fr}} -% \date{December 27, 2019} +% \date{November 15, 2020} % % \maketitle % \tableofcontents @@ -161,8 +163,8 @@ % % \medskip % A recommendation, seldom observed, is to typeset uppercase Greek letters in italic shape -% like other variables~\cite{ICTNS}. This is automatically done with the \textsf{fixmath} package -% by Walter Schmidt~\cite{FIXM}, +% like other variables~\cite{ICTNS}. This is automatically done with +% the \textsf{fixmath} package by Walter Schmidt~\cite{FIXM}, % but this feature is not implemented in \textsf{mismath} because this rule is conflicting % to the one used for instance in France where all mathematics capitals % have to be typeset in upright shape\footnote{The \textsf{frenchmath} package~\cite{FR} @@ -189,22 +191,26 @@ % \DescribeMacro{\e} \DescribeMacro{\i} \DescribeMacro{\j} % the package provides |\e| command for the base of the natural logarithm % and |\i| or |\j| for imaginary numbers. -% One can notice that |\i| and |\j| already exist in \LaTeX: +% Let's notice that |\i| and |\j| already exist in \LaTeX: % using in LR mode, they produce ``\i'' and ``\j'' without the point -% so one can place accents on them, and in mathematical mode they produce +% so you can place accents on them, and in mathematical mode they produce % ``Latex warning: Command invalid in math mode''. -% Redefining |\i| and |\j| only concerns mathematical mode. +% Redefining |\i| and |\j| concerns only mathematical mode\footnote{Due to this +% \texttt{\bslash i} command redefinition, there is an incompatibility with +% \textsf{beamer} when using i with accents in beamer titles. +% A solution is to use the classic \texttt{\bslash \textasciicircum i} +% command to produce î in beamer titles for example.}. % % \medskip % \DescribeMacro{\enumber} \DescribeMacro{\inumber} \DescribeMacro{\jnumber} -% Nevertheless, it can be tiresome to type a lot of backslashes in a document with many formulas -% containing $\e$ or $\i$. +% Nevertheless, it can be tiresome to type a lot of backslashes in a document +% with many formulas containing $\e$ or $\i$. % So a way is proposed here to free of it by placing |\enumber|, |\inumber| or |\jnumber| % in the preamble: % $\e$, $i$ or $\j$ will then automatically be set in upright shape % in the whole document, no need to type |\e|, |\i| or |\j|, % let's hope that there are not many other $\mathit{e}$, $\mathit{i}$ or $j$ as variables. -% However, one can still get italicized +% However, you can still get italicized % $\mathit{e}$, $\mathit{i}$ or $\mathit{j}$ with \LaTeX\ command % |\mathit| or |\mathnormal|. Of course, this does not fully comply with \LaTeX\ philosophy: % in the document body, objects should be pointed out @@ -431,7 +437,8 @@ % in \LaTeX, are also provided by \textsf{mismath}: % \begin{center} % \begin{tabular}{rlrlrl} -% |\arccot| & $\arccot$\qquad\mbox{} & |\arsinh| & $\arsinh$\qquad\mbox{} & |\arcoth| & $\arcoth$\\ +% |\arccot| & $\arccot$\qquad\mbox{} & |\arsinh| & $\arsinh$\qquad\mbox{} +% & |\arcoth| & $\arcoth$ \\ % |\sech| & $\sech$ & |\arcosh| & $\arcosh$ & |\arsech| & $\arsech$ \\ % |\csch| & $\csch$ & |\artanh| & $\artanh$ & |\arcsch| & $\arcsch$ % \end{tabular} @@ -445,19 +452,19 @@ % \subsection{A few useful aliases} % % In the tradition of Bourbaki and D.~Knuth, proper use requires -% that classics sets of numbers are typeset in bold roman: +% that classic sets of numbers are typeset in bold roman: % $\R, \C, \Z, \N, \Q$, -% ``openwork'' letters ($\mathbb{R}, \mathbb{Z}, \ldots$) -% being restricted to writing at blakboard~\cite{LSHORT}; +% whereas ``openwork'' letters ($\mathbb{R}, \mathbb{Z}, \ldots$) +% are reserved for writing at blakboard~\cite{LSHORT}; % and likewise to designate a field: $\F$ or $\K$ (Körper in German). -% We get these symbols with the following macros: +% We get these symbols with the macros: % \begin{center} % |\R|, |\C|, |\Z|, |\N|, |\Q|, |\F|, |\K|. % \end{center} % % \DescribeMacro{\mathset} -% The |\mathset| command enables to change in a global way the behavior of all these macros: -% by default, |\mathset| is an alias for |\mathbf|, but if one prefer openwork letters, +% The |\mathset| command enables to change the behavior of all these macros in a global way: +% by default, |\mathset| is an alias for |\mathbf|, but if you prefer openwork letters, % just place |\renewcommand\mathset{\mathbb}| in the preamble, % after loading \textsf{amsfonts} package (which provides the ``blackboard bold'' typeface, % also loaded by \textsf{amssymb}). @@ -489,7 +496,7 @@ % \DescribeMacro{\lbar} \DescribeMacro{\hlbar} % Large bars over expressions are obtained with |\overline| % or, shorter, its alias |\lbar|, to get for instance $\lbar{z_1z_2}$. -% Such as for vectors, one can raise the bar (from the height of $h$) with +% Such as for vectors, you can raise the bar (from the height of $h$) with % the |\hlbar| command, in order to correct uneven bars heights. % \begin{center} % $\lbar{z+z'}=\lbar{z}+\lbar{z'}$ is less than $\lbar{z+z'}=\hlbar{z}+\lbar{z'}$, @@ -572,7 +579,6 @@ % $\sin\left(\frac{\pi}{3}\right)\mul 2$ is less than $\sin\paren{\frac{\pi}{3}}\mul 2$ % obtained with \\[1ex] |\sin\paren{\frac{\pi}{3}}\mul 2|. % \end{center} -% \pagebreak ^^A for proper positioning of the footnote % % \DescribeMacro{\pow} % When typesetting an exponent after a closing \emph{big} parenthesis produced by |\right)|, @@ -620,13 +626,13 @@ % \end{cases}$ % \end{center} % In our code, $[$ and $]$ symbols are not defined anymore as delimiters. -% One can regret it because a line break could occur between the two, -% but in addition to the fact that it works very well like that for spaces -% (because these symbols are most of the time preceded or followed by relational, -% binary or punctuation symbols), it is always possible to transform them +% Thereby a line break could occur between the two, but +% it is always possible to transform them % into delimiters with |\left| and |\right|\footnote{Is \LaTeX\ definition % of [ as |mathopen| really appropriate % where this symbol could almost also logically have been defined as |mathclose|?}. +% And consider that these symbols are most of the time preceded or followed by relational, +% binary or punctuation symbols and therefore spaces are correct without a delimiter definition. % % \subsection{Environments for systems of equations and small matrices} % @@ -649,7 +655,7 @@ % from \textsf{amsmath} package, although \texttt{cases} places mathematical expressions % closer to the bracket (which makes sense considering it's use). % |\systemsep| enables to set the gap between the bracket and the expressions, -% set by default to |\medspace|. This gap may be reduce, for instance: +% set by default to |\medspace|. This gap may be reduced, for instance: % |\renewcommand{\systemsep}{\thinspace}|, % or enlarged with |\thickspace| (and with |\renewcommand\systemsep}{}| % we get back to what \texttt{cases} do). @@ -722,8 +728,8 @@ % \subsection{Displaymath in double columns} % % \DescribeEnv{mathcols} -% The \texttt{mathcols} environment activates mathematical mode and enables to arrange ``long'' -% calculation in double columns, separated with a central rule, +% The \texttt{mathcols} environment activates mathematical mode and enables to arrange +% ``long''calculation in double columns, separated with a central rule, % as shown in the following example. % But you have to load the \textsf{multicol} package in the preamble. % \begin{mathcols} @@ -754,6 +760,7 @@ %\end{mathcols} % \end{verbatim} % +% \StopEventually{} % \vspace{-4ex} % \section{Implementation} % @@ -1001,11 +1008,11 @@ % Günter Milde, CTAN, v0.6.1 04/06/2012. % \bibitem{INT} \emph{The \textsf{interval} package}. Lars Madsen, CTAN, % v0.3 2014/08/04. -% \bibitem{SYST} \emph{L'extension pour \TeX\ et \LaTeX\ \textsf{systeme}}. Christian Tellechea, -% CTAN v0.32 2019/01/13. +% \bibitem{SYST} \emph{L'extension pour \TeX\ et \LaTeX\ \textsf{systeme}}. +% Christian Tellechea, CTAN v0.32 2019/01/13. % \bibitem{SPAL} \emph{The \textsf{spalign} package}. Joseph Rabinoff, CTAN, 2016/10/05. -% \bibitem{FR} \emph{L'extension \textsf{frenchmath}}. Antoine Missier, CTAN, v1.4 2019/05/22. -% \bibitem{LSHORT} \emph{The Not So Short Introduction to \LaTeXe}. \texttt{lshort} package by +% \bibitem{FR} \emph{L'extension \textsf{frenchmath}}. Antoine Missier, CTAN, v1.5 2020/11/02. +% \bibitem{LSHORT} \emph{The Not So Short Introduction to \LaTeXe}. \textsf{lshort} package by % Tobias Oetiker, Hubert Partl, Irene Hyna and Elisabeth Schlegl, CTAN, v6.2 2018/02/28. % \bibitem{COMP} \emph{The \LaTeX\ Companion}. Frank Mittelbach, Michel Goossens, % Johannes Braams, David Carlisle, Chris Rowley, 2nd edition, Pearson Education, 2004. diff --git a/macros/latex/contrib/mismath/mismath.ins b/macros/latex/contrib/mismath/mismath.ins index 13befa8d37..e1eb94888b 100644 --- a/macros/latex/contrib/mismath/mismath.ins +++ b/macros/latex/contrib/mismath/mismath.ins @@ -1,5 +1,5 @@ %% -%% Copyright (C) 2019 by Antoine Missier <antoine.missier@ac-toulouse.fr> +%% Copyright (C) 2019-2020 by Antoine Missier <antoine.missier@ac-toulouse.fr> %% %% This file may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3 of this license @@ -21,7 +21,7 @@ This is a generated file. -Copyright (C) 2019 by Antoine Missier <antoine.missier@ac-toulouse.fr> +Copyright (C) 2019-2020 by Antoine Missier <antoine.missier@ac-toulouse.fr> This file may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license diff --git a/macros/latex/contrib/mismath/mismath.pdf b/macros/latex/contrib/mismath/mismath.pdf Binary files differindex 58aae8e92d..236b631abf 100644 --- a/macros/latex/contrib/mismath/mismath.pdf +++ b/macros/latex/contrib/mismath/mismath.pdf diff --git a/macros/latex/contrib/philosophersimprint/Makefile b/macros/latex/contrib/philosophersimprint/Makefile index cbd49e7d9c..9075e9f197 100644 --- a/macros/latex/contrib/philosophersimprint/Makefile +++ b/macros/latex/contrib/philosophersimprint/Makefile @@ -3,7 +3,7 @@ # # This file is in public domain # -# $Id: Makefile,v 1.9 2016/08/01 18:43:56 boris Exp $ +# $Id: Makefile,v 1.10 2020/11/16 20:28:01 boris Exp $ # PACKAGE=philosophersimprint @@ -55,6 +55,6 @@ distclean: clean # Archive for the distribution. Includes typeset documentation # archive: all clean - tar -czvf $(PACKAGE).tgz -C .. --exclude '*~' \ + COPYFILE_DISABLE=1 tar -czvf $(PACKAGE).tgz -C .. --exclude '*~' \ --exclude '*.tgz' --exclude CVS \ --transform 's/latex/$(PACKAGE)/' latex diff --git a/macros/latex/contrib/philosophersimprint/README b/macros/latex/contrib/philosophersimprint/README index e7b1e50d68..a9ba7129d7 100644 --- a/macros/latex/contrib/philosophersimprint/README +++ b/macros/latex/contrib/philosophersimprint/README @@ -16,6 +16,10 @@ articles in the ``Web-ready'' format. We do not assume the authors have any commercial fonts installed on their machines. The class uses only freely available and freely distributed fonts. +Changes in version 1.5 + + - Footnote typesetting changes + Changes in version 1.4 - Typesetting improvements. diff --git a/macros/latex/contrib/philosophersimprint/philosophersimprint.dtx b/macros/latex/contrib/philosophersimprint/philosophersimprint.dtx index 34e537bb44..9f710a2589 100644 --- a/macros/latex/contrib/philosophersimprint/philosophersimprint.dtx +++ b/macros/latex/contrib/philosophersimprint/philosophersimprint.dtx @@ -1,8 +1,8 @@ % \iffalse %<*gobble> -% $Id: philosophersimprint.dtx,v 1.44 2016/07/20 20:15:04 boris Exp $ +% $Id: philosophersimprint.dtx,v 1.45 2020/11/11 01:28:17 boris Exp $ % -% Copyright 2007, Boris Veytsman <boris@varphi.com> +% Copyright 2007-2020, Boris Veytsman <boris@varphi.com> % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either % version 1.3 of this license or (at your option) any @@ -20,7 +20,7 @@ % derived file philosophersimprint.cls % % \fi -% \CheckSum{808} +% \CheckSum{806} % % %% \CharacterTable @@ -52,7 +52,7 @@ \ProvidesFile{philosophersimprint.dtx} %</gobble> %<class>\ProvidesClass{philosophersimprint} -[2016/07/20 v1.4 Typesetting articles for Philosophers' Imprint] +[2020/11/10 v1.5 Typesetting articles for Philosophers' Imprint] %<*gobble> % \end{macrocode} % @@ -98,7 +98,7 @@ % \GetFileInfo{philosophersimprint.dtx} % \newcommand{\progname}[1]{\textsf{#1}} % \title{Typesetting Articles For Online Journal \emph{Philosophers' -% Imprint}\thanks{\copyright 2007, Boris Veytsman}} +% Imprint}\thanks{\copyright 2007--2020, Boris Veytsman}} % \author{Boris Veytsman\thanks{% % \href{mailto:borisv@lk.net}{\texttt{borisv@lk.net}}, % \href{mailto:boris@varphi.com}{\texttt{boris@varphi.com}}}} @@ -1062,6 +1062,7 @@ % \end{macro} % % \begin{macro}{\titleimage} +% \changes{v1.5}{2020/11/10}{Default title image is now a string} % \begin{macro}{\affiliation} % \begin{macro}{\copyrightinfo} % \begin{macro}{\subject} @@ -1069,7 +1070,7 @@ % A bunch of one parameter macros % \begin{macrocode} \newcommand*{\titleimage}[1]{\gdef\@titleimage{#1}} -\titleimage{} +\titleimage{NoSuchImageDotUse.pdf} \newcommand*{\affiliation}[1]{\gdef\@affiliation{#1}} \affiliation{} \newcommand*{\copyrightinfo}[1]{\gdef\@copyrightinfo{#1}} @@ -1380,15 +1381,14 @@ % \begin{macro}{\@makfntext} % \changes{v0.7}{2007/04/19}{Introduced new footnote formatting} % \changes{v1.1}{2011/11/25}{Changed indentation} +% \changes{v1.5}{2020/11/10}{Changed indentation again} % The journal prefers footnotes with text footnote marks and hanging % indentation % \begin{macrocode} \renewcommand\@makefntext[1]{% - \bgroup - \parindent2\PHIM@baselength\relax - \everypar{\hangindent=\PHIM@baselength\hangafter=1}% - \noindent - \makebox[\PHIM@baselength][l]{\@thefnmark.}#1\egroup} + \@tempdima=\hsize + \advance\@tempdima by -\PHIM@baselength\relax + \makebox[\PHIM@baselength][l]{\@thefnmark.}\parbox[t]{\@tempdima}{#1}} % \end{macrocode} % \end{macro} % diff --git a/macros/latex/contrib/philosophersimprint/philosophersimprint.pdf b/macros/latex/contrib/philosophersimprint/philosophersimprint.pdf Binary files differindex b2c800d4d8..03f00474c3 100644 --- a/macros/latex/contrib/philosophersimprint/philosophersimprint.pdf +++ b/macros/latex/contrib/philosophersimprint/philosophersimprint.pdf diff --git a/macros/latex/contrib/philosophersimprint/sample.pdf b/macros/latex/contrib/philosophersimprint/sample.pdf Binary files differindex e93d674996..6ea86dce69 100644 --- a/macros/latex/contrib/philosophersimprint/sample.pdf +++ b/macros/latex/contrib/philosophersimprint/sample.pdf diff --git a/macros/latex/contrib/skdoc/Makefile b/macros/latex/contrib/skdoc/Makefile index f742f13777..d2d1103f27 100644 --- a/macros/latex/contrib/skdoc/Makefile +++ b/macros/latex/contrib/skdoc/Makefile @@ -22,7 +22,7 @@ distclean: clean %.cls: %.dtx tex $< -%.pdf: %.dtx +%.pdf: %.dtx %.cls pdflatex -interaction=nonstopmode -halt-on-error $< makeglossaries $* biber $* diff --git a/macros/latex/contrib/skdoc/README b/macros/latex/contrib/skdoc/README index b50b6c83d3..a743243ef2 100644 --- a/macros/latex/contrib/skdoc/README +++ b/macros/latex/contrib/skdoc/README @@ -17,7 +17,7 @@ %% This work consists of the files skdoc.dtx %% and the derived filebase skdoc.cls. -This is version 1.5c of the skdoc document class. It is designed to +This is version 1.5d of the skdoc document class. It is designed to generate both documentation and derivative files using only LaTeX, i.e. without using docstrip and ins/dtx files. diff --git a/macros/latex/contrib/skdoc/skdoc.dtx b/macros/latex/contrib/skdoc/skdoc.dtx index 19d086a975..d780344712 100644 --- a/macros/latex/contrib/skdoc/skdoc.dtx +++ b/macros/latex/contrib/skdoc/skdoc.dtx @@ -73,7 +73,7 @@ %</driver> %<class>\ProvidesExplClass{skdoc} %<*class> - {2020/08/24}{1.5c}{skdoc documentation class} + {2020/11/16}{1.5d}{skdoc documentation class} %</class> % %<*driver> @@ -132,7 +132,7 @@ % {}{\small\pagemark} % \pagestyle{skdoc-class} % -% \version{1.5c} +% \version{1.5d} % \changes{1.0}{Initial version} % \changes{1.1}{Added support for syntax highlighting using \pkg{minted}} % \changes{1.1a}{Deprecate the use of \pkg{bibtex} in favour of \pkg{biblatex}} @@ -147,6 +147,7 @@ % \changes{1.5a}{Track \pkg{expl3} changes (thanks to Felix Faltin)} % \changes{1.5b}{Track \pkg{expl3} changes (thanks to Phelype Oleinik). Replace \pkg{opensans} option \opt{osfigures} with \opt{oldstyle} (\#40)} % \changes{1.5c}{Replace \pkg{scrpage} package with \pkg{scrlayer-scrpage} (thanks to Daniel Wunderlich)} +% \changes{1.5d}{Use compatibiltiy levels for \pkg{scrartcl} (\#44)} % \iffalse %%% Don't forget to update the version number and release date of %%% the package declaration on line 76! @@ -774,9 +775,10 @@ \LoadClass[ DIV7, headings=big, numbers=noenddot, - abstracton, + abstract=true, bibliography=totocnumbered, - index=totoc + index=totoc, + version=3.32 ]{scrartcl} % \end{macrocode} % These packages are basic low-level things that we use to declare diff --git a/macros/latex/contrib/skdoc/skdoc.pdf b/macros/latex/contrib/skdoc/skdoc.pdf Binary files differindex 4e0de82cc7..b526539c1f 100644 --- a/macros/latex/contrib/skdoc/skdoc.pdf +++ b/macros/latex/contrib/skdoc/skdoc.pdf |