diff options
author | Norbert Preining <norbert@preining.info> | 2020-09-18 03:02:31 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-09-18 03:02:31 +0000 |
commit | ddb3152d62e8d537f5763752d33a9dc1d5f0ba99 (patch) | |
tree | 35c24d9bda1861407fee139abd013858810adc77 /macros/latex | |
parent | c3b4471e847c09c37a8d2587bdd0e88aaee1b124 (diff) |
CTAN sync 202009180302
Diffstat (limited to 'macros/latex')
101 files changed, 384 insertions, 248 deletions
diff --git a/macros/latex/contrib/caption/CHANGELOG b/macros/latex/contrib/caption/CHANGELOG index d228e25176..089a3caa59 100644 --- a/macros/latex/contrib/caption/CHANGELOG +++ b/macros/latex/contrib/caption/CHANGELOG @@ -120,7 +120,7 @@ v3.4 (2019/09/11) v3.5 (2020/08/30) - If a document class defines \caption@documentclass, an adaption to the caption package will be loaded as caption-<documentclass>.sto -- New commands \SetCaptionDefault and \AtCaptionPackage for usage in document classes or document class adaptions +- New commands \SetCaptionDefault, \AtCaptionPackage, and \AfterCaptionPackage for usage in document classes or document class adaptions - Document class support re-written (using the new commands above) - New commands \caption@switchdefault and \caption@restoredefault for usage in babel language packages - Babel language support re-written (using the new commands above); furthermore it's independent on the load order now diff --git a/macros/latex/contrib/caption/README b/macros/latex/contrib/caption/README index c89bc341d7..fc4002ca49 100644 --- a/macros/latex/contrib/caption/README +++ b/macros/latex/contrib/caption/README @@ -1,7 +1,7 @@ ========================================================================== The `caption' package bundle -Release 2020-09-11 +Release 2020-09-17 Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) License: LPPL = LaTeX Project Public Licence diff --git a/macros/latex/contrib/caption/caption-eng.pdf b/macros/latex/contrib/caption/caption-eng.pdf Binary files differindex d7744c25d0..781d10e0c4 100644 --- a/macros/latex/contrib/caption/caption-eng.pdf +++ b/macros/latex/contrib/caption/caption-eng.pdf diff --git a/macros/latex/contrib/caption/caption-eng.tex b/macros/latex/contrib/caption/caption-eng.tex index 8a10baffd0..a26aa0ca3b 100644 --- a/macros/latex/contrib/caption/caption-eng.tex +++ b/macros/latex/contrib/caption/caption-eng.tex @@ -31,7 +31,7 @@ % caption-deu.tex, caption-eng.tex, caption-rus.tex. % \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesFile{caption-eng.tex}[2020/08/30 v3.5 The caption package] +\ProvidesFile{caption-eng.tex}[2020/09/12 v3.5 The caption package] \hbadness=9999 \newcount\hbadness \hfuzz=20pt % Make TeX shut up. %\errorcontextlines=3 @@ -4184,7 +4184,7 @@ and \package{subfig} packages even if the \package{caption} package isn't loaded But some adaptions have to be done for the \package{caption} package, and for this reason the hook -\begin{quote}|\At|\-|Caption|\-|Package|\marg{code}\end{quote} +\begin{quote}|\AtCaptionPackage|\marg{code}\end{quote} is offered to authors of adaption files. The \meta{code} inside the hook will be executed right before the given package options will be evaluated. @@ -4192,7 +4192,14 @@ options will be evaluated. For example the adaption file for the \KOMAScript\ document classes uses |\At|\-|Begin|\-|Caption| to re-define the \package{caption} package options |figure|\-|position| and |table|\-|position| to issue a warning -that using these options has little effect here. +that using these options have little effect here. + +\DescribeMacro{\AfterCaptionPackage} +The additional hook +\begin{quote}|\AfterCaptionPackage|\marg{code}\end{quote} +is offered to authors of adaption files as well. +The \meta{code} inside the hook will be executed at the very end of the +\package{caption} package. % --------------------------------------------------------------------------- % diff --git a/macros/latex/contrib/caption/caption-koma.dtx b/macros/latex/contrib/caption/caption-koma.dtx index 1cd5f85671..dc76dbad1c 100644 --- a/macros/latex/contrib/caption/caption-koma.dtx +++ b/macros/latex/contrib/caption/caption-koma.dtx @@ -193,7 +193,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesFile{caption-koma.sto}[2020/08/22 v2.0 Adaption of the caption package to the KOMA-Script document classes (AR)] +\ProvidesFile{caption-koma.sto}[2020/09/12 v2.0a Adaption of the caption package to the KOMA-Script document classes (AR)] % \end{macrocode} % % \section{Margin resp. width} @@ -408,13 +408,14 @@ % Furthermore we take over the caption related settings from the \KOMAScript\ classes. % % \begin{macro}{\if@captionabove} -% \changes{v1.0j}{2006/03/21}{Bugfix 06-03-21: \cs{let}\cs{caption@setposition}\cs{@gobble} added} +% \changes{v1.0j}{2006/03/21}{Bugfix 2006-03-21: \cs{let}\cs{caption@setposition}\cs{@gobble} added} % \changes{v1.0n}{2006/03/09}{Accidentally this got broken in \version{1.0m}, fixed} % \changes{v1.1}{2007/03/31}{We redefine \cs{captionabovetrue/false} now instead of \cs{captionabove/below}} -% \changes{v1.1a}{2007/09/14}{Bugfix 07-09-14: Redefinition of \cs{@captionabovetrue} \& \cs{@captionabovefalse} for \env{longtable} added} +% \changes{v1.1a}{2007/09/14}{Bugfix 2007-09-14: Redefinition of \cs{@captionabovetrue} \& \cs{@captionabovefalse} for \env{longtable} added} % \changes{v1.1g}{2008/03/01}{\cs{def} changed to \cs{g@addto@macro}} % \changes{v1.1k}{2009/10/09}{\opt{figureposition} and \opt{tableposition} will issue a warning now} % \changes{v1.8e}{2019/09/11}{\opt{figureposition} and \opt{tableposition} will now set the position anyway since it could be used by other packages} +% \changes{v2.0a}{2020/09/12}{Faulty \cs{AtBeginCaption} replaced with correct \cs{AfterCaptionPackage}} % Patch |\@captionabovetrue| and |\@captionabovefalse| so they will set the \package{caption3} position setting, too. % Note that these are stronger than the \opt{position} setting, therefore we override the options % \opt{figureposition} and \opt{tableposition} to typeout a warning. @@ -431,7 +432,7 @@ % \end{macrocode} % |\captionabove| \& |\captionbelow| for longtable: % \begin{macrocode} -\AtBeginCaption{\caption@AtBeginLongtable{% +\AfterCaptionPackage{\caption@AtBeginLongtable{% \def\@captionabovetrue{\LT@captionsetup{position=t}}% \def\@captionabovefalse{\LT@captionsetup{position=b}}}} % \end{macrocode} diff --git a/macros/latex/contrib/caption/caption.dtx b/macros/latex/contrib/caption/caption.dtx index 1068796a87..3e79199f55 100644 --- a/macros/latex/contrib/caption/caption.dtx +++ b/macros/latex/contrib/caption/caption.dtx @@ -32,7 +32,7 @@ % caption-deu.tex, caption-eng.tex, caption-rus.tex. % % \fi -% \CheckSum{2690} +% \CheckSum{2697} % % \iffalse %<*driver> @@ -217,13 +217,13 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption}[2020/09/02 v3.5a Customizing captions (AR)] +\ProvidesPackage{caption}[2020/09/12 v3.5b Customizing captions (AR)] % \end{macrocode} % % \section{Loading the kernel} % % \begin{macrocode} -\RequirePackage{caption3}[2020/08/30] % needs v2.0 or newer +\RequirePackage{caption3}[2020/09/12] % needs v2.1 or newer % \end{macrocode} % % \section{Check against unknown document classes} @@ -519,9 +519,10 @@ % % \section{Document class support} % -% Execute the code declared with |\AtCaptionPackage|. +% Execute the code declared with |\At|\-|Caption|\-|Package|. % We do this right before processing the options so stuff done with % |\At|\-|Caption|\-|Package| could be overwritten by user options. +% % \begin{macrocode} \caption@documentclass@code \let\caption@documentclass@code\@undefined @@ -4127,6 +4128,16 @@ }{} % \end{macrocode} % +% \section{That's all Folks!} +% +% Execute the code declared with |\After|\-|Caption|\-|Package|. +% +% \begin{macrocode} +\caption@endtitles@code +\let\caption@endtitles@code\@undefined +\let\AfterCaptionPackage\@firstofone +% \end{macrocode} +% % \iffalse %</package> % \fi diff --git a/macros/latex/contrib/caption/caption3.dtx b/macros/latex/contrib/caption/caption3.dtx index 956cc40eb8..ea759a3c87 100644 --- a/macros/latex/contrib/caption/caption3.dtx +++ b/macros/latex/contrib/caption/caption3.dtx @@ -32,12 +32,12 @@ % caption-deu.tex, caption-eng.tex, caption-rus.tex. % % \fi -% \CheckSum{3646} +% \CheckSum{3648} % % \iffalse %<*driver> \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesFile{caption3.drv}[2019/09/10 v2.0 Implementation of the caption kernel] +\ProvidesFile{caption3.drv}[2020/09/12 v2.1 Implementation of the caption kernel] \hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up. %\errorcontextlines=3 % @@ -61,7 +61,7 @@ \ifpdf\usepackage{hypdestopt}\fi \hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}} % -\usepackage{caption3}[2020/07/27] +\usepackage{caption3}[2020/09/12] % \DeclareRobustCommand*\eTeX{\texorpdfstring {\leavevmode\hbox{$\varepsilon$}-\TeX}% @@ -192,7 +192,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption3}[2020/09/11 v2.0b caption3 kernel (AR)] +\ProvidesPackage{caption3}[2020/09/17 v2.1b caption3 kernel (AR)] % \end{macrocode} % % \section{Generic helpers} @@ -1853,12 +1853,13 @@ % \changes{v1.2}{2007/11/11}{\cs{captionbox} renamed to \cs{caption@parbox}} % \changes{v1.5}{2012/03/15}{\cs{caption@parbox} adapted to \cs{DeclareCaptionBox}} % \changes{v1.6}{2013/05/02}{Option \opt{boxsep=} added} +% \changes{v2.1b}{2020/09/17}{Missing braces re-added to \opt{colorbox} option code} % \begin{macrocode} \DeclareCaptionBox{empty}{} \DeclareCaptionBox{none}{#2} \DeclareCaptionBox{parbox}{\parbox[b]{#1}{#2}} \DeclareCaptionBox{colorbox}{% - \colorbox\caption@boxcolor{% + \colorbox{\caption@boxcolor}{% \setlength\caption@tempdima{#1}% \addtolength\caption@tempdima{-2\fboxsep}% \linewidth\caption@tempdima @@ -2992,6 +2993,7 @@ % |\AtCaptionPackage|\marg{code}\\ % can be used by the document class adaption packages to execute extra code % if the \package{caption} package is loaded (later on). +% This code will by applied right before the package options are evaluated. % \begin{macrocode} \newcommand*\AtCaptionPackage{% \g@addto@macro\caption@documentclass@code} @@ -3003,6 +3005,23 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\AfterCaptionPackage} +% \changes{v2.1}{2020/09/12}{This macro added} +% |\AfterCaptionPackage|\marg{code}\\ +% can be used by the document class adaption packages to execute extra code +% if the \package{caption} package is loaded (later on). +% This code will by applied at the very end. +% \begin{macrocode} +\newcommand*\AfterCaptionPackage{% + \g@addto@macro\caption@endtitles@code} +\@onlypreamble\AfterCaptionPackage +% \end{macrocode} +% \begin{macrocode} +\providecommand*\caption@endtitles@code{} +\@onlypreamble\caption@endtitles@code +% \end{macrocode} +% \end{macro} +% % \section{Babel support} % % \begin{macro}{\caption@IfBabelPackageLoaded} @@ -3120,7 +3139,6 @@ % % \begin{macrocode} \ifFBOldFigTabCaptions - \typeout{OldFigTabCaptions=true}% %%%%%%%%%%% <= needs to be removed \caption@ifdefined\extrasfrench{% \addto\extrasfrench{% \caption@switchdefault{labelseparator}{\babel@save #1}{french}}}{}% @@ -3128,18 +3146,11 @@ \addto\extrasacadian{% \caption@switchdefault{labelseparator}{\babel@save #1}{french}}}{}% \else - \typeout{OldFigTabCaptions=false}% %%%%%%%%%%% <= needs to be removed \ifFBCustomiseFigTabCaptions - \typeout{CustomiseFigTabCaptions=true}% %%%%%%%%%%% <= needs to be removed \caption@AtBeginDocument{% \ifFB@mainlanguage@FR - \typeout{mainlanguage=FR}% \SetCaptionDefault{labelseparator}{french}% - \else - \typeout{mainlanguage=other}% %%%%%%%%%%% <= needs to be removed \fi}% - \else - \typeout{CustomiseFigTabCaptions=false}% %%%%%%%%%%% <= needs to be removed \fi \fi % \end{macrocode} diff --git a/macros/latex/contrib/reledmac/README.md b/macros/latex/contrib/reledmac/README.md index e23ad45e65..27f3af2758 100644 --- a/macros/latex/contrib/reledmac/README.md +++ b/macros/latex/contrib/reledmac/README.md @@ -58,8 +58,9 @@ The distribution consists of the following files: # Installation +This package is included in the two main TeX's distribution : TeXLive (and MacTeX) and MikTeX. However, if you want to install it manually : - run: `latex reledmac.ins` (which will generate `reledmac.sty`) and `latex reledpar.ins` (which will generate `reledpar.sty`) -- move `reledmac.sty` and `reledpar.sty` to a location where LaTeX will find it (for more information on this see the FAQ). +- move `reledmac.sty` and `reledpar.sty` to a location where LaTeX will find it (for more information on this see the FAQ of your distribution). To generate a second copy of the manual (which is already supplied as a PDF file): @@ -86,7 +87,7 @@ Maïeul Rouquette is the only one maintainer. To help him in his work, please fo - Download the zip file of the branch (or, if you know Git, go to the branch there): - Go to [the project page](https://github.com/maieul/ledmac/). - Choose the correct branch in the "branch" menu. - - Choose "Download zip" in the "Clone or download" menu, on the right side. + - Choose "Download zip" in the "Code" (green) menu, on the right side. - Unzip the file - Run the `.ins` files with pdflatex, to obtain the `.sty` files. - Put the `.sty` files with your test files (in the same folder). diff --git a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf Binary files differindex 0a8f1a4f59..6b85070222 100644 --- a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf +++ b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf Binary files differindex 70eb0fcf9e..1942baa608 100644 --- a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf Binary files differindex 78d94863b8..9db09d2ec3 100644 --- a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf Binary files differindex e71ac057a9..6019fc3887 100644 --- a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-tabular.pdf b/macros/latex/contrib/reledmac/examples/1-tabular.pdf Binary files differindex d2308f501f..de09baa4a8 100644 --- a/macros/latex/contrib/reledmac/examples/1-tabular.pdf +++ b/macros/latex/contrib/reledmac/examples/1-tabular.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf Binary files differindex 2f4a6424a7..f00a59297c 100644 --- a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf +++ b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-verses.pdf b/macros/latex/contrib/reledmac/examples/1-verses.pdf Binary files differindex 7dc1310345..d5099f50f9 100644 --- a/macros/latex/contrib/reledmac/examples/1-verses.pdf +++ b/macros/latex/contrib/reledmac/examples/1-verses.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf Binary files differindex 6ad8abb626..601ba99085 100644 --- a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf +++ b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf Binary files differindex 4478eb70f6..5b3675f773 100644 --- a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf Binary files differindex 914e2148b7..9c90f6014a 100644 --- a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf Binary files differindex d69aa2d5d5..cb3bee719f 100644 --- a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf +++ b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-indexing.pdf b/macros/latex/contrib/reledmac/examples/2-indexing.pdf Binary files differindex 61dbcfe94c..6c2f8ca732 100644 --- a/macros/latex/contrib/reledmac/examples/2-indexing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-indexing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf Binary files differindex 35494fe2dc..342b351d70 100644 --- a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf +++ b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf Binary files differindex b3b237d1ed..68fbebaa30 100644 --- a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf +++ b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf Binary files differindex 05eb705885..20e27869b9 100644 --- a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf Binary files differindex f4f916a8e3..54b76efd42 100644 --- a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf +++ b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf Binary files differindex ab821f550d..d94d0ba534 100644 --- a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf +++ b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf Binary files differindex d6d468e170..dcff23b484 100644 --- a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf +++ b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-performances.pdf b/macros/latex/contrib/reledmac/examples/2-performances.pdf Binary files differindex 867f9273c9..6291ae5384 100644 --- a/macros/latex/contrib/reledmac/examples/2-performances.pdf +++ b/macros/latex/contrib/reledmac/examples/2-performances.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf Binary files differindex 7b2e049f36..30adfc18b5 100644 --- a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf +++ b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf Binary files differindex 82f0696c7b..70d1483715 100644 --- a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf +++ b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf Binary files differindex f3212b5cf6..38e1031ebb 100644 --- a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf Binary files differindex a7f456243c..17405a91ba 100644 --- a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf Binary files differindex 2ff8b07f71..a532213cf8 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf Binary files differindex 18bffd18c2..2d458ccfa6 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf Binary files differindex dd7a0cb583..21967907a9 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf Binary files differindex 7d24d26f34..bec9689f96 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf Binary files differindex b9072668f4..e5e4c2019c 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf Binary files differindex 75c3144745..a5e01c83fb 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf Binary files differindex f1b0a91afd..fbaaed66e0 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf Binary files differindex 1959d31336..c6ac1b4777 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf Binary files differindex 12bda733c8..04df30bd97 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf Binary files differindex 8623e289cc..23cd6eb9a3 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf Binary files differindex 43863c3f59..6f10539ca2 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf Binary files differindex 731a816e29..ebe85f0eb6 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf Binary files differindex aabb96429b..d37969d5b2 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf Binary files differindex 84ea8b4735..a4a083725b 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf Binary files differindex 660f345338..5df84527d4 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf Binary files differindex bfc981593b..cccd9f5a8b 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf Binary files differindex 22854199d4..9802b9af80 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf Binary files differindex b3ccd178ee..1e25b68962 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf Binary files differindex f1eeaddd22..9267d7dad3 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf Binary files differindex 1154fe4b6e..17a8918dac 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf Binary files differindex 8b9084f626..9247d62980 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf Binary files differindex fd5c065016..c659eaa383 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf Binary files differindex f1f6ddc92b..bc3d4513f6 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf diff --git a/macros/latex/contrib/reledmac/migration.pdf b/macros/latex/contrib/reledmac/migration.pdf Binary files differindex e278cd0267..93b51e7d46 100644 --- a/macros/latex/contrib/reledmac/migration.pdf +++ b/macros/latex/contrib/reledmac/migration.pdf diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx index a2e92f6b3e..cf01998334 100644 --- a/macros/latex/contrib/reledmac/reledmac.dtx +++ b/macros/latex/contrib/reledmac/reledmac.dtx @@ -563,6 +563,8 @@ % \changes{v2.34.3}{2020/08/19}{Fix bug with \protect\cs{parafootsepX} when the footnotes are called outside of a numbered section.} % \changes{v2.34.3}{2020/08/19}{Fixes incompatibility between Fixes incompatibility between lineation by \protect\cs{pstart} and (a)stanza.} % \changes{v2.34.3}{2020/08/19}{Makes command like \protect\cs{hidenumbering} working at the very beginning of a verse when the first argument of \protect\cs{setstanzaindents} is equal to 0.} +% \changes{v2.34.4}{2020/09/16}{Fix some bugs with lineation by page, when a numbered section starts at the very beginning of page.} +% \changes{v2.34.4}{2020/09/16}{Fix bugs with \protect\cs{parafootsepX} outside of numbered section.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -4403,7 +4405,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2020/08/19 v2.34.3 typesetting critical editions]% +\ProvidesPackage{reledmac}[2020/09/16 v2.34.4 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -5026,6 +5028,20 @@ }% % \end{macrocode} % \end{macro} +% \begin{macro}{\led@error@fail@patch@setcounter} +% \begin{macrocode} +\newcommand{\led@error@fail@patch@setcounter}{% + \reledmac@error{Failed to patch the \string\setcounter\space command}{\@ehc}% +}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\led@error@fail@patch@addtocounter} +% \begin{macrocode} +\newcommand{\led@error@fail@patch@addtocounter}{% + \reledmac@error{Failed to patch the \string\addtocounter\space command}{\@ehc}% +}% +% \end{macrocode} +% \end{macro} % \begin{macro}{\led@warn@edinde@outsidenumbering} % \begin{macrocode} \newcommand{\led@warn@edinde@outsidenumbering}{% @@ -6694,9 +6710,9 @@ \fi% \fi \page@numR=#1% - \this@section@page@numR=#1% + \global\this@section@page@numR=#1% \last@page@numR=#1% - \this@section@last@page@numR=#1% + \global\this@section@last@page@numR=#1% \def\next@page@numR{#1}% \gdef\this@section@next@page@numR{#1}% \fi @@ -7344,7 +7360,7 @@ % It is written in the file list. % If we process a line-list file which used a older version, that means the commands used inside are deprecated, and we can't use them. % \begin{macrocode} -\newcommand{\this@line@list@version}{7}% +\newcommand{\this@line@list@version}{8}% % \end{macrocode} % \end{macro} % \begin{macro}{\line@list@stuff} @@ -7432,7 +7448,6 @@ % \changes{v0.6.0}{2004/11/16}{Extended \protect\cs{new@line} to output page numbers} % \begin{macrocode} \newcommand*{\new@line}{% - \set@this@c@page% \ifnumberline% \IfStrEq{\led@pb@setting}{after}% {\xifinlist{\the\absline@num}{\l@prev@nopb}% @@ -13667,11 +13682,15 @@ {\csuse{parafootsepX@#1}}% {}% \global\csname prevpage#1@num\endcsname=\page@num% - \else% - \ifnumequal{\csuse{prevpage#1@num}}{\c@page}% + \else%We can't use directly the page counter, see https://tex.stackexchange.com/a/239457/7712 + \global\expandafter\advance\csname footnote#1@parafootsepX\endcsname by 1% + \edef\@tmpa{parafootsepX@#1@\the\csname footnote#1@parafootsepX\endcsname}% + \expandafter\edlabel\expandafter{\@tmpa}% + \edef\@tmpb{\expandafter\xpageref\expandafter{\@tmpa}}% + \IfStrEq{\csuse{prevpage#1@num}}{\@tmpb}% {\csuse{parafootsepX@#1}}% {}% - \global\csname prevpage#1@num\endcsname=\c@page% + \global\cslet{prevpage#1@num}{\@tmpb}% \fi% \fi% } @@ -15055,6 +15074,7 @@ % \begin{macrocode} \expandafter\newcount\csname prevpage#1@num\endcsname% \expandafter\newcount\csname prevpage#1@numR\endcsname% + \expandafter\newcount\csname footnote#1@parafootsepX\endcsname%For the case we use \parafootsepX outside of numbered section % \end{macrocode} % Add \cs{let}\cs{footnoteX}\cs{@gobble} to \cs{no@expands}. % \begin{macrocode} @@ -16224,9 +16244,10 @@ % \end{macro} % \begin{macro}{\@outputpage} % As its name says, \cs{@outputpage} is a \LaTeX\ macro called in the output routine. It is this macro which increases the \verb+page+ counter. -% We patch it in order to increase, conditionally, the \verb+par@page+ counter. +% We patch it in order to increase, conditionally, the \verb+par@page+ counter, and to set correctly the page number send to the auxiliaries file (\verb+.1+, \verb+.2+, etc.). % \begin{macrocode} \AtBeginDocument{% + \set@this@c@page% \apptocmd{\@outputpage}{% \ifsameparallelpagenumber% \ifl@dprintingpages% @@ -16243,6 +16264,16 @@ {}% {\led@error@fail@patch@@outputpage}% }% +\apptocmd{\setcounter}{% + \IfStrEq{#1}{page}{\set@this@c@page}{}% + }% + {}% + {\led@error@fail@patch@setcounter}% +\apptocmd{\addtocounter}{% + \IfStrEq{#1}{page}{\set@this@c@page}{}% + }% + {}% + {\led@error@fail@patch@addtocounter}% % \end{macrocode} % \end{macro} % diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf Binary files differindex c9d70a57a2..f60cdc1a7a 100644 --- a/macros/latex/contrib/reledmac/reledmac.pdf +++ b/macros/latex/contrib/reledmac/reledmac.pdf diff --git a/macros/latex/contrib/reledmac/reledpar.dtx b/macros/latex/contrib/reledmac/reledpar.dtx index bc15113c88..e084103eaf 100644 --- a/macros/latex/contrib/reledmac/reledpar.dtx +++ b/macros/latex/contrib/reledmac/reledpar.dtx @@ -345,6 +345,7 @@ % \changes{v2.24.0}{2020/05/31}{Add antilabe feature.} % \changes{v2.24.1}{2020/08/19}{Makes \protect\cs{numberstantzatrue} working with \protect\env{astanza}.} % \changes{v2.24.1}{2020/08/19}{Fixes incompatibility between lineation by \protect\cs{pstart} and (a)stanza.} +% \changes{v2.24.2}{2020/09/16}{Fix some bugs with lineation by page, when a numbered section starts at the very beginning of page.} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -1400,7 +1401,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2020/08/19 v2.24.1 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2020/09/16 v2.24.2 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -3034,7 +3035,6 @@ % line-list file, to mark the start of a new text line. % \begin{macrocode} \newcommand*{\new@lineL}{% - \set@this@c@page% \ifnumberline% \write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}% \fi% @@ -3046,7 +3046,6 @@ % line-list file, to mark the start of a new text line. % \begin{macrocode} \newcommand*{\new@lineR}{% - \set@this@c@page% \ifnumberline% \write\linenum@outR{\string\@nl[\the\@this@c@page][\thepage]}% \fi% diff --git a/macros/latex/contrib/reledmac/reledpar.pdf b/macros/latex/contrib/reledmac/reledpar.pdf Binary files differindex d6db142012..1e642d7990 100644 --- a/macros/latex/contrib/reledmac/reledpar.pdf +++ b/macros/latex/contrib/reledmac/reledpar.pdf diff --git a/macros/latex/contrib/tcolorbox/CHANGES b/macros/latex/contrib/tcolorbox/CHANGES index 6f79224bc8..d48ba782dc 100644 --- a/macros/latex/contrib/tcolorbox/CHANGES +++ b/macros/latex/contrib/tcolorbox/CHANGES @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> @@ -1153,3 +1153,14 @@ version 4.31 (2020/07/31) - documentation typo corrections (#102) - library 'documentation': * indention of <environment content> changed to \ttfamily (#100) + +version 4.32 (2020/09/17) +- documentation typo corrections (#108) and enhancements (#109) +- bug fix (#112): 'index format=doc' caused redefinition of '\_' + among other errors. +- bug fix: 'valign=scale*' was erroneous. +- enhancement (#110): color stack support for breakable boxes (pdflatex and lualatex) + to let colors survive a break to the next partial box. +- library 'xparse': + * new options (#111): 'IfNoValueT', 'IfNoValueF', 'IfValueT', 'IfValueF', + 'IfBooleanT', 'IfBooleanF' diff --git a/macros/latex/contrib/tcolorbox/README b/macros/latex/contrib/tcolorbox/README index 9df1250c23..f421faa8eb 100644 --- a/macros/latex/contrib/tcolorbox/README +++ b/macros/latex/contrib/tcolorbox/README @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% %% ------------------------------------------------------------------------------------------- %% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> diff --git a/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex b/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex index 4f3eb68f92..2405db4b60 100644 --- a/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,10 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} + +\RequirePackage{pdfcol} +\pdfcolInitStack{tcb@breakable} \let\tcb@parboxrestore@true=\tcb@parboxrestore \let\tcb@parboxrestore@false\tcb@parbox@false@settings @@ -73,6 +76,7 @@ \reserved@a% \@endpefalse% \let\tcbbreak\tcb@@break% + \pdfcolSwitchStack{tcb@breakable}% \color@begingroup% \textwidth\hsize% \columnwidth\hsize% @@ -317,7 +321,6 @@ \tcb@parfillskip@check% \tcb@split@start% \endgroup% - \color{.}% hack for some special cases \ifx\kvtcb@float\@empty\relax% \aftergroup\tcb@use@after@lastbox% \fi% @@ -900,26 +903,32 @@ } +\def\tcb@init@breakability{% + \let\tcb@savebox=\tcb@vbox% + \let\endtcb@savebox=\endtcb@vbox% + \let\tcb@drawcolorbox=\tcb@drawcolorbox@breakable% + \pdfcolIfStackExists{tcb@breakable}{% + \appto\tcb@upperdraw@begin@hook{\pdfcolSetCurrent{tcb@breakable}}% + \appto\tcb@lowerdraw@begin@hook{\pdfcolSetCurrent{tcb@breakable}}% + }{% + \appto\tcb@upperdraw@begin@hook{\color{tcbcolupper}}% + \appto\tcb@lowerdraw@begin@hook{\color{tcbcollower}}% + }% +} \tcbset{% breakable@true/.code={% - \let\tcb@savebox=\tcb@vbox% - \let\endtcb@savebox=\endtcb@vbox% - \let\tcb@defToTotalHeight=\tcb@defToTotalHeightBreakable% - \let\tcb@drawcolorbox=\tcb@drawcolorbox@breakable}, + \tcb@init@breakability% + \let\tcb@defToTotalHeight=\tcb@defToTotalHeightBreakable}, breakable@unlimited/.code={% - \let\tcb@savebox=\tcb@vbox% - \let\endtcb@savebox=\endtcb@vbox% - \let\tcb@defToTotalHeight=\tcb@defToTotalHeightUnlimited% - \let\tcb@drawcolorbox=\tcb@drawcolorbox@breakable}, + \tcb@init@breakability% + \let\tcb@defToTotalHeight=\tcb@defToTotalHeightUnlimited}, breakable/.style={breakable@#1}, breakable/.default=true,% unbreakable/.style={breakable=false},% enforce breakable/.code={% - \let\tcb@savebox=\tcb@vbox% - \let\endtcb@savebox=\endtcb@vbox% - \let\tcb@defToTotalHeight=\tcb@defToTotalHeightBreakable% - \let\tcb@drawcolorbox=\tcb@drawcolorbox@breakable}, + \tcb@init@breakability% + \let\tcb@defToTotalHeight=\tcb@defToTotalHeightBreakable}, title after break/.store in=\kvtcb@followingtitle,% notitle after break/.style={title after break=},% adjusted title after break/.style={title after break={#1\vphantom{\kvtcb@adjusttext}}},% diff --git a/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex b/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex index 819197e3b1..2c69a26a06 100644 --- a/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \tcbuselibrary{listings,skins,xparse,external,raster} @@ -878,10 +878,11 @@ \tcb@doc@index@pgf@% } -\let\tcb@doc@index@pgf=\tcb@doc@index@pgfsection% +\let\tcb@doc@index@pgf=\tcb@doc@index@pgfsection -\def\tcb@doc@index@doc{% - \ExplSyntaxOn + +\ExplSyntaxOn +\def\tcb@doc@index@doc{ \def \__tcobox_index_command: { \iftcb@doc@toindex @@ -891,16 +892,16 @@ \def \__tcobox_index_environment: { \iftcb@doc@toindex - SpecialMainEnvIndex{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintEnvC{\kvtcb@doc@index}} + \SpecialMainEnvIndex{\kvtcb@doc@sortindex\idx@actual\tcbIndexPrintEnvC{\kvtcb@doc@index}} \fi } - \ExplSyntaxOff - \tcbset{index german settings}% - \EnableCrossrefs% - \PageIndex% + \tcbset{index~german~settings} + \EnableCrossrefs + \PageIndex } +\ExplSyntaxOff -\def\tcb@doc@index@off{}% +\def\tcb@doc@index@off{} \tcbset{% reset@documentation/.style={% diff --git a/macros/latex/contrib/tcolorbox/tcbexternal.code.tex b/macros/latex/contrib/tcolorbox/tcbexternal.code.tex index 20a1254801..b4dd73e40c 100644 --- a/macros/latex/contrib/tcolorbox/tcbexternal.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbexternal.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbexternal.code.tex: Code for externalization %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \tcbuselibrary{pro@cessing} diff --git a/macros/latex/contrib/tcolorbox/tcbfitting.code.tex b/macros/latex/contrib/tcolorbox/tcbfitting.code.tex index 0808d0f4ef..2240147a9e 100644 --- a/macros/latex/contrib/tcolorbox/tcbfitting.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbfitting.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbfitting.code.tex: Code for fit boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim @@ -253,13 +253,10 @@ % \def\tcb@fit@@boxsave##1{% \tcbdimto\tcb@innerwidth{\kvtcb@width-\kvtcb@left@rule-\kvtcb@right@rule}% - \colorlet{tcbcol@origin}{.}% - \tcb@set@color{tcbcolupper}% \begin{tcb@savebox}{\tcb@upperbox}{##1}% - \kvtcb@fontupper\fontsize{\tcbfitdim}{\tcb@fit@@line}\selectfont% + \color{tcbcolupper}\kvtcb@fontupper\fontsize{\tcbfitdim}{\tcb@fit@@line}\selectfont% \kvtcb@halignupper\tcb@insert@before@upper#1\tcb@insert@after@upper% \end{tcb@savebox}% - \tcb@reset@color% \advance\count@ 1\relax% }% % diff --git a/macros/latex/contrib/tcolorbox/tcbhooks.code.tex b/macros/latex/contrib/tcolorbox/tcbhooks.code.tex index 84720b1c85..63f1cd944b 100644 --- a/macros/latex/contrib/tcolorbox/tcbhooks.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbhooks.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbhooks.code.tex: Code for adding hooks %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \tcbset{% before upper app/.code={\appto\kvtcb@before@upper{#1}},% diff --git a/macros/latex/contrib/tcolorbox/tcblistings.code.tex b/macros/latex/contrib/tcolorbox/tcblistings.code.tex index 9ac64e3fd5..8604e6896f 100644 --- a/macros/latex/contrib/tcolorbox/tcblistings.code.tex +++ b/macros/latex/contrib/tcolorbox/tcblistings.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcblistings.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \RequirePackage{listings}[2007/02/22] diff --git a/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex b/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex index 1b76e30fbe..c0460a3c1e 100644 --- a/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex +++ b/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \tcbuselibrary{pro@cessing} diff --git a/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex b/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex index 99cdae4c73..78eae82da9 100644 --- a/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex +++ b/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8 %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \tcbuselibrary{listings} diff --git a/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex b/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex index e339447ada..297ecf5cb0 100644 --- a/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbmagazine.code.tex: Code for box sets and magazine styles %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \tcbuselibrary{breakable} diff --git a/macros/latex/contrib/tcolorbox/tcbminted.code.tex b/macros/latex/contrib/tcolorbox/tcbminted.code.tex index 073e2c7bb6..30a01ea7ad 100644 --- a/macros/latex/contrib/tcolorbox/tcbminted.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbminted.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbminted.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \RequirePackage{minted}[2011/09/17] diff --git a/macros/latex/contrib/tcolorbox/tcbposter.code.tex b/macros/latex/contrib/tcolorbox/tcbposter.code.tex index c8bb522923..64f96c0251 100644 --- a/macros/latex/contrib/tcolorbox/tcbposter.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbposter.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbposter.code.tex: Code for posters %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \tcbuselibrary{breakable,magazine,skins,fitting} diff --git a/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex b/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex index c11451fe36..88169a0b87 100644 --- a/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbprocessing.code.tex: Code for conditional processing %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \RequirePackage{pdftexcmds} \RequirePackage{shellesc} diff --git a/macros/latex/contrib/tcolorbox/tcbraster.code.tex b/macros/latex/contrib/tcolorbox/tcbraster.code.tex index 7492e2a677..e6abad21ec 100644 --- a/macros/latex/contrib/tcolorbox/tcbraster.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbraster.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \newcounter{tcbrastercolumn} \newcounter{tcbrasterrow} diff --git a/macros/latex/contrib/tcolorbox/tcbskins.code.tex b/macros/latex/contrib/tcolorbox/tcbskins.code.tex index 7297dc0e84..28cadb737a 100644 --- a/macros/latex/contrib/tcolorbox/tcbskins.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbskins.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbskins.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \RequirePackage{tikz}[2010/10/13] diff --git a/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex b/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex index ca7f868827..b608e7c157 100644 --- a/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \tcbuselibrary{skins} diff --git a/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex b/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex index ae26c751b7..2ee69469f3 100644 --- a/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbtheorems.code.tex: Code for theorems in colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \RequirePackage{amsmath} diff --git a/macros/latex/contrib/tcolorbox/tcbvignette.code.tex b/macros/latex/contrib/tcolorbox/tcbvignette.code.tex index 6dfef8c103..71f6f5c32e 100644 --- a/macros/latex/contrib/tcolorbox/tcbvignette.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbvignette.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbvignette.code.tex: Code for ornamental frames %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \tcbuselibrary{skins} diff --git a/macros/latex/contrib/tcolorbox/tcbxparse.code.tex b/macros/latex/contrib/tcolorbox/tcbxparse.code.tex index d2f9c1b088..7eaea506ee 100644 --- a/macros/latex/contrib/tcolorbox/tcbxparse.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbxparse.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcbxparse.code.tex: Code for xparse features %% %% ------------------------------------------------------------------------------------------- @@ -18,14 +18,20 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{4.31} +\tcb@set@library@version{4.32} \RequirePackage{xparse}[2013/12/31] \tcbset{% IfNoValueTF/.code n args={3}{\IfNoValueTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}}, + IfNoValueT/.code n args={2}{\IfNoValueT{#1}{\pgfkeysalso{#2}}}, + IfNoValueF/.code n args={2}{\IfNoValueF{#1}{\pgfkeysalso{#2}}}, IfValueTF/.code n args={3}{\IfValueTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}}, + IfValueT/.code n args={2}{\IfValueT{#1}{\pgfkeysalso{#2}}}, + IfValueF/.code n args={2}{\IfValueF{#1}{\pgfkeysalso{#2}}}, IfBooleanTF/.code n args={3}{\IfBooleanTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}}, + IfBooleanT/.code n args={3}{\IfBooleanT{#1}{\pgfkeysalso{#2}}}, + IfBooleanF/.code n args={3}{\IfBooleanF{#1}{\pgfkeysalso{#2}}}, verbatim/.style={fontupper=\ttfamily,nobeforeafter,tcbox raise base,top=0pt,bottom=0pt,left=1mm,right=1mm,boxrule=0.3mm} } @@ -233,16 +239,10 @@ \def\tcb@sbs@content@both{\box\tcb@upperbox\tcblower\box\tcb@lowerbox} \def\tcb@sbs@save@upper{% - \colorlet{tcbcol@origin}{.}% - \tcb@set@color{tcbcolupper}% - \sbox{\tcb@upperbox}{\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper\tcb@sbs@text@left\tcb@insert@after@upper}% - \tcb@reset@color% + \sbox{\tcb@upperbox}{\color{tcbcolupper}\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper\tcb@sbs@text@left\tcb@insert@after@upper}% } \def\tcb@sbs@save@lower{% - \colorlet{tcbcol@origin}{.}% - \tcb@set@color{tcbcollower}% - \sbox{\tcb@lowerbox}{\kvtcb@fontlower\kvtcb@halignlower\tcb@insert@before@lower\tcb@sbs@text@right\tcb@insert@after@lower}% - \tcb@reset@color% + \sbox{\tcb@lowerbox}{\color{tcbcollower}\kvtcb@fontlower\kvtcb@halignlower\tcb@insert@before@lower\tcb@sbs@text@right\tcb@insert@after@lower}% } \tcbset{% diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf Binary files differindex 777c531725..2f8c59debe 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf +++ b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex index 9b6514fdba..74eb419478 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcolorbox-example-poster.tex: a poster example for tcolorbox %% %% ------------------------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf Binary files differindex 1798c61235..b623da1676 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf +++ b/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example.tex b/macros/latex/contrib/tcolorbox/tcolorbox-example.tex index 8e682612b2..3a62669872 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox-example.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox-example.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcolorbox-example.tex: an example for tcolorbox %% %% ------------------------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf Binary files differindex b6c8a73e02..837d8ba475 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf +++ b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex index 3d12a3a6c1..a84d704590 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex @@ -1,5 +1,5 @@ % \LaTeX-Main\ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcolorbox-tutorial-poster.tex: a tutorial for poster creation with tcolorbox %% %% ------------------------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex index 4ebaee76d9..c714bfd445 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex @@ -7,6 +7,7 @@ The library is loaded by a package option or inside the preamble by: \begin{dispListing} \tcbuselibrary{breakable} \end{dispListing} +This also loads the package |pdfcol|. \subsection{Technical Overview} The library \mylib{breakable} supports the automatic breaking of a |tcolorbox|. @@ -108,9 +109,11 @@ parameters. The differences are: use \refKey{/tcb/enforce breakable} for the nested box\footnote{\refKey{/tcb/enforce breakable} acts like \refKey{/tcb/breakable} until |tcolorbox| 3.04.}. \textbf{But, a breakable box inside a breakable box will usually give a mess.} -\item If your text content contains some text color changing commands, - your color will not survive the break to the next box. - But, with the |fontspec| package and |xelatex| or |lualatex|, +\item\tcbdocmarginnote{\tcbdocnew{2020-09-17}} + Depending on the \LaTeX\ compiler, if your text content contains some text + color changing commands, your color may not survive the break to the next box. + Since |tcolorbox|~4.32, |pdflatex| and |lualatex| should not have that + problem. For |xelatex|, with the |fontspec| package, you can use |\addfontfeatures{Color=mycolor}| to add a font color which survives the break. diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex index 5f9d4acccb..ba853c46e3 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex @@ -49,7 +49,7 @@ Now, we try again with adjusted titles:\\ \begin{docTcbKey}{adjust text}{=\meta{text}}{no default, initially \texttt{\"Apgjy}} This sets the reference text for \refKey{/tcb/adjusted title}. If your texts - never exceed '\"Apgjy' in depth and height you don't need to care about this option. + never exceed \enquote{\"Apgjy} in depth and height you don't need to care about this option. \end{docTcbKey} \clearpage @@ -1809,7 +1809,7 @@ used for boxes inside a \refEnv{tcbraster}. \clearpage -\begin{docTcbKey}[][doc new={2017-06-28}]{inherit height}{\colOpt{=fraction}}{default |1|, initially unset} +\begin{docTcbKey}[][doc new={2017-06-28}]{inherit height}{\colOpt{=\meta{fraction}}}{default |1|, initially unset} If this option is used for a |tcolorbox| which is embedded inside another (outer) |tcolorbox| \emph{and} if this outer |tcolorbox| has a fixed height, then the given \meta{fraction} of the available text height @@ -2096,7 +2096,7 @@ with a listing. \begin{dispExample} \begin{tcolorbox}[use height from group=C,add to height=-2cm, colframe=blue!75!black,colback=white] -Height from group 'C' of the previous example, but reduced by 2cm. +Height from group \enquote{C} of the previous example, but reduced by 2cm. \end{tcolorbox}% \end{dispExample} @@ -2866,7 +2866,7 @@ This behavior is controlled by the keys |before| and |after|. \end{docTcbKey} \enlargethispage*{1cm} -\begin{docTcbKey}{forces nobeforeafter}{}{style, no value} +\begin{docTcbKey}{force nobeforeafter}{}{style, no value} Forces the setting of \refKey{/tcb/nobeforeafter} even if \refKey{/tcb/before} and \refKey{/tcb/after} are set to other values later. Do not use this option globally unless you \emph{really} know what you do. @@ -3411,7 +3411,7 @@ This is a \textbf{tcolorbox}. \begin{tcolorbox}[enhanced,spread upwards,sharp corners=north,height=3cm, colframe=blue!75!black,interior style={top color=blue!50,bottom color=white}] -This is an example for 'spread upwards'. +This is an example for \enquote{spread upwards}. \end{tcolorbox} \begin{docTcbKey}[][doc new=2017-02-13]{spread upwards}{\colOpt{=\meta{length}}}{default |0pt|, initially unset} Combination of @@ -3420,7 +3420,7 @@ The optional \meta{length} is used for all these keys. \begin{dispListing} \begin{tcolorbox}[enhanced,spread upwards,sharp corners=north,height=3cm, colframe=blue!75!black,interior style={top color=blue!50,bottom color=white}] -This is an example for 'spread upwards'. +This is an example for \enquote{spread upwards}. \end{tcolorbox} \end{dispListing} \end{docTcbKey} @@ -3461,13 +3461,13 @@ The optional \meta{length} is used for all these keys. \begin{dispListing} \begin{tcolorbox}[enhanced,spread downwards,sharp corners=south, colframe=red!75!black,interior style={top color=white,bottom color=red!50}] -This is an example for 'spread downwards'. +This is an example for \enquote{spread downwards}. \end{tcolorbox} \end{dispListing} \end{docTcbKey} \begin{tcolorbox}[enhanced,spread downwards,sharp corners=south, colframe=red!75!black,interior style={top color=white,bottom color=red!50}] -This is an example for 'spread downwards'. +This is an example for \enquote{spread downwards}. \end{tcolorbox} @@ -3756,7 +3756,7 @@ This is a tcolorbox. This is a tcolorbox. \end{tcolorbox} -\begin{tcolorbox}[capture=fitbox,height=9mm]% needs the 'fitting' library +\begin{tcolorbox}[capture=fitbox,height=9mm]% needs the `fitting' library This is a tcolorbox. \end{tcolorbox} \end{exdispExample} @@ -4058,7 +4058,7 @@ This is a tcolorbox. This box is automatically numbered with \ref{mynamelabel} on page \pageref{mynamelabel}. -The box is titled '\nameref{mynamelabel}'. +The box is titled \enquote{\nameref{mynamelabel}}. \end{dispExample} \begin{marker} diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.documentation.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.documentation.tex index 4ba5b569bf..9c2cfe8f6d 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.documentation.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.documentation.tex @@ -897,7 +897,7 @@ which is commented by a note inside the margin. \end{docTcbKey} \begin{docTcbKey}[][doc new=2014-09-19]{doc new}{=\meta{date}}{style, no default} - Adds a a marginnote with a 'New: \meta{data}' message at the beginning of + Adds a a marginnote with a \enquote{New: \meta{date}} message at the beginning of the upper box part. The intended use is inside the option list of \refEnv{docCommand}, \refEnv{docEnvironment}, etc. \makeatletter\renewcommand*{\tcbdocnew}[1]{\kvtcb@text@new: #1}\makeatother% @@ -910,13 +910,13 @@ Some command for something. \begin{docTcbKey}[][doc new=2014-09-19]{doc updated}{=\meta{date}}{style, no default} - Adds a marginnote with a 'Updated: \meta{data}' message at the beginning of + Adds a marginnote with a \enquote{Updated: \meta{date}} message at the beginning of the upper box part. See \refKey{/tcb/doc new}. \end{docTcbKey} \begin{docTcbKey}[][doc new=2014-09-19]{doc new and updated}{=\marg{new date}\marg{update date}}{style, no default} - Adds a marginnote with 'New: \meta{new date}' and 'Updated: \meta{update data}' messages at the beginning of + Adds a marginnote with \enquote{New: \meta{new date}} and \enquote{Updated: \meta{update date}} messages at the beginning of the upper box part. See \refKey{/tcb/doc new}. \end{docTcbKey} @@ -1228,7 +1228,7 @@ keys to insert code before (or after) the description texts. Sets the options from the package |listings| \cite{hoffmann:listings}. They are used inside \refEnv{dispExample} and \refEnv{dispListing} to typeset the listings. Note that this is not identical to the key - \refKey{/tcb/listing options} which is used for 'normal' listings.\\ + \refKey{/tcb/listing options} which is used for \enquote{normal} listings.\\ Used for \refKey{/tcb/listing engine}|=listings| only. \end{docTcbKey} @@ -1237,7 +1237,7 @@ keys to insert code before (or after) the description texts. This key sets a \meta{style} for the |listings| package, see \cite{hoffmann:listings}. Note that this is not identical to the key - \refKey{/tcb/listing style} which is used for 'normal' listings.\\ + \refKey{/tcb/listing style} which is used for \enquote{normal} listings.\\ Used for \refKey{/tcb/listing engine}|=listings| only. \end{docTcbKey} @@ -1245,7 +1245,7 @@ keys to insert code before (or after) the description texts. Sets the options from the package |minted| \cite{poore:minted} which are used during typesetting of the listing, if used. Note that this is not identical to the key - \refKey{/tcb/minted options} which is used for 'normal' listings.\\ + \refKey{/tcb/minted options} which is used for \enquote{normal} listings.\\ Used for \refKey{/tcb/listing engine}|=minted| only. \end{docTcbKey} @@ -1253,7 +1253,7 @@ keys to insert code before (or after) the description texts. Sets a \meta{style} known to |Pygments| \cite{pygments:web} for the package |minted| \cite{poore:minted}, if used. Note that this is not identical to the key - \refKey{/tcb/minted style} which is used for 'normal' listings.\\ + \refKey{/tcb/minted style} which is used for \enquote{normal} listings.\\ Used for \refKey{/tcb/listing engine}|=minted| only. \end{docTcbKey} @@ -1261,7 +1261,7 @@ keys to insert code before (or after) the description texts. Sets a \meta{programming language} known to |Pygments| \cite{pygments:web} for the package |minted| \cite{poore:minted}, if used. Note that this is not identical to the key - \refKey{/tcb/minted language} which is used for 'normal' listings.\\ + \refKey{/tcb/minted language} which is used for \enquote{normal} listings.\\ Used for \refKey{/tcb/listing engine}|=minted| only. \end{docTcbKey} @@ -1345,15 +1345,15 @@ instead. Also see \refKey{/tcb/docexample}. \begin{docTcbKey}{index actual}{=\meta{character}}{no default, initially |@|} - Sets the character for 'actual' in automatic indexing. + Sets the character for \enquote{actual} in automatic indexing. \end{docTcbKey} \begin{docTcbKey}{index quote}{=\meta{character}}{no default, initially |"|} - Sets the character for 'quote' in automatic indexing. + Sets the character for \enquote{quote} in automatic indexing. \end{docTcbKey} \begin{docTcbKey}{index level}{=\meta{character}}{no default, initially |!|} - Sets the character for 'level' in automatic indexing. + Sets the character for \enquote{level} in automatic indexing. \end{docTcbKey} \begin{docTcbKey}{index default settings}{}{style, no value} diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.fitting.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.fitting.tex index 20feddda9a..607ef00769 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.fitting.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.fitting.tex @@ -148,7 +148,7 @@ elaborate methods to create new commands. The font size for the content of a box with fixed width and fixed height can be adjusted automatically. This is called the \emph{fitbox capture mode}. Note that the fit control algorithm -constructs a series of versions for the box and selects the 'best'. +constructs a series of versions for the box and selects the \enquote{best}. Therefore, the compilation time is quite longer than for a normal box. The algorithm will fail, if a different selected font size does not change the overall size of the box content. @@ -565,7 +565,7 @@ if necessary. the auxiliary boxes may produce many |hbox| warnings. This option key changes the |\hbadness| value. \begin{itemize} - \item\docValue{off}: Most of |'Underfull \hbox'| and |'Overfull \hbox'| warnings are + \item\docValue{off}: Most of |`Underfull \hbox'| and |`Overfull \hbox'| warnings are switched off (including the ones for the finally used box). \item\docValue{on}: All warnings for all auxiliary boxes are displayed. \item\docValue{final}: Only warnings for the finally used box are displayed. diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.hooks.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.hooks.tex index 9d00380f42..f3fab2221b 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.hooks.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.hooks.tex @@ -23,9 +23,9 @@ places code before the content of the upper part. A following usage of this key overwrites any prior settings. The library \mylib{hooks} extends \refKey{/tcb/before upper} and several more -existing keys to 'hookable' versions, e.\,g.\ +existing keys to \enquote{hookable} versions, e.\,g.\ \refKey{/tcb/before upper app} and \refKey{/tcb/before upper pre}. -The 'hookable' keys don't overwrite prior settings but either \emph{app}end +The \enquote{hookable} keys don't overwrite prior settings but either \emph{app}end or \emph{pre}pend the newly given code to the existing code. The general naming convention (with some small exceptions) is: @@ -46,7 +46,7 @@ Therefore, the order of the option key usage is crucial. \tcbset{enhanced,fonttitle=\bfseries\large,fontupper=\normalsize\sffamily, colback=yellow!10!white,colframe=red!50!black,colbacktitle=Salmon!30!white, coltitle=black,center title, - tabularx={X||Y|Y|Y|Y||Y},% this sets 'before upper' and 'after upper' + tabularx={X||Y|Y|Y|Y||Y},% this sets `before upper' and `after upper' before upper app={Group & One & Two & Three & Four & Sum\\\hline\hline} } \begin{tcolorbox}[title=My table] @@ -102,7 +102,7 @@ from page \pageref{subsec:contentadditions}. % \tcbuselibrary{theorems} \begin{tcolorbox}[ - ams align,% this sets 'before upper*' and 'after upper*' + ams align,% this sets `before upper*' and `after upper*' colback=yellow!10!white,colframe=red!50!black, before upper app={\frac{2}{\sqrt{2}}&=\sqrt{2}.\\}, after upper pre={\\\sin\left(\frac{\pi}{2}\right)&=1.}, @@ -138,7 +138,7 @@ The following option keys extend the options given in Subsection \ref{subsec:sur from page \pageref{subsec:surroundings}. \begin{marker} -The 'hookable' versions are usable inside the document. +The \enquote{hookable} versions are usable inside the document. In the preamble, they can only be used after explicit setting of \refKey{/tcb/before} and \refKey{/tcb/after} or by e.\,g.\ \refKey{/tcb/parskip}. \end{marker} diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.intro.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.intro.tex index 4c8fb7683a..e744a6f96f 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.intro.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.intro.tex @@ -18,7 +18,7 @@ With this package, you are invited to apply these boxes for similar projects. The breaking news for version 2.00 was the support for breakable boxes. This feature allows new applications of the package without affecting the core package too much if you do not need boxes to break automatically. -With version 2.20, the often requested 'side by side' mode for listings has been added. +With version 2.20, the often requested \enquote{side by side} mode for listings has been added. With version 3.00, boxed titles are introduced together with improved customization options for overlays, underlays, finishes, and own code extensions. @@ -145,7 +145,7 @@ The following keys are used inside |\tcbuselibrary| respectively \end{docTcbKey} \begin{docTcbKey}[library]{hooks}{}{\mylib{hooks}} - Extends several option keys to 'hookable' keys; + Extends several option keys to \enquote{hookable} keys; see Section~\ref{sec:hooks} from page~\pageref{sec:hooks}. \end{docTcbKey} diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.listings.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.listings.tex index 9a0a8ad1a6..8f99797bc2 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.listings.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.listings.tex @@ -51,7 +51,7 @@ the package |listingsutf8| \cite{oberdiek:listingsutf8} by loading the library variant \mylib{listingsutf8}. \begin{dispListing} \tcbuselibrary{listingsutf8} -\tcbset{listing utf8=latin1}% optional; 'latin1' is the default. +\tcbset{listing utf8=latin1}% optional; `latin1' is the default. \end{dispListing} This also loads the library \mylib{listings} and the packages |listings| \cite{hoffmann:listings} @@ -464,7 +464,7 @@ Sets a \meta{programming language} known to |Pygments| \cite{pygments:web}. minted language=java, colback=red!5!white,colframe=red!75!black,listing only} public class HelloWorld { - // A 'Hello World' in Java + // A `Hello World' in Java public static void main(String[] args) { System.out.println("Hello World!"); } @@ -491,7 +491,7 @@ Sets a \meta{programming language} known to |Pygments| \cite{pygments:web}. \begin{myjava} public class HelloWorld { - // A 'Hello World' in Java + // A `Hello World' in Java public static void main(String[] args) { System.out.println("Hello World!"); } diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.magazine.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.magazine.tex index bf9c106bc4..2fb03f3893 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.magazine.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.magazine.tex @@ -100,8 +100,8 @@ registers. be appended to the already existing boxes. This command does not clear box registers. \begin{dispListing} -\boxarrayreset % resets 'default' -\boxarrayreset{myarray} % resets 'myarray' +\boxarrayreset % resets `default' +\boxarrayreset{myarray} % resets `myarray' \end{dispListing} \end{docCommand} @@ -113,8 +113,8 @@ registers. you apply \refKey{/tcb/store to box array}. \begin{dispListing} \tcbset{ - reset box array, % resets 'default' - reset box array=myarray, % resets 'myarray' + reset box array, % resets `default' + reset box array=myarray, % resets `myarray' } \end{dispListing} \end{docTcbKey} @@ -129,8 +129,8 @@ registers. If \refCom{consumeboxarray} or \refCom{consumetcboxarray} was used to apply the stored boxes, there is no advantage in using \refCom{boxarrayclear}. \begin{dispListing} -\boxarrayclear % clears 'default' -\boxarrayclear{myarray} % clears 'myarray' +\boxarrayclear % clears `default' +\boxarrayclear{myarray} % clears `myarray' \end{dispListing} \end{docCommand} diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty b/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty index 80604e3d04..32e77fc9f0 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty +++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty @@ -288,7 +288,7 @@ \robustify{\mylib} \pdfstringdefDisableCommands{% - \def\mylib#1{'#1'}% + \def\mylib#1{`#1'}% } \newrobustcmd*{\tcbexclamation}{!} diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_snippet.sty b/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_snippet.sty index 785b65b23c..9bd1a069ef 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_snippet.sty +++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_snippet.sty @@ -114,14 +114,14 @@ \begin{tcbverbatimwrite}{\jobname_preamble_K.tex} \usepackage{amsthm} -\theoremstyle{plain}% from 'amsthm' -\newtheorem{lem}{Lemma}% from 'amsthm' +\theoremstyle{plain}% from `amsthm' +\newtheorem{lem}{Lemma}% from `amsthm' \tcolorboxenvironment{lem}{ enhanced jigsaw,colframe=cyan,interior hidden, breakable,before skip=10pt,after skip=10pt } -\tcolorboxenvironment{proof}{% 'proof' from 'amsthm' +\tcolorboxenvironment{proof}{% `proof' from `amsthm' blanker,breakable,left=5mm, before skip=10pt,after skip=10pt, borderline west={1mm}{0pt}{red}} diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex index adfbd7f091..646d4229ae 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex @@ -2973,9 +2973,9 @@ This box looks like a box provided by the \texttt{beamer} class. \tcbset{skintable/.style={colframe=red!50!yellow!50!black, colback=red!50!yellow!5!white,coltitle=red!50!yellow!3!white, fonttitle=\bfseries,before=\par\smallskip, - title=Environment and engines for the skin '\texttt{#1}'}} + title=Environment and engines for the skin \enquote{\texttt{#1}}}} -\subsection{Skin Family 'standard'}\label{subsec:skinstandard} +\subsection{Skin Family \enquote{standard}}\label{subsec:skinstandard} \begin{marker}Note that the option keys \refKey{/tcb/frame style}, \refKey{/tcb/interior style}, \refKey{/tcb/segmentation style}, and @@ -3077,10 +3077,10 @@ This box looks like a box provided by the \texttt{beamer} class. \clearpage -\subsection{Skin Family 'enhanced'} +\subsection{Skin Family \enquote{enhanced}} \begin{marker} If you like the standard appearance of a |tcolorbox| but you want to -have some 'enhanced' features, the |enhanced| skin is what you are looking for. +have some \enquote{enhanced} features, the |enhanced| skin is what you are looking for. \end{marker} \begin{docSkin}{enhanced} @@ -3143,7 +3143,7 @@ have some 'enhanced' features, the |enhanced| skin is what you are looking for. segmentation style={black,solid,opacity=0.2,line width=1pt}} \begin{tcolorbox}[title=Nice box in rainbow colors] - With the 'enhanced' skin, it is quite easy to produce fancy looking effects. + With the \enquote{enhanced} skin, it is quite easy to produce fancy looking effects. \tcblower Note that this is still a \texttt{tcolorbox}. \end{tcolorbox} @@ -3588,7 +3588,7 @@ Nevertheless, this skin can be applied independently. \clearpage -\subsection{Skin Family 'bicolor'} +\subsection{Skin Family \enquote{bicolor}} \begin{docSkin}{bicolor} This skin is quite similar to the \refSkin{standard} and \refSkin{enhanced} skin. But instead of a segmentation line, the optional lower part of the box is filled with a @@ -3682,13 +3682,13 @@ Nevertheless, this skin can be applied independently. basicstyle=\ttfamily\bfseries,extendedchars=true}}} \begin{tcblisting}{title={Snapshot of the staging area}, - gitexample={The option '-a' automatically stages all tracked and modified + gitexample={The option `-a' automatically stages all tracked and modified files before the commit.\par - This can be combined with the message option '-m' + This can be combined with the message option `-m' as seen in the third line.}} git commit git commit -a -git commit -am 'changes to my example' +git commit -am `changes to my example' \end{tcblisting} \end{dispExample} @@ -3828,7 +3828,7 @@ Nevertheless, this skin can be applied independently. \clearpage -\subsection{Skin Family 'tile'} +\subsection{Skin Family \enquote{tile}} \begin{docSkin}[doc new=2016-02-25]{tile} This skin is a variant of skin \refSkin{bicolor}. Especially, the optional lower part of the box is colored by \refKey{/tcb/colbacklower}. @@ -4011,11 +4011,11 @@ Nevertheless, this skin can be applied independently. \clearpage -\subsection{Skin Family 'beamer'} +\subsection{Skin Family \enquote{beamer}} \begin{docSkin}{beamer} This skin resembles boxes known from the |beamer| class and therefore is - called 'beamer'. It uses the normal colors from the core package but shades + called \enquote{beamer}. It uses the normal colors from the core package but shades them a little bit. To use this skin, the |tikz| library |shadings| has to be included in the preamble by: \begin{dispListing} @@ -4070,7 +4070,7 @@ Nevertheless, this skin can be applied independently. \begin{dispExample} \begin{tcolorbox}[beamer,colback=Salmon!50!white,colframe=FireBrick!75!black, - adjusted title=A colored box with the 'beamer' skin] + adjusted title=A colored box with the \enquote{beamer} skin] This box looks like a box provided by the \texttt{beamer} class. \end{tcolorbox} \end{dispExample} @@ -4227,7 +4227,7 @@ Nevertheless, this skin can be applied independently. \clearpage -\subsection{Skin Family 'widget'} +\subsection{Skin Family \enquote{widget}} \begin{docSkin}{widget} This skin uses the normal colors from the core package but shades them a little bit. To use this skin, the |tikz| library |shadings| @@ -4284,7 +4284,7 @@ if needed. \begin{dispExample} \begin{tcolorbox}[widget,colback=Salmon!50!white,colframe=FireBrick!75!black, - adjusted title=A colored box with the 'widget' skin] + adjusted title=A colored box with the \enquote{widget} skin] This is my content. \end{tcolorbox} \end{dispExample} @@ -4421,7 +4421,7 @@ Nevertheless, this skin can be applied independently. \clearpage -\subsection{Skin Family 'empty'} +\subsection{Skin Family \enquote{empty}} \begin{docSkin}{empty} This skin sets all engines to |empty|, i.\,e.\ nothing is drawn at all. @@ -4738,7 +4738,7 @@ are drawn by the codes given by \clearpage -\subsection{Skin 'spartan'}\label{subsec:spartan} +\subsection{Skin \enquote{spartan}}\label{subsec:spartan} \begin{docSkin}{spartan} This skin is quite \ldots\ spartan. @@ -4794,7 +4794,7 @@ are drawn by the codes given by \clearpage -\subsection{Skin 'draft'}\label{subsec:draft} +\subsection{Skin \enquote{draft}}\label{subsec:draft} \begin{docSkin}{draft} This skin is intended to be used while drafting new geometric settings @@ -4843,7 +4843,7 @@ are drawn by the codes given by \begin{dispExample} \vspace*{3mm} -\begin{tcolorbox}[draft,title=A colored box with the 'draft' skin] +\begin{tcolorbox}[draft,title=A colored box with the \enquote{draft} skin] \lipsum[1-3] \tcblower \lipsum[4-6] @@ -4853,9 +4853,9 @@ are drawn by the codes given by \clearpage -\subsection{Skin Family 'freelance'} +\subsection{Skin Family \enquote{freelance}} \begin{marker} -This skin family 'freelance' is deprecated with |tcolorbox| 3.00. +This skin family \enquote{freelance} is deprecated with |tcolorbox| 3.00. It is not longer needed, because \refKey{/tcb/frame code}, \refKey{/tcb/interior code}, diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex index e67508f74c..672ff20421 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex @@ -27,14 +27,14 @@ This also loads the package |amsmath|. is also set as \refKey{/tcb/nameref} identifier. The second mandatory parameter is a \meta{marker}. The theorem is automatically labeled with \meta{prefix}\meta{separator}\meta{marker} - where \meta{separator} is predefined as '|:|', see \refKey{/tcb/label separator}.\par + where \meta{separator} is predefined as \enquote{|:|}, see \refKey{/tcb/label separator}.\par The new environment \meta{name}|*| takes one optional and one mandatory parameter and represents an unnumbered variant of the environment \meta{name}. This variant is not labeled and not listed in lists of theorems. \enlargethispage*{20mm} \inputpreamblelisting{F} \begin{dispExample} -% usage of '\nameref' needs 'nameref' or 'hyperref' to be loaded +% usage of `\nameref' needs `nameref' or `hyperref' to be loaded \begin{mytheo}{This is my title}{theoexample} This is the text of the theorem. The counter is automatically assigned and, in this example, prefixed with the section number. This theorem is numbered with @@ -52,7 +52,7 @@ This also loads the package |amsmath|. \begin{dispExample} \begin{mytheo}{}{} - The title can also be left empty without problem. Note that the ':' + The title can also be left empty without problem. Note that the \enquote{:} vanished magically. \end{mytheo} \end{dispExample} @@ -100,7 +100,7 @@ To switch off the \texttt{nameref} feature permanently, add The first mandatory parameter is the title text for the theorem and the second mandatory parameter is a \meta{marker}. The theorem is automatically labeled with \meta{prefix}\meta{separator}\meta{marker} - where \meta{separator} is predefined as '|:|', see \refKey{/tcb/label separator}. + where \meta{separator} is predefined as \enquote{|:|}, see \refKey{/tcb/label separator}. \end{deprecated} \end{docCommand} @@ -424,7 +424,7 @@ the first setting. and \refKey{/tcb/theorem label supplement} can be used independently. \begin{dispExample} -% 'marginnote' has to be loaded +% `marginnote' has to be loaded \newtcbtheorem[use counter from=mytheo]{sometheorem}{Theorem}% {colback=white,colframe=red!50!black,fonttitle=\bfseries, theorem label supplement={hypertarget={XYZ-##1}}, @@ -498,19 +498,31 @@ created by hand or using \refCom{tcbmaketheorem} or using its successor \refCom{newtcbtheorem}. \end{docTcbKey} +\clearpage \begin{docTcbKey}{highlight math}{}{style, no value} - Predefined style which is used for \refCom{tcbhighmath}. - It can be changed comfortable with \refKey{/tcb/highlight math style}. + A style which is used for \refCom{tcbhighmath} and which is + predefined as |notitle,nophantom,colframe=red,colback=yellow!25!white|.\par + It can be changed with the usual |pgf| techniques or + with \refKey{/tcb/highlight math style}. +\begin{dispExample} +\begin{align*} + \tcbhighmath{1} + 1 &= 2,\\ + \tcbset{highlight math/.append style={left=0mm,right=0mm,top=0mm,bottom=0mm}} + \tcbhighmath{1} + 1 &= 2. +\end{align*} +\end{dispExample} + \end{docTcbKey} \begin{docTcbKey}{highlight math style}{=\meta{style definition}}{style, no default} - Changes the definition for \refKey{/tcb/highlight math} to the given - \meta{style definition}. See \refCom{tcbhighmath} for another example. + Changes the definition for \refKey{/tcb/highlight math} to + |notitle,nophantom| plus the given \meta{style definition}. + See \refCom{tcbhighmath} for another example. \begin{dispExample} % \tcbuselibrary{skins} -\tcbset{highlight math style={enhanced,%<-- needed for the 'remember' options +\tcbset{highlight math style={enhanced,%<-- needed for the `remember' options colframe=red,colback=red!10!white,boxsep=0pt}} \begin{align*} \tcbhighmath[remember as=fx]{f(x)} diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex index f5ad60430a..bad6fd6a60 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex @@ -33,8 +33,24 @@ for details about the argument \meta{specification} used in this section. \end{docTcbKey} -\begin{docTcbKey}{IfNoValueTF}{=\marg{argument}\marg{true options}\marg{false options}}{no default} - Wraps the |\IfNoValueTF| command of |xparse| for option setting. +\begin{docTcbKeys}[doc description = {no default}] + { + { + doc name = IfNoValueTF, + doc parameter = {=\marg{argument}\marg{true options}\marg{false options}}, + }, + { + doc name = IfNoValueT, + doc parameter = {=\marg{argument}\marg{true options}}, + doc new = 2020-09-16, + }, + { + doc name = IfNoValueF, + doc parameter = {=\marg{argument}\marg{false options}}, + doc new = 2020-09-16, + } + } + Wraps the |\IfNoValue(TF)| command(s) of |xparse| for option setting. If the \meta{argument} has no value, the \meta{true options} are set. Otherwise, the \meta{false options} are set. \begin{dispExample} @@ -49,16 +65,34 @@ This is a tcolorbox. This is a tcolorbox. \end{mybox} \end{dispExample} -\end{docTcbKey} +\end{docTcbKeys} \clearpage -\begin{docTcbKey}{IfValueTF}{=\marg{argument}\marg{true options}\marg{false options}}{no default} - Wraps the |\IfValueTF| command of |xparse| for option setting. + + +\begin{docTcbKeys}[doc description = {no default}] + { + { + doc name = IfValueTF, + doc parameter = {=\marg{argument}\marg{true options}\marg{false options}}, + }, + { + doc name = IfValueT, + doc parameter = {=\marg{argument}\marg{true options}}, + doc new = 2020-09-16, + }, + { + doc name = IfValueF, + doc parameter = {=\marg{argument}\marg{false options}}, + doc new = 2020-09-16, + } + } + Wraps the |\IfValue(TF)| command(s) of |xparse| for option setting. If the \meta{argument} has a value, the \meta{true options} are set. Otherwise, the \meta{false options} are set. \begin{dispExample} \DeclareTColorBox{mybox}{ o }{colframe=red!75!black,colback=red!5!white, - IfValueTF={#1}{title={\flqq #1\frqq},fonttitle=\bfseries}{}} + IfValueT={#1}{title={\flqq #1\frqq},fonttitle=\bfseries}} \begin{mybox} This is a tcolorbox. @@ -68,10 +102,28 @@ This is a tcolorbox. This is a tcolorbox. \end{mybox} \end{dispExample} -\end{docTcbKey} - -\begin{docTcbKey}{IfBooleanTF}{=\marg{argument}\marg{true options}\marg{false options}}{no default} - Wraps the |\IfBooleanTF| command of |xparse| for option setting. +\end{docTcbKeys} + +\medskip + +\begin{docTcbKeys}[doc description = {no default}] + { + { + doc name = IfBooleanTF, + doc parameter = {=\marg{argument}\marg{true options}\marg{false options}}, + }, + { + doc name = IfBooleanT, + doc parameter = {=\marg{argument}\marg{true options}}, + doc new = 2020-09-16, + }, + { + doc name = IfBooleanF, + doc parameter = {=\marg{argument}\marg{false options}}, + doc new = 2020-09-16, + } + } + Wraps the |\IfBoolean(TF)| command(s) of |xparse| for option setting. If the \meta{argument} is |\BooleanTue|, the \meta{true options} are set. If the \meta{argument} is |\BooleanFalse|, the \meta{false options} are set. @@ -87,7 +139,7 @@ This is a tcolorbox. This is a tcolorbox. \end{mybox} \end{dispExample} -\end{docTcbKey} +\end{docTcbKeys} diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.pdf b/macros/latex/contrib/tcolorbox/tcolorbox.pdf Binary files differindex e9a5c9374d..ef1068931f 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.pdf +++ b/macros/latex/contrib/tcolorbox/tcolorbox.pdf diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.sty b/macros/latex/contrib/tcolorbox/tcolorbox.sty index 2af5529755..a934739908 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.sty +++ b/macros/latex/contrib/tcolorbox/tcolorbox.sty @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tcolorbox}[2020/07/31 version 4.31 text color boxes] -\def\tcb@version{4.31} +\ProvidesPackage{tcolorbox}[2020/09/17 version 4.32 text color boxes] +\def\tcb@version{4.32} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -400,7 +400,7 @@ halign title/center/.code={\let\kvtcb@haligntitle=\tcb@raggedcenter@plain}, halign title/justify/.code={\let\kvtcb@haligntitle=\@empty}, % - valign scale limit/.store in=\kvtcbv@valignscalelimit, + valign scale limit/.store in=\kvtcb@valignscalelimit, valign scale limit=1.1, valign/.is choice, valign/top/.code={\def\kvtcb@valignupper{top}}, @@ -815,10 +815,10 @@ \let\endtcb@savebox=\endtcb@lrbox \def\tcb@saveupperbox{% -\begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper} +\begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\color{tcbcolupper}\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper} \def\tcb@savelowerbox{% -\begin{tcb@savebox}{\tcb@lowerbox}{\tcb@w@lower}\kvtcb@fontlower\kvtcb@halignlower\tcb@insert@before@lower} +\begin{tcb@savebox}{\tcb@lowerbox}{\tcb@w@lower}\color{tcbcollower}\kvtcb@fontlower\kvtcb@halignlower\tcb@insert@before@lower} % counter for float @@ -911,24 +911,12 @@ \fi% } -\def\tcb@set@color#1{% - \edef\current@color{\@nameuse{\string\color@#1}}% - \colorlet{.}{#1}% -} - -\def\tcb@reset@color{% - \colorlet{.}{tcbcol@origin}% - \edef\current@color{\@nameuse{\string\color@tcbcol@origin}}% -} - \def\tcb@set@@upper@and@lower{% - \colorlet{tcbcol@origin}{.}% \let\tcb@insert@after@part=\tcb@insert@after@upper% % switch for lower box \def\tcblower{% \tcb@insert@after@part% \end{tcb@savebox}% - \tcb@set@color{tcbcollower}% \unless\iftcb@sidebyside% \tcbdimto\tcb@w@lower{\tcb@innerwidth-\kvtcb@boxsep*2-\kvtcb@leftlower-\kvtcb@rightlower}% \fi% @@ -943,7 +931,6 @@ \fi% \tcb@startbox}% % start of upper box - \tcb@set@color{tcbcolupper}% \ifx\kvtcb@saveupperto\@empty% \let\tcb@startbox\tcb@saveupperbox% \let\endtcolorbox\tcb@endboxanddraw% @@ -1130,13 +1117,11 @@ \def\tcb@endboxanddraw{% \tcb@insert@after@part% \end{tcb@savebox}% - \tcb@reset@color% \tcb@draw@color@box% \tcb@finalize@environment% } \def\tcb@finalize@environment{% - %\color{.}% hack for some special cases \tcb@layer@dec% } @@ -1271,11 +1256,11 @@ \iftcb@lowerspace\tcb@ch@fixed@both\else\tcb@ch@fixed@upper\fi% } -\def\tcb@dbox@top#1#2#3#4#5{\pgftext[x=#1,y=#2+#3,left,top]{\color{#5}\box#4}}% +\def\tcb@dbox@top#1#2#3#4#5{\pgftext[x=#1,y=#2+#3,left,top]{#5}} -\def\tcb@dbox@bottom#1#2#3#4#5{\pgftext[x=#1,y=#2,left,bottom]{\color{#5}\box#4}}% +\def\tcb@dbox@bottom#1#2#3#4#5{\pgftext[x=#1,y=#2,left,bottom]{#5}} -\def\tcb@dbox@center#1#2#3#4#5{\pgftext[x=#1,y=#2+#3/2,left]{\color{#5}\box#4}}% +\def\tcb@dbox@center#1#2#3#4#5{\pgftext[x=#1,y=#2+#3/2,left]{#5}} \def\tcb@resize@box#1#2#3{% \setbox#1\hbox{\resizebox*{#2}{#3}{\box#1}}% @@ -1289,18 +1274,18 @@ \tcbdimto\tcb@box@h@target{#3}% \tcb@resize@box{#4}{\tcb@box@w@target}{\tcb@box@h@target}% \fi% - \pgftext[x=#1,y=#2+#3,left,top]{\color{#5}\box#4}}% + \pgftext[x=#1,y=#2+#3,left,top]{#5}}% \def\tcb@dbox@resizelimited#1#2#3#4#5{% \iftcb@fixedheight% \tcbdimto\tcb@box@w@target{\wd#4}% - \tcbdimto\tcb@box@h@target{\kvtcbv@valignresizelimit\dimexpr(\ht#4+\dp#4)}% + \tcbdimto\tcb@box@h@target{\kvtcb@valignscalelimit\dimexpr(\ht#4+\dp#4)}% \ifdim\dimexpr\tcb@box@h@target>#3\relax% \tcbdimto\tcb@box@h@target{#3}% \fi% \tcb@resize@box{#4}{\tcb@box@w@target}{\tcb@box@h@target}% \fi% - \pgftext[x=#1,y=#2+#3,left,top]{\color{#5}\box#4}}% + \pgftext[x=#1,y=#2+#3,left,top]{#5}}% \let\tcb@pgfprocess@@specialround@orig=\pgfprocess@@specialround @@ -1566,7 +1551,7 @@ \pgfsetfillopacity{\kvtcb@opacitytitle}% \pgftext[x=\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@lefttitle\relax, y=\the\dimexpr\tcb@height-\kvtcb@top@rule-\kvtcb@boxsep-\kvtcb@toptitle\relax, - left,top]{\color{tcbcoltitle}\box\tcb@titlebox}% + left,top]{\box\tcb@titlebox}% \end{pgfscope}% \fi\fi% } @@ -1578,7 +1563,9 @@ \pgfsetfillopacity{\kvtcb@opacityupper}% \csname tcb@dbox@\kvtcb@valignupper\endcsname{\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@leftupper\relax}% {\the\dimexpr\tcb@innerheight+\kvtcb@bottom@rule-\kvtcb@boxsep-\tcb@break@topsep-\kvtcb@top-\tcb@height@upper\relax}% - {\tcb@height@upper}{\tcb@upperbox}{tcbcolupper}% + {\tcb@height@upper}{\tcb@upperbox}{% + \color@begingroup\tcb@upperdraw@begin@hook\box\tcb@upperbox\tcb@upperdraw@end@hook\color@endgroup% + }% \end{pgfscope}% \fi% } @@ -1590,7 +1577,9 @@ \pgfsetfillopacity{\kvtcb@opacitylower}% \csname tcb@dbox@\kvtcb@valignlower\endcsname{\the\dimexpr\kvtcb@left@rule+\kvtcb@boxsep+\kvtcb@leftlower\relax}% {\the\dimexpr\kvtcb@bottom@rule+\kvtcb@boxsep+\tcb@break@bottomsep+\kvtcb@bottom\relax}% - {\tcb@height@lower}{\tcb@lowerbox}{tcbcollower}% + {\tcb@height@lower}{\tcb@lowerbox}{% + \color@begingroup\tcb@lowerdraw@begin@hook\box\tcb@lowerbox\tcb@lowerdraw@end@hook\color@endgroup% + }% \end{pgfscope}% \fi% } @@ -1621,7 +1610,7 @@ \fi% \iftcb@hasLower% \tcb@box@align{\tcb@lowerbox}% - \iftcb@lowervisible\leavevmode\color{tcbcollower}\unhbox\tcb@lowerbox% + \iftcb@lowervisible\leavevmode\unhbox\tcb@lowerbox% \else% \iftcb@lowerignored\else\rule[-\dp\tcb@lowerbox]{\z@}{\the\dimexpr\ht\tcb@lowerbox+\dp\tcb@lowerbox\relax}\fi% \fi% @@ -1763,10 +1752,7 @@ \long\def\tcbox@inner@hbox#1{% \tcbset{breakable@false,sidebyside=false}% \tcb@set@@phantom% - \colorlet{tcbcol@origin}{.}% - \tcb@set@color{tcbcolupper}% - \sbox\tcb@upperbox{\tcb@embed@tcbox{\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper#1\tcb@insert@after@upper}}% - \tcb@reset@color% + \sbox\tcb@upperbox{\tcb@embed@tcbox{\color{tcbcolupper}\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper#1\tcb@insert@after@upper}}% \tcbdimto\tcb@val@raisebase{\the\dimexpr\dp\tcb@upperbox+\kvtcb@bottom+\kvtcb@boxsep+\kvtcb@bottom@rule@stand+\kvtcb@bbbottom@stand\relax}% \tcbdimto\kvtcb@width{\wd\tcb@upperbox+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule}% \tcb@hasLowerfalse% @@ -1781,10 +1767,7 @@ \tcb@set@@phantom% \tcb@set@@title% \tcb@set@@dimensions% - \colorlet{tcbcol@origin}{.}% - \tcb@set@color{tcbcolupper}% - \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper#1\tcb@insert@after@upper\end{tcb@savebox}% - \tcb@reset@color% + \begin{tcb@savebox}{\tcb@upperbox}{\tcb@w@upper}\color{tcbcolupper}\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper#1\tcb@insert@after@upper\end{tcb@savebox}% \tcb@hasLowerfalse% \tcb@draw@color@box% } @@ -2162,8 +2145,15 @@ \tcbset{% initialize@reset/.code={\tcbset{#1}\appto\tcb@reset{\tcbset{#1}}},% reset/.code={\tcb@reset},% - reset@core/.style={code={\let\tcbtitletext\@empty\tcb@attach@title@code@% - \let\tcb@lateoptions@hook\@empty}, + reset@core/.style={code={% + \let\tcbtitletext\@empty% + \tcb@attach@title@code@% + \let\tcb@lateoptions@hook\@empty% + \let\tcb@upperdraw@begin@hook\@empty% + \let\tcb@upperdraw@end@hook\@empty% + \let\tcb@lowerdraw@begin@hook\@empty% + \let\tcb@lowerdraw@end@hook\@empty% + }, width=\linewidth,autoparskip,arc is curved, natural height,height plus=0pt,space to lower,valign=top,valign lower=top, size=normal,rounded corners,parfillskip restore, diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.tex b/macros/latex/contrib/tcolorbox/tcolorbox.tex index f159b97142..2b2a2d9102 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox.tex @@ -1,5 +1,5 @@ % \LaTeX-Main\ -%% The LaTeX package tcolorbox - version 4.31 (2020/07/31) +%% The LaTeX package tcolorbox - version 4.32 (2020/09/17) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -43,8 +43,8 @@ \setlength{\bibitemsep}{\smallskipamount} \addbibresource{tcolorbox.doc.bib} -\def\version{4.31}% -\def\datum{2020/07/31}% +\def\version{4.32}% +\def\datum{2020/09/17}% \makeindex \hypersetup{ @@ -62,7 +62,7 @@ %\geometry{showframe} %\tcbset{draftmode} \tcbset{/tcb/external/-}% for final run -%\includeonly{tcolorbox.doc.external} +%\includeonly{tcolorbox.doc.breakable} %\hypersetup{colorlinks=false} |