From d06b4118c72d0c81fc0760e24add55e808471dbc Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 21 Jul 2021 03:00:43 +0000 Subject: CTAN sync 202107210300 --- .../latex/contrib/babel-contrib/french/README.md | 2 +- .../contrib/babel-contrib/french/frenchb-doc.pdf | Bin 154799 -> 159363 bytes .../contrib/babel-contrib/french/frenchb-doc.tex | 20 +++--- .../latex/contrib/babel-contrib/french/frenchb.dtx | 70 +++++++++------------ .../latex/contrib/babel-contrib/french/frenchb.ins | 4 +- .../latex/contrib/babel-contrib/french/frenchb.pdf | Bin 328108 -> 331863 bytes macros/latex/contrib/catechis/CHANGES | 4 ++ macros/latex/contrib/catechis/catechis.dtx | 14 +++-- macros/latex/contrib/catechis/catechis.pdf | Bin 388369 -> 388762 bytes macros/latex/contrib/siunitx/CHANGELOG.md | 18 +++++- macros/latex/contrib/siunitx/siunitx-code.pdf | Bin 1497392 -> 1496050 bytes macros/latex/contrib/siunitx/siunitx-number.dtx | 13 +--- macros/latex/contrib/siunitx/siunitx-symbol.dtx | 48 ++++++-------- macros/latex/contrib/siunitx/siunitx-unit.dtx | 8 +-- macros/latex/contrib/siunitx/siunitx.dtx | 2 +- macros/latex/contrib/siunitx/siunitx.pdf | Bin 635531 -> 635529 bytes 16 files changed, 97 insertions(+), 106 deletions(-) (limited to 'macros/latex') diff --git a/macros/latex/contrib/babel-contrib/french/README.md b/macros/latex/contrib/babel-contrib/french/README.md index 50845e3684..0e046586e0 100644 --- a/macros/latex/contrib/babel-contrib/french/README.md +++ b/macros/latex/contrib/babel-contrib/french/README.md @@ -50,5 +50,5 @@ Changes See the included manual frenchb.pdf, section "Change History". --- -Copyright 1996--2020 Daniel Flipo +Copyright 1996--2021 Daniel Flipo E-mail: daniel (dot) flipo (at) free (dot) fr diff --git a/macros/latex/contrib/babel-contrib/french/frenchb-doc.pdf b/macros/latex/contrib/babel-contrib/french/frenchb-doc.pdf index d55eccfeee..bf4c8438e4 100644 Binary files a/macros/latex/contrib/babel-contrib/french/frenchb-doc.pdf and b/macros/latex/contrib/babel-contrib/french/frenchb-doc.pdf differ diff --git a/macros/latex/contrib/babel-contrib/french/frenchb-doc.tex b/macros/latex/contrib/babel-contrib/french/frenchb-doc.tex index 2ff7f14307..467181d9dc 100644 --- a/macros/latex/contrib/babel-contrib/french/frenchb-doc.tex +++ b/macros/latex/contrib/babel-contrib/french/frenchb-doc.tex @@ -1,3 +1,5 @@ +\RequirePackage{pdfmanagement-testphase} +\DeclareDocumentMetadata{pdfstandard=A-2b, lang=fr-FR} \documentclass[a4paper,12pt,german,english,french]{article} % LuaTeX ONLY! @@ -107,11 +109,8 @@ \makeatother \usepackage{hyperref} -\hypersetup{pdftitle={Documentation de babel-french}, - pdfcreator={LuaTeX}, +\hypersetup{pdftitle={Mode d’emploi de babel-french}, pdfauthor={Daniel FLIPO}, - unicode, - bookmarksopen, colorlinks, urlcolor=PineGreen, linkcolor=Blue, @@ -121,11 +120,9 @@ \newcommand*{\samefntmk}{% \addtocounter{Hfootnote}{-1}\addtocounter{footnote}{-1}\footnotemark} -\usepackage[open]{bookmark} -% -\title{Documentation sur le module \ext{babel-french}} +\title{Mode d’emploi du module \ext{babel-french}} \author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}} -\newcommand*{\latestversion}{3.5l} +\newcommand*{\latestversion}{3.5m} \date{Version {\latestversion} -- \today} \begin{document} @@ -400,9 +397,8 @@ document (ou maquette) est modifiée de la façon suivante% «Figure~1~--~Légende» au lieu de «Figure~1\string:~Légende». Il est possible de choisir un autre séparateur : pour remplacer le tiret double «--» par un tiret triple «---», - ajouter dans le préambule - |\renewcommand*{\CaptionSeparator}{\space\textemdash\space}|.% - \hlabel{captionseparator} + ajouter dans le préambule\hlabel{captionseparator}\\ + |\renewcommand*{\CaptionSeparator}{\space\textemdash\space}|. Lorsque la langue principale n’est pas le français, le séparateur «\string:» est utilisé pour toutes les langues mais une espace insécable est en principe @@ -1082,7 +1078,7 @@ La liste étant longue, les options sont regroupées par thèmes. légendes de figures et tables est supprimé, on obtient « Figure » et « Table » au lieu de « \textsc{Figure} » et « \textsc{Table} ». Noter que le même résultat peut être obtenu en définissant |\FBfigtabshape| - comme |\relax| avant le chargement de \ext{babel}.%\hlabel{scfigtab} + comme |\relax| avant le chargement de \ext{babel}.\hlabel{scfigtab} \item [CustomiseFigTabcaptions=false (true*)] ; si cette option est mise à \fbo{false}, le séparateur défini par |\CaptionSeparator| est remplacé par diff --git a/macros/latex/contrib/babel-contrib/french/frenchb.dtx b/macros/latex/contrib/babel-contrib/french/frenchb.dtx index 161833dd13..4630c18ef4 100644 --- a/macros/latex/contrib/babel-contrib/french/frenchb.dtx +++ b/macros/latex/contrib/babel-contrib/french/frenchb.dtx @@ -1,4 +1,4 @@ -%\CheckSum{3759} +%\CheckSum{3732} % %\iffalse % Tell the LaTeX system who we are and write an entry on the @@ -13,12 +13,12 @@ %\ProvidesLanguage{frenchb} %--[[ % File `frenchb.lua’ generated from frenchb.dtx - [2020/10/10 v3.5l French support from the babel system] + [2021/07/20 v3.5m French support from the babel system] %<*internal> \iffalse % %<*lua> - Copyright © 2014-2020 Daniel Flipo + Copyright © 2014-2021 Daniel Flipo License LPPL: see french.ldf. --]] @@ -32,7 +32,7 @@ %<*dtx|french> %% %% Babel package for LaTeX version 2e -%% Copyright © 1996-2020 +%% Copyright © 1996-2021 %% by Daniel Flipo %% % @@ -42,6 +42,8 @@ %% % %<*filedriver> +\RequirePackage{pdfmanagement-testphase} +\DeclareDocumentMetadata{pdfstandard=A-2b, lang=en-US} \documentclass[a4paper]{ltxdoc} \usepackage[left=38mm,right=38mm,top=30mm,bottom=50mm]{geometry} \usepackage[dvipsnames]{xcolor} @@ -63,10 +65,10 @@ \def\PrintMacroName#1{% \strut\MacroFont\color{Sepia}\normalsize\string#1} \def\ColorArg{\color{Sepia}} -\usepackage[expansion=true,protrusion=true]{microtype} +\usepackage[verbose=silent]{microtype} \usepackage{array,url} \usepackage[numbered]{hypdoc} -\hypersetup{colorlinks,urlcolor=Blue,linkcolor=Blue,unicode} +\hypersetup{colorlinks,urlcolor=Blue,linkcolor=Blue} \newcommand*{\hlabel}[1]{\phantomsection\label{#1}} \newcommand*\babel{\texttt{Babel}} \newcommand*\frenchb{\texttt{babel-french}} @@ -1973,8 +1975,8 @@ local function french_punctuation (head) % spaces in http://mysite, C:\textbackslash{} or 10:35); % b) the previous character is part of type |FB_punct_null| % (avoids spurious spaces in strings like |(!)| or |??|); -% c) a null glue (actually glues <= 1 sp for tabulars) preceeds -% the punctuation character (for tabulars and listings); +% c) a null glue (actually <= 1 sp for tabulars, possibly < 0) +% preceeds the punctuation character (for tabulars and listings); % d) the punctuation character starts a paragraph or an |\hbox{}|. % % When option \fbo{UnicodeNoBreakSpaces} is set to \fbo{true}, @@ -4107,17 +4109,16 @@ return french_punctuation % \label{ssec-dots} % % \begin{macro}{\FBtextellipsis} -% LaTeX’s standard definition of |\dots| in text-mode is -% |\textellipsis| which includes a |\kern| at the end; -% this space is not wanted in some cases (before a closing brace -% for instance) and |\kern| breaks hyphenation of the next word. -% We define |\FBtextellipsis| for French (in LaTeX only). -% -% The |\if| construction in the LaTeX definition of |\dots| -% doesn’t allow the use of |xspace| (|xspace| is always followed -% by a |\fi|), so we use the AMS-LaTeX construction of |\dots|; -% this has to be done `AtBeginDocument’ not to be overwritten -% when \file{amsmath.sty} is loaded after \babel. +% Unless a ready-made character is available in the current font, +% LaTeX’s default definition of |\textellipsis| includes a |\kern| at +% the end; this space is not wanted in some cases (before a closing +% brace for instance) and |\kern| breaks hyphenation of the next +% word. We define |\FBtextellipsis| for French (in LaTeX only) the +% same way but without the last |\kern|. +% +% LY1 has a ready made character for |\textellipsis|, it should be +% used in French. The same is true for Unicode fonts in use +% with XeTeX and LuaTeX. % % \changes{v2.0}{2006/11/06}{Added special case for LY1 encoding, % see bug report from Bruno Voisin (2004/05/18).} @@ -4126,36 +4127,22 @@ return french_punctuation % character for \cs{textellipsis}, let’s just use it! % (reported by Maxime Chupin, 2011/06/04).} % -% LY1 has a ready made character for |\textellipsis|, it should be -% used in French too. The same is true for Unicode fonts in use -% with XeTeX and LuaTeX. +% \changes{v3.5m}{2021/07/19}{No longer redefine \cs{dots}, only +% \cs{textellipsis}’s default definition is changed in French.} % % \begin{macrocode} \ifFBunicode - \let\FBtextellipsis\textellipsis \else \DeclareTextSymbol{\FBtextellipsis}{LY1}{133} + \DeclareTextCommand{\FBtextellipsis}{PU}{\9040\046} + \DeclareTextCommand{\FBtextellipsis}{PD1}{\203} \DeclareTextCommandDefault{\FBtextellipsis}{% - .\kern\fontdimen3\font.\kern\fontdimen3\font.\xspace} + .\kern\fontdimen3\font.\kern\fontdimen3\font.\xspace}% + \def\bbl@frenchdots{\babel@save\textellipsis + \let\textellipsis\FBtextellipsis} + \addto\extrasfrench{\bbl@frenchdots} \fi % \end{macrocode} -% |\Mdots@| and |\Tdots@| hold the definitions of |\dots| in -% Math and Text mode. They default to those of amsmath-2.0, and -% will revert to standard LaTeX definitions `AtBeginDocument’, -% if amsmath has not been loaded. |\Mdots@| doesn’t change when -% switching from/to French, while |\Tdots@| is redefined as -% |\FBtextellipsis| in French. -% \begin{macrocode} -\newcommand*{\Tdots@}{\@xp\textellipsis} -\newcommand*{\Mdots@}{\@xp\mdots@} -\AtBeginDocument{\DeclareRobustCommand*{\dots}{\relax - \csname\ifmmode M\else T\fi dots@\endcsname}% - \ifdefined\@xp\else\let\@xp\relax\fi - \ifdefined\mdots@\else\let\Mdots@\mathellipsis\fi - } -\def\bbl@frenchdots{\babel@save\Tdots@ \let\Tdots@\FBtextellipsis} -\addto\extrasfrench{\bbl@frenchdots} -% \end{macrocode} % \end{macro} % % \subsection{More checks about packages’ loading order} @@ -6068,5 +6055,6 @@ return french_punctuation %%% Local Variables: %%% fill-column: 72 %%% coding: utf-8 +%%% mode: doctex %%% TeX-engine: luatex %%% End: diff --git a/macros/latex/contrib/babel-contrib/french/frenchb.ins b/macros/latex/contrib/babel-contrib/french/frenchb.ins index 4313f3501a..a8bfed7524 100644 --- a/macros/latex/contrib/babel-contrib/french/frenchb.ins +++ b/macros/latex/contrib/babel-contrib/french/frenchb.ins @@ -2,7 +2,7 @@ %% This file will generate fast loadable files and documentation driver %% files from the doc files in this package when run through LuaTeX. %% -%% Copyright 2001-2020 Daniel Flipo. All rights reserved. +%% Copyright 2001-2021 Daniel Flipo. All rights reserved. %% %% This is a generated file part of the the babel-french bundle %% to be used with the Babel system. @@ -14,7 +14,7 @@ %% %% --------------- start of docstrip commands ------------------ %% -\def\filedate{2020/01/30} +\def\filedate{2021/01/30} \def\batchfile{frenchb.ins} \input docstrip.tex diff --git a/macros/latex/contrib/babel-contrib/french/frenchb.pdf b/macros/latex/contrib/babel-contrib/french/frenchb.pdf index 56a5c87b0d..2f202d918f 100644 Binary files a/macros/latex/contrib/babel-contrib/french/frenchb.pdf and b/macros/latex/contrib/babel-contrib/french/frenchb.pdf differ diff --git a/macros/latex/contrib/catechis/CHANGES b/macros/latex/contrib/catechis/CHANGES index 1f13f13936..24c25df8e7 100644 --- a/macros/latex/contrib/catechis/CHANGES +++ b/macros/latex/contrib/catechis/CHANGES @@ -1,3 +1,7 @@ +17 Jul 1205 (19 Jul 2021): Page breaks are now prohibited +between the citation title and the first citation. Version +2.6. + 02 Nov 1202 (02 Nov 2018): Page breaks are now prohibited between the question and answer (though of course they can still be broken within questions or answers). Version 2.5. diff --git a/macros/latex/contrib/catechis/catechis.dtx b/macros/latex/contrib/catechis/catechis.dtx index b650d413a7..fe184bf45d 100644 --- a/macros/latex/contrib/catechis/catechis.dtx +++ b/macros/latex/contrib/catechis/catechis.dtx @@ -25,7 +25,7 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] -%\ProvidesPackage{catechis}[2018/11/02 v2.5 Support for writing catechism questions and answers] +%\ProvidesPackage{catechis}[2021/07/17 v2.6 Support for writing catechism questions and answers] %<*driver> \documentclass{ltxdoc} @@ -57,7 +57,7 @@ \end{document} % \fi % -% \title{The |catechis| Package, v2.5} \author{Donald P.\ +% \title{The |catechis| Package, v2.6} \author{Donald P.\ % Goodman III} \date{\today} % % \maketitle @@ -545,9 +545,12 @@ \def\catcitetitlesty{\Large\scshape}% \def\catcitetitleword{Citations}% \def\catcitetitle{% - \begin{center}% - \catcitetitlesty\catcitetitleword% - \end{center}% + \hbox to\linewidth{% + \hfil% + {\catcitetitlesty\catcitetitleword}% + \hfil% + }% + \penalty10000% }% \newlength\catcitationbefskip\catcitationbefskip=1em% \newlength\catcitationaftskip\catcitationaftskip=1em% @@ -572,6 +575,7 @@ \def\catcite#1#2{% {\parindent=\catciteindent\hangindent=\catcitehindent\hangafter=1% {\par\catcitesty #1}\par}% + \penalty10000% {\parindent=\catsrcindent\hangindent=\catsrchindent\hangafter=1% {\par\catsrcsty#2}\par}% }% diff --git a/macros/latex/contrib/catechis/catechis.pdf b/macros/latex/contrib/catechis/catechis.pdf index 291c99db91..6df8d37382 100644 Binary files a/macros/latex/contrib/catechis/catechis.pdf and b/macros/latex/contrib/catechis/catechis.pdf differ diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md index d02f541581..83907537c6 100644 --- a/macros/latex/contrib/siunitx/CHANGELOG.md +++ b/macros/latex/contrib/siunitx/CHANGELOG.md @@ -7,6 +7,20 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] +## [v3.0.21] + +### Fixed +- Print degree symbol if `fontspec` package is loaded with + `no-math` option (issue #505) +- Handling of 'over-long' separated uncertainties (issue #506) +- Symbol for arcs in text mode (issue #507) + +## [v3.0.20] + +### Fixed +- Interaction with `kotex` (issue #502) +- Handling of groups in literal units (issue #503) + ## [v3.0.19] ### Fixed @@ -1425,7 +1439,9 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ### Added - First public testing release (as `si`) -[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.19...HEAD +[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.21...HEAD +[v3.0.21]: https://github.com/josephwright/siunitx/compare/v3.0.20...v3.0.21 +[v3.0.20]: https://github.com/josephwright/siunitx/compare/v3.0.19...v3.0.20 [v3.0.19]: https://github.com/josephwright/siunitx/compare/v3.0.18...v3.0.19 [v3.0.18]: https://github.com/josephwright/siunitx/compare/v3.0.17...v3.0.18 [v3.0.17]: https://github.com/josephwright/siunitx/compare/v3.0.16...v3.0.17 diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf index 92e8cf9837..513b2d7da8 100644 Binary files a/macros/latex/contrib/siunitx/siunitx-code.pdf and b/macros/latex/contrib/siunitx/siunitx-code.pdf differ diff --git a/macros/latex/contrib/siunitx/siunitx-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx index 108925d535..59a6dd8129 100644 --- a/macros/latex/contrib/siunitx/siunitx-number.dtx +++ b/macros/latex/contrib/siunitx/siunitx-number.dtx @@ -906,16 +906,9 @@ \cs_new_protected:Npn \@@_parse_combine_uncert_auxi:nnnnnnnn #1#2#3#4#5#6#7#8 { - \int_compare:nNnTF { \tl_count:n {#6} } > { \tl_count:n {#2} } - { - \tl_clear:N \l_@@_parsed_tl - \tl_clear:N \l_@@_flex_tl - } - { - \@@_parse_combine_uncert_auxii:fnnnn - { \int_eval:n { \tl_count:n {#3} - \tl_count:n {#7} } } - {#2} {#3} {#6} {#7} - } + \@@_parse_combine_uncert_auxii:fnnnn + { \int_eval:n { \tl_count:n {#3} - \tl_count:n {#7} } } + {#2} {#3} {#6} {#7} } \cs_new_protected:Npn \@@_parse_combine_uncert_auxii:nnnnn #1 diff --git a/macros/latex/contrib/siunitx/siunitx-symbol.dtx b/macros/latex/contrib/siunitx/siunitx-symbol.dtx index c86d77e9f1..a0c9368b21 100644 --- a/macros/latex/contrib/siunitx/siunitx-symbol.dtx +++ b/macros/latex/contrib/siunitx/siunitx-symbol.dtx @@ -117,8 +117,7 @@ \@@_deal_with_utf: \exp_after:wN \exp_after:wN \exp_after:wN \exp_not:N \char_generate:nn {#1} { 13 } - \exp_after:wN \exp_after:wN \exp_after:wN - \exp_not:N \char_generate:nn {#2} { 13 } + \char_generate:nn {#2} { 12 } } } \cs_new:Npn \@@_deal_with_utf: { } @@ -165,34 +164,29 @@ \@@_if_replace:NnT \arcminute { "02B9 } { \siunitx_declare_unit:Nn \arcminute - { \exp_not:N \ensuremath { { } ' } } + { \ensuremath { { } ' } } } \@@_if_replace:NnT \arcsecond { "02BA } { \siunitx_declare_unit:Nn \arcsecond - { \exp_not:N \ensuremath { { } '' } } + { \ensuremath { { } '' } } } % \end{macrocode} -% For |\degree|, direct input works in text mode so there is -% only a need to tidy up for math mode. If \pkg{fontspec} is loaded then that -% problem goes away, so nothing needs to be done. +% For |\degree|, direct input works in text mode so there is only a need to +% tidy up for math mode. % \begin{macrocode} \@@_if_replace:NnT \degree { "00B0 } { - \@ifpackageloaded { fontspec } - { } + \siunitx_declare_unit:Nxn \degree { - \siunitx_declare_unit:Nxn \degree + \exp_not:N \text { - \exp_not:N \text - { - \@ifpackageloaded { inputenc } - { \exp_not:N \textdegree } - { \@@_non_latin:n { "00B0 } } - } + \@ifpackageloaded { inputenc } + { \exp_not:N \textdegree } + { \@@_non_latin:n { "00B0 } } } - { quantity-product = { } } - } + } + { quantity-product = { } } } % \end{macrocode} % For |\degreeCelsius|, much the same to think about but the comparison @@ -207,20 +201,16 @@ \str_if_eq:VVTF \l_@@_tmpa_tl \l_@@_tmpb_tl { \group_end: - \@ifpackageloaded { fontspec } - { } + \siunitx_declare_unit:Nx \degreeCelsius { - \siunitx_declare_unit:Nx \degreeCelsius + \exp_not:N \text { - \exp_not:N \text - { - \@ifpackageloaded { inputenc } - { \exp_not:N \textdegree } - { \@@_non_latin:n { "00B0 } } - } - C + \@ifpackageloaded { inputenc } + { \exp_not:N \textdegree } + { \@@_non_latin:n { "00B0 } } } - } + C + } } { \group_end: } % \end{macrocode} diff --git a/macros/latex/contrib/siunitx/siunitx-unit.dtx b/macros/latex/contrib/siunitx/siunitx-unit.dtx index b0602c2543..be3e6eaf61 100644 --- a/macros/latex/contrib/siunitx/siunitx-unit.dtx +++ b/macros/latex/contrib/siunitx/siunitx-unit.dtx @@ -1351,7 +1351,7 @@ \tl_clear:N \l_@@_separator_tl } \cs_new_protected:Npn \@@_format_literal_auxix:nn #1#2 - { \@@_format_literal_auxvi:nN { #1 {#2} } } + { \@@_format_literal_auxv:nw { #1 {#2} } } \use:x { \cs_new_protected:Npn \exp_not:N \@@_format_literal_auxx:nw @@ -2511,7 +2511,8 @@ % \begin{macro}{\@@_non_latin:nnnn} % A small amount of code to make it convenient to include non-Latin % characters in units without having to directly include them in the -% sources directly. +% sources directly. We only make the first token active as some packages +% (\foreign{e.g.}~\pkg{kotex}) do this. % \begin{macrocode} \bool_lazy_or:nnTF { \sys_if_engine_luatex_p: } @@ -2530,8 +2531,7 @@ { \exp_after:wN \exp_after:wN \exp_after:wN \exp_not:N \char_generate:nn {#1} { 13 } - \exp_after:wN \exp_after:wN \exp_after:wN - \exp_not:N \char_generate:nn {#2} { 13 } + \char_generate:nn {#2} { 12 } } } % \end{macrocode} diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx index 7111f98392..8f9b2dab57 100644 --- a/macros/latex/contrib/siunitx/siunitx.dtx +++ b/macros/latex/contrib/siunitx/siunitx.dtx @@ -121,7 +121,7 @@ % % Identify the package and give the over all version information. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2021-07-06} {3.0.19} +\ProvidesExplPackage {siunitx} {2021-07-20} {3.0.21} {A comprehensive (SI) units package} % \end{macrocode} % diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf index 7ffe026741..041c2f21c7 100644 Binary files a/macros/latex/contrib/siunitx/siunitx.pdf and b/macros/latex/contrib/siunitx/siunitx.pdf differ -- cgit v1.2.3