summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-03-29 03:01:40 +0000
committerNorbert Preining <norbert@preining.info>2023-03-29 03:01:40 +0000
commit395caca342df230d7d98a658477b7f54c3ee5845 (patch)
treeeaf5be874979eaf378e9c008e0527300bde38c6d /macros
parent344dd03236ce7a31067cf768fed299127c60c7aa (diff)
CTAN sync 202303290301
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/required/babel/base/README.md28
-rw-r--r--macros/latex/required/babel/base/babel.dtx37
-rw-r--r--macros/latex/required/babel/base/babel.ins2
-rw-r--r--macros/latex/required/babel/base/babel.pdfbin920892 -> 911845 bytes
-rw-r--r--macros/latex/required/babel/base/bbcompat.dtx2
-rw-r--r--macros/texinfo/latest/texinfo.tex50
6 files changed, 70 insertions, 49 deletions
diff --git a/macros/latex/required/babel/base/README.md b/macros/latex/required/babel/base/README.md
index 0a5b4fe8a8..d355b868d3 100644
--- a/macros/latex/required/babel/base/README.md
+++ b/macros/latex/required/babel/base/README.md
@@ -1,6 +1,6 @@
-## Babel 3.86
+## Babel 3.87
-2023-02-13
+2023-03-28
This package manages culturally-determined typographical (and other)
rules, and hyphenation patterns for a wide range of languages. Many
@@ -10,9 +10,9 @@ is a set of ini files for about 250 languages.
The latest stable version is available on <https://ctan.org/pkg/babel>.
-Changes in version 3.86 are described in:
+Changes in version 3.87 are described in:
-https://latex3.github.io/babel/news/whats-new-in-babel-3.86.html
+https://latex3.github.io/babel/news/whats-new-in-babel-3.87.html
Apart from the manual, you can find information on some aspects of babel at:
@@ -48,14 +48,18 @@ respective authors.
### Summary of latest changes
```
-3.86 2023-02-13
- * New macro \localerestoredirs (lua).
- * Improved tabular in bidi texts (lua). See #221.
- * Fixed \glossaryname in the 'ini' file for 'lithuanian'
- (thanks to Andrius Pukšta, @yjhn).
- * Added diacritics to the rules for 'kashida.plain' in 'persian'.
- * \babeladjust{ bidi.math = off } disables changes in math with
- bidi (lua).
+3.87 2023-03-28
+ * Fixes:
+ - Typo in 'syllable' counter name in Korean (#225).
+ - Language leakage with xetex and on-the-fly loading in a few
+ locales.
+ - Misplaced text with tikz. Fixed thanks to Salim Bou (#211).
+ - Misplaced text body with 'multicol' and RTL (#228).
+ * 'hyphenrules=' is applied with the current locale.
+ * Updates to the CLDR: Swedish, Swahili, Tamil, Telugu, Thai,
+ Tigrinya, Turkmen, Tongan, Turkish, Tasawaq, Central Atlas
+ Tamazight, Uyghur, Ukrainian, Urdu, Vietnamese, Yiddish,
+ Yoruba, Cantonese.
```
### Previous changes
diff --git a/macros/latex/required/babel/base/babel.dtx b/macros/latex/required/babel/base/babel.dtx
index 48cda3816b..76a7168fb2 100644
--- a/macros/latex/required/babel/base/babel.dtx
+++ b/macros/latex/required/babel/base/babel.dtx
@@ -32,7 +32,7 @@
%
% \iffalse
%<*filedriver>
-\ProvidesFile{babel.dtx}[2023/02/13 v3.86 The Babel package]
+\ProvidesFile{babel.dtx}[2023/03/28 v3.87 The Babel package]
\documentclass{ltxdoc}
\GetFileInfo{babel.dtx}
\usepackage{fontspec}
@@ -2862,7 +2862,7 @@ The styles are:
\item[Khmer] |consonant|
-\item[Korean] |consonant|, |syllabe|, |hanja.informal|, |hanja.formal|,
+\item[Korean] |consonant|, |syllable|, |hanja.informal|, |hanja.formal|,
|hangul.formal|, |cjk-earthly-branch|, |cjk-heavenly-stem|,
|circled.ideograph|, |parenthesized.ideograph|,
|fullwidth.lower.alpha|, |fullwidth.upper.alpha|
@@ -3884,7 +3884,7 @@ up explictly; for example:
RTL A \foreignlanguage{english}{ltr text \thechapter{} and still ltr} RTL B
\end{verbatim}
-\Describe{localerestoredirs}{}
+\Describe{\localerestoredirs}{}
\New{3.86} \textit{LuaTeX}. This command resets the internal text,
paragraph and body directions to those of the current locale (if
@@ -5295,8 +5295,8 @@ help from Bernd Raichle, for which I am grateful.
% \section{Tools}
%
% \begin{macrocode}
-%<<version=3.86>>
-%<<date=2023/02/13>>
+%<<version=3.87>>
+%<<date=2023/03/28>>
% \end{macrocode}
%
% \textbf{Do not use the following macros in \texttt{ldf} files. They
@@ -10033,7 +10033,7 @@ help from Bernd Raichle, for which I am grateful.
\bbl@csarg\edef{intsp@#2}{\bbl@KVP@intraspace}%
\fi
\bbl@provide@intraspace
- % == Line breaking: CJK quotes ==
+ % == Line breaking: CJK quotes == TODO -> @extras
\ifcase\bbl@engine\or
\bbl@xin@{/c}{/\bbl@cl{lnbrk}}%
\ifin@
@@ -10183,6 +10183,12 @@ help from Bernd Raichle, for which I am grateful.
\ifx\bbl@KVP@main\@nnil % Restore only if not 'main'
\let\languagename\bbl@savelangname
\chardef\localeid\bbl@savelocaleid\relax
+ \fi
+ % == hyphenrules (apply if current) ==
+ \ifx\bbl@KVP@hyphenrules\@nnil\else
+ \ifnum\bbl@savelocaleid=\localeid
+ \language\@nameuse{l@\languagename}%
+ \fi
\fi}
% \end{macrocode}
%
@@ -10430,7 +10436,7 @@ help from Bernd Raichle, for which I am grateful.
\bbl@foreach\bbl@required@inis{%
\openin\bbl@readstream=##1.ini
\bbl@loop@ini}%
- \fi
+ \fi
% == Process stored data ==
\bbl@csarg\xdef{lini@\languagename}{#1}%
\bbl@read@ini@aux
@@ -10440,7 +10446,8 @@ help from Bernd Raichle, for which I am grateful.
\global\let\bbl@inidata\@empty
\bbl@exp{\\\bbl@add@list\\\bbl@ini@loaded{\languagename}}%
\bbl@toglobal\bbl@ini@loaded
- \fi}
+ \fi
+ \closein\bbl@readstream}
\def\bbl@read@ini@aux{%
\let\bbl@savestrings\@empty
\let\bbl@savetoday\@empty
@@ -11074,7 +11081,7 @@ help from Bernd Raichle, for which I am grateful.
\fi
\AtBeginDocument{%
\bbl@patchfont{\bbl@xenohyph}%
- \expandafter\selectlanguage\expandafter{\languagename}}%
+ \expandafter\select@language\expandafter{\languagename}}%
\fi}}%
\fi
\bbl@csarg\bbl@toglobal{lsys@#1}}
@@ -13677,6 +13684,7 @@ help from Bernd Raichle, for which I am grateful.
\fi
\repeat
\fi
+ \closein\bbl@readstream
\endgroup
\bbl@trace{Macros for reading patterns files}
\def\bbl@get@enc#1:#2:#3\@@@{\def\bbl@hyph@enc{#2}}
@@ -15226,6 +15234,11 @@ end
{}}%
\fi}
\fi
+ \AtBeginDocument{%
+ \@ifpackageloaded{multicol}%
+ {\toks@\expandafter{\multi@column@out}%
+ \edef\multi@column@out{\bodydir\pagedir\the\toks@}}%
+ {}}
\fi
\ifx\bbl@opt@layout\@nnil\endinput\fi % if no layout
% \end{macrocode}
@@ -15350,8 +15363,8 @@ end
\bbl@add\pgfinterruptpicture{\bbl@pictresetdir}%
\bbl@add\pgfsys@beginpicture{\bbl@pictsetdir\z@}%
\fi
- \ifx\tikzpicture\@undefined\else
- \AddToHook{env/tikzpicture/begin}{\bbl@pictsetdir\z@}%
+ \ifx\tikzpicture\@undefined\else
+ \AddToHook{env/tikzpicture/begin}{\bbl@pictsetdir\tw@}%
\bbl@add\tikz@atbegin@node{\bbl@pictresetdir}%
\bbl@sreplace\tikz{\begingroup}{\begingroup\bbl@pictsetdir\tw@}%
\fi
@@ -15781,7 +15794,7 @@ function Babel.hyphenate_replace(head, mode)
goto next
elseif mode == 1 and crep and (crep.pre or crep.no or crep.post) then
- d = node.new(7, 0) -- (disc, discretionary)
+ d = node.new(7, 3) -- (disc, regular)
d.pre = Babel.str_to_nodes(crep.pre, matches, item_base)
d.post = Babel.str_to_nodes(crep.post, matches, item_base)
d.replace = Babel.str_to_nodes(crep.no, matches, item_base)
diff --git a/macros/latex/required/babel/base/babel.ins b/macros/latex/required/babel/base/babel.ins
index 1e1f459777..00ede1d332 100644
--- a/macros/latex/required/babel/base/babel.ins
+++ b/macros/latex/required/babel/base/babel.ins
@@ -26,7 +26,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%%
-\def\filedate{2023/02/13}
+\def\filedate{2023/03/28}
\def\batchfile{babel.ins}
\input docstrip.tex
diff --git a/macros/latex/required/babel/base/babel.pdf b/macros/latex/required/babel/base/babel.pdf
index c2983ce166..d729e48170 100644
--- a/macros/latex/required/babel/base/babel.pdf
+++ b/macros/latex/required/babel/base/babel.pdf
Binary files differ
diff --git a/macros/latex/required/babel/base/bbcompat.dtx b/macros/latex/required/babel/base/bbcompat.dtx
index 1c5d30d2e6..caebb44c38 100644
--- a/macros/latex/required/babel/base/bbcompat.dtx
+++ b/macros/latex/required/babel/base/bbcompat.dtx
@@ -30,7 +30,7 @@
%
% \iffalse
%<*dtx>
-\ProvidesFile{bbcompat.dtx}[2023/02/13 v3.86]
+\ProvidesFile{bbcompat.dtx}[2023/03/28 v3.87]
%</dtx>
%
%% File 'bbcompat.dtx'
diff --git a/macros/texinfo/latest/texinfo.tex b/macros/texinfo/latest/texinfo.tex
index 0b8b87c959..c0a54919a7 100644
--- a/macros/texinfo/latest/texinfo.tex
+++ b/macros/texinfo/latest/texinfo.tex
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2023-03-21.06}
+\def\texinfoversion{2023-03-27.21}
%
% Copyright 1985, 1986, 1988, 1990-2023 Free Software Foundation, Inc.
%
@@ -1102,27 +1102,33 @@ where each line of input produces a line of output.}
% Output page labels information.
% See PDF reference v.1.7 p.594, section 8.3.1.
+% Page label ranges must be increasing.
\ifpdf
\def\pagelabels{%
\def\title{0 << /P (T-) /S /D >>}%
- \edef\roman{\the\romancount << /S /r >>}%
- \edef\arabic{\the\arabiccount << /S /D >>}%
%
- % Page label ranges must be increasing. Remove any duplicates.
- % (There is a slight chance of this being wrong if e.g. there is
- % a @contents but no @titlepage, etc.)
- %
- \ifnum\romancount=0 \def\roman{}\fi
- \ifnum\arabiccount=0 \def\title{}%
- \else
- \ifnum\romancount=\arabiccount \def\roman{}\fi
- \fi
- %
- \ifnum\romancount<\arabiccount
- \pdfcatalog{/PageLabels << /Nums [\title \roman \arabic ] >> }\relax
+ % support @contents at very end of document
+ \ifnum\contentsendcount=\pagecount
+ \ifnum\arabiccount<\romancount
+ \pdfcatalog{/PageLabels << /Nums
+ [\title
+ \the\arabiccount << /S /D >>
+ \the\romancount << /S /r >>
+ ] >> }\relax
+ \fi
+ % no contents in document
+ \else\ifnum\contentsendcount=0
+ \pdfcatalog{/PageLabels << /Nums
+ [\title
+ \the\arabiccount << /S /D >>
+ ] >> }\relax
\else
- \pdfcatalog{/PageLabels << /Nums [\title \arabic \roman ] >> }\relax
- \fi
+ \pdfcatalog{/PageLabels << /Nums
+ [\title
+ \the\romancount << /S /r >>
+ \the\contentsendcount << /S /D >>
+ ] >> }\relax
+ \fi\fi
}
\else
\let\pagelabels\relax
@@ -1131,6 +1137,8 @@ where each line of input produces a line of output.}
\newcount\pagecount \pagecount=0
\newcount\romancount \romancount=0
\newcount\arabiccount \arabiccount=0
+\newcount\contentsendcount \contentsendcount=0
+
\ifpdf
\let\ptxadvancepageno\advancepageno
\def\advancepageno{%
@@ -6809,12 +6817,8 @@ might help (with 'rm \jobname.?? \jobname.??s')%
% Get ready to use Arabic numerals again
\def\contentsendroman{%
\lastnegativepageno = \pageno
- \global\pageno = \savepageno
- %
- % If \romancount > \arabiccount, the contents are at the end of the
- % document. Otherwise, advance where the Arabic numerals start for
- % the page numbers.
- \ifnum\romancount>\arabiccount\else\global\arabiccount=\pagecount\fi
+ \global\pageno=1
+ \contentsendcount = \pagecount
}
% Typeset the label for a chapter or appendix for the short contents.