From 1f1d5f72b672dfac7da6d3b26c1b84945a81eb50 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 7 Oct 2020 20:48:10 +0000 Subject: babel (6oct20) git-svn-id: svn://tug.org/texlive/trunk@56581 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/babel/README.md | 13 +++- Master/texmf-dist/doc/latex/babel/babel.pdf | Bin 810453 -> 811006 bytes Master/texmf-dist/source/latex/babel/babel.dtx | 79 +++++++++++++-------- Master/texmf-dist/source/latex/babel/babel.ins | 2 +- Master/texmf-dist/source/latex/babel/bbcompat.dtx | 2 +- Master/texmf-dist/source/latex/babel/locale.zip | Bin 777418 -> 777675 bytes Master/texmf-dist/tex/generic/babel/babel.def | 8 +-- Master/texmf-dist/tex/generic/babel/babel.sty | 3 +- Master/texmf-dist/tex/generic/babel/hyphen.cfg | 6 +- .../tex/generic/babel/locale/zh/babel-zh-Hant.ini | 36 ++++++---- Master/texmf-dist/tex/generic/babel/luababel.def | 11 +-- Master/texmf-dist/tex/generic/babel/nil.ldf | 2 +- Master/texmf-dist/tex/generic/babel/txtbabel.def | 8 +-- 13 files changed, 103 insertions(+), 67 deletions(-) diff --git a/Master/texmf-dist/doc/latex/babel/README.md b/Master/texmf-dist/doc/latex/babel/README.md index 9c0dd6e35b9..217de7c78af 100644 --- a/Master/texmf-dist/doc/latex/babel/README.md +++ b/Master/texmf-dist/doc/latex/babel/README.md @@ -1,4 +1,4 @@ -## Babel 3.49 +## Babel 3.50 This package manages culturally-determined typographical (and other) rules, and hyphenation patterns for a wide range of languages. Many @@ -7,9 +7,9 @@ lualatex out of the box. A few even work with plain formats. The latest stable version is available on . -Changes in version 3.49 are described in: +Changes in version 3.50 are described in: -https://github.com/latex3/babel/wiki/What's-new-in-babel-3.49 +https://github.com/latex3/babel/wiki/What's-new-in-babel-3.50 Included is a set of ini files for about 250 languages. @@ -43,12 +43,19 @@ respective authors. ### Latest changes ``` +3.50 2020-10-06 + - Fixes: + - main= stopped working in some cases (#96). + - Footnotes were not \long with layout=footnotes. + 3.49 2020-10-03 + - BUG. This version has a severe bug with main= (fixed in 3.50). - Allow standard LaTeX syntax to recognize locales based on ini files in the most common cases. - frenchspacing is set with ini files. - Fixes: - layout.lists=off didn't work (#94) +https://github.com/latex3/babel/wiki/What's-new-in-babel-3.49 3.48 2020-09-01 - New (tentative) tools to customize some labels (like chapters diff --git a/Master/texmf-dist/doc/latex/babel/babel.pdf b/Master/texmf-dist/doc/latex/babel/babel.pdf index 85865d7cf6e..b032d324ec3 100644 Binary files a/Master/texmf-dist/doc/latex/babel/babel.pdf and b/Master/texmf-dist/doc/latex/babel/babel.pdf differ diff --git a/Master/texmf-dist/source/latex/babel/babel.dtx b/Master/texmf-dist/source/latex/babel/babel.dtx index 73badc9980d..6c7fff3f8e0 100644 --- a/Master/texmf-dist/source/latex/babel/babel.dtx +++ b/Master/texmf-dist/source/latex/babel/babel.dtx @@ -31,7 +31,7 @@ % % \iffalse %<*filedriver> -\ProvidesFile{babel.dtx}[2020/10/03 v3.49 The Babel package] +\ProvidesFile{babel.dtx}[2020/10/06 v3.50 The Babel package] \documentclass{ltxdoc} \GetFileInfo{babel.dtx} \usepackage{fontspec} @@ -2405,8 +2405,8 @@ If the language has been loaded as an argument in |\documentclass| or |\usepackage|, then |\babelprovide| redefines the requested data. \Describe{import=}{\meta{language-tag}} -\New{3.13} Imports data from an |ini| file, including captions, date, -and hyphenmins. For example: +\New{3.13} Imports data from an |ini| file, including captions and date +(also line breaking rules in newly defined languages). For example: \begin{verbatim} \babelprovide[_import=hu_]{hungarian} \end{verbatim} @@ -2422,11 +2422,11 @@ be written: \babelprovide[_import_]{hungarian} \end{verbatim} -There are about 200 |ini| files, with data taken from the |ldf| files +There are about 250 |ini| files, with data taken from the |ldf| files and the CLDR provided by Unicode. Not all languages in the latter are complete, and therefore neither are the |ini| files. A few languages -will show a warning about the current lack of suitability of the date -format (\textsf{french}, \textsf{breton}, and \textsf{occitan}). +may show a warning about the current lack of suitability of some +features. Besides |\today|, this option defines an additional command for dates: |\date|, which takes three arguments, namely, year, month and @@ -2508,12 +2508,14 @@ cases. \Describe{onchar=}{\texttt{ids} $\string|$ \texttt{fonts}} \New{3.38} This option is much like an ‘event’ called when a character -belonging to the script of this locale is found. There are currently -two ‘actions’, which can be used at the same time (separated by a -space): with |ids| the |\language| and the |\localeid| are set to the -values of this locale; with |fonts|, the fonts are changed to those of -this locale (as set with |\babelfont|). This option is not compatible -with |mapfont|. Characters can be added with |\babelcharproperty|. +belonging to the script of this locale is found (as its name implies, +it acts on characters, not on spaces). There are currently two +‘actions’, which can be used at the same time (separated by a space): +with |ids| the |\language| and the |\localeid| are set to the values of +this locale; with |fonts|, the fonts are changed to those of this +locale (as set with |\babelfont|). This option is not compatible with +|mapfont|. Characters can be added or modified with +|\babelcharproperty|. \begin{note} An alternative approach with \luatex{} and Harfbuzz is the font @@ -2522,16 +2524,6 @@ with |mapfont|. Characters can be added with |\babelcharproperty|. cases it can be enough. \end{note} -\Describe{mapfont=}{\texttt{direction}} -Assigns the font for the writing direction of this language (only with -|bidi=basic|). Whenever possible, instead of this option use |onchar|, -based on the script, which usually makes more sense. More precisely, -what |mapfont=direction| means is, ‘when a character has the same -direction as the script for the “provided” language, then change its -font to that set for this language’. There are 3 directions, following -the bidi Unicode algorithm, namely, Arabic-like, Hebrew-like and left -to right. So, there should be at most 3 directives of this kind. - \Describe{intraspace=}{\meta{base} \meta{shrink} \meta{stretch}} Sets the interword space for the writing system of the language, in em units (so, |0 .1 0| is |0em plus .1em|). Like |\spaceskip|, the em unit @@ -2544,6 +2536,16 @@ Sets the interword penalty for the writing system of this language. Currently used only in Southeast Asian scrips, like Thai. Ignored if 0 (which is the default value). +\Describe{mapfont=}{\texttt{direction}} +Assigns the font for the writing direction of this language (only with +|bidi=basic|). Whenever possible, instead of this option use |onchar|, +based on the script, which usually makes more sense. More precisely, +what |mapfont=direction| means is, ‘when a character has the same +direction as the script for the “provided” language, then change its +font to that set for this language’. There are 3 directions, following +the bidi Unicode algorithm, namely, Arabic-like, Hebrew-like and left +to right. So, there should be at most 3 directives of this kind. + \begin{note} (1) If you need shorthands, you can define them with |\useshorthands| and |\defineshorthand| as described above. (2) Captions and |\today| @@ -4776,8 +4778,8 @@ help from Bernd Raichle, for which I am grateful. % \section{Tools} % % \begin{macrocode} -%<> -%<> +%<> +%<> % \end{macrocode} % % \textbf{Do not use the following macros in \texttt{ldf} files. They @@ -6828,6 +6830,7 @@ help from Bernd Raichle, for which I am grateful. \else % case 0,2 \chardef\bbl@iniflag\z@ % Force ldf \expandafter\let\csname ds@\bbl@opt@main\endcsname\bbl@loadmain + \ExecuteOptions{\bbl@opt@main} \DeclareOption*{}% \ProcessOptions* \fi @@ -10469,7 +10472,7 @@ help from Bernd Raichle, for which I am grateful. \let\bbl@KVP@main\@nil \let\bbl@KVP@script\@nil \let\bbl@KVP@language\@nil - \let\bbl@KVP@hyphenrules\@nil % only for provide@new + \let\bbl@KVP@hyphenrules\@nil \let\bbl@KVP@mapfont\@nil \let\bbl@KVP@maparabic\@nil \let\bbl@KVP@mapdigits\@nil @@ -11090,6 +11093,7 @@ help from Bernd Raichle, for which I am grateful. From babel-\bbl@cs{lini@\languagename}.ini:\\% \bbl@cs{@kv@identification.warning#1}\\% Reported }}} +% \let\bbl@inikv@identification\bbl@inikv \def\bbl@secpost@identification{% \bbl@iniwarning{}% @@ -11113,9 +11117,23 @@ help from Bernd Raichle, for which I am grateful. \ifbbl@bcptoname \bbl@csarg\xdef{bcp@map@\bbl@cl{lbcp}}{\languagename}% \fi} +% \end{macrocode} +% +% By default, the following sections are just read. Actions are taken +% later. +% +% \begin{macrocode} \let\bbl@inikv@typography\bbl@inikv \let\bbl@inikv@characters\bbl@inikv \let\bbl@inikv@numbers\bbl@inikv +% \end{macrocode} +% +% Additive numerals require an additional definition. When |.1| is +% found, two macros are defined -- the basic one, without |.1| called +% by |\localenumeral|, and another one preserving the trailing |.1| for +% the ‘units’. +% +% \begin{macrocode} \def\bbl@inikv@counters#1=#2\@@{% \bbl@ifsamestring{#1}{digits}% {\bbl@error{The counter name 'digits' is reserved for mapping\\% @@ -12465,12 +12483,12 @@ help from Bernd Raichle, for which I am grateful. \@ifnextchar[% {\bbl@footnote@o{#1}{#2}{#3}}% {\bbl@footnote@x{#1}{#2}{#3}}} - \def\bbl@footnote@x#1#2#3#4{% + \long\def\bbl@footnote@x#1#2#3#4{% \bgroup \select@language@x{\bbl@main@language}% \bbl@fn@footnote{#2#1{\ignorespaces#4}#3}% \egroup} - \def\bbl@footnote@o#1#2#3[#4]#5{% + \long\def\bbl@footnote@o#1#2#3[#4]#5{% \bgroup \select@language@x{\bbl@main@language}% \bbl@fn@footnote[#4]{#2#1{\ignorespaces#5}#3}% @@ -12479,12 +12497,12 @@ help from Bernd Raichle, for which I am grateful. \@ifnextchar[% {\bbl@footnotetext@o{#1}{#2}{#3}}% {\bbl@footnotetext@x{#1}{#2}{#3}}} - \def\bbl@footnotetext@x#1#2#3#4{% + \long\def\bbl@footnotetext@x#1#2#3#4{% \bgroup \select@language@x{\bbl@main@language}% \bbl@fn@footnotetext{#2#1{\ignorespaces#4}#3}% \egroup} - \def\bbl@footnotetext@o#1#2#3[#4]#5{% + \long\def\bbl@footnotetext@o#1#2#3[#4]#5{% \bgroup \select@language@x{\bbl@main@language}% \bbl@fn@footnotetext[#4]{#2#1{\ignorespaces#5}#3}% @@ -14043,7 +14061,8 @@ end \AtBeginDocument {\ifx\tikz@atbegin@node\@undefined\else \let\bbl@OL@pgfpicture\pgfpicture - \bbl@sreplace\pgfpicture{\pgfpicturetrue}{\bbl@pictsetdir\pgfpicturetrue}% + \bbl@sreplace\pgfpicture{\pgfpicturetrue}% + {\bbl@pictsetdir\pgfpicturetrue}% \bbl@add\pgfsys@beginpicture{\bbl@pictsetdir}% \bbl@add\tikz@atbegin@node{\bbl@pictresetdir}% \fi}} diff --git a/Master/texmf-dist/source/latex/babel/babel.ins b/Master/texmf-dist/source/latex/babel/babel.ins index 3112ec6eb5c..18bea2ad3f8 100644 --- a/Master/texmf-dist/source/latex/babel/babel.ins +++ b/Master/texmf-dist/source/latex/babel/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{2020/10/03} +\def\filedate{2020/10/06} \def\batchfile{babel.ins} \input docstrip.tex diff --git a/Master/texmf-dist/source/latex/babel/bbcompat.dtx b/Master/texmf-dist/source/latex/babel/bbcompat.dtx index 09bc92e3ef9..cb2c9a078fa 100644 --- a/Master/texmf-dist/source/latex/babel/bbcompat.dtx +++ b/Master/texmf-dist/source/latex/babel/bbcompat.dtx @@ -30,7 +30,7 @@ % % \iffalse %<*dtx> -\ProvidesFile{bbcompat.dtx}[2020/10/03 v3.49] +\ProvidesFile{bbcompat.dtx}[2020/10/06 v3.50] % % %% File 'bbcompat.dtx' diff --git a/Master/texmf-dist/source/latex/babel/locale.zip b/Master/texmf-dist/source/latex/babel/locale.zip index ac9b5dd147b..80e8b83ebb9 100644 Binary files a/Master/texmf-dist/source/latex/babel/locale.zip and b/Master/texmf-dist/source/latex/babel/locale.zip differ diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def index 5236ab778d6..f3747e9539a 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.def +++ b/Master/texmf-dist/tex/generic/babel/babel.def @@ -39,7 +39,7 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{babel.def}[2020/10/03 3.49 Babel common definitions] +\ProvidesFile{babel.def}[2020/10/06 3.50 Babel common definitions] \ifx\AtBeginDocument\@undefined % TODO. change test. % == Code for plain == \def\@empty{} @@ -397,8 +397,8 @@ \fi \countdef\last@language=19 % TODO. why? remove? \def\addlanguage{\csname newlanguage\endcsname} -\def\bbl@version{3.49} -\def\bbl@date{2020/10/03} +\def\bbl@version{3.50} +\def\bbl@date{2020/10/06} \def\adddialect#1#2{% \global\chardef#1#2\relax \bbl@usehooks{adddialect}{{#1}{#2}}% @@ -2243,7 +2243,7 @@ \let\bbl@KVP@main\@nil \let\bbl@KVP@script\@nil \let\bbl@KVP@language\@nil - \let\bbl@KVP@hyphenrules\@nil % only for provide@new + \let\bbl@KVP@hyphenrules\@nil \let\bbl@KVP@mapfont\@nil \let\bbl@KVP@maparabic\@nil \let\bbl@KVP@mapdigits\@nil diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty index 29e5321158a..31c6360ac82 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.sty +++ b/Master/texmf-dist/tex/generic/babel/babel.sty @@ -33,7 +33,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] -\ProvidesPackage{babel}[2020/10/03 3.49 The Babel package] +\ProvidesPackage{babel}[2020/10/06 3.50 The Babel package] \@ifpackagewith{babel}{debug} {\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}% \let\bbl@debug\@firstofone} @@ -1138,6 +1138,7 @@ \else % case 0,2 \chardef\bbl@iniflag\z@ % Force ldf \expandafter\let\csname ds@\bbl@opt@main\endcsname\bbl@loadmain + \ExecuteOptions{\bbl@opt@main} \DeclareOption*{}% \ProcessOptions* \fi diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg index aa49007d2c4..e8a2c49fa73 100644 --- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg +++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg @@ -37,10 +37,10 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{hyphen.cfg}[2020/10/03 3.49 Babel hyphens] +\ProvidesFile{hyphen.cfg}[2020/10/06 3.50 Babel hyphens] \xdef\bbl@format{\jobname} -\def\bbl@version{3.49} -\def\bbl@date{2020/10/03} +\def\bbl@version{3.50} +\def\bbl@date{2020/10/06} \ifx\AtBeginDocument\@undefined \def\@empty{} \let\orig@dump\dump diff --git a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hant.ini b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hant.ini index 21596147369..0aa33a0d3ac 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hant.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hant.ini @@ -8,11 +8,13 @@ ; * Common Locale Data Repository (license Unicode): ; http://cldr.unicode.org/ ; http://unicode.org/copyright.html +; * CTEX, by Liam Huang, Qing Lee, Leo Liu, et al +; https://ctan.org/pkg/ctex [identification] charset = utf8 -version = 1.7 -date = 2020-06-30 +version = 1.8 +date = 2020-10-05 name.local = 中文 name.english = Chinese name.opentype = Chinese Traditional @@ -29,19 +31,25 @@ encodings = derivate = no [captions] +; bib, contents - with en space +; todo - all spaces must be non breaking preface = -ref = -abstract = -bib = -chapter = -appendix = -contents = -listfigure = -listtable = -index = -figure = -table = -part = +ref = 參 考 資 料 +abstract = 摘 要 +bib = 文 獻 +chapter.template = [[prechapter]] [chapter] [[postchapter]] +prechapter = 第 +postchapter = 章 +appendix = 附 錄 +contents = 目 錄 +listfigure = 圖 目 錄 +listtable = 表 目 錄 +index = 索 引 +figure = 圖 +table = 表 +part.template = [[prepart]] [part] [[postpart]] +prepart = 第 +postpart = 部 encl = cc = headto = diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def index 2d1ddbdf032..66f08305448 100644 --- a/Master/texmf-dist/tex/generic/babel/luababel.def +++ b/Master/texmf-dist/tex/generic/babel/luababel.def @@ -1398,7 +1398,8 @@ end \AtBeginDocument {\ifx\tikz@atbegin@node\@undefined\else \let\bbl@OL@pgfpicture\pgfpicture - \bbl@sreplace\pgfpicture{\pgfpicturetrue}{\bbl@pictsetdir\pgfpicturetrue}% + \bbl@sreplace\pgfpicture{\pgfpicturetrue}% + {\bbl@pictsetdir\pgfpicturetrue}% \bbl@add\pgfsys@beginpicture{\bbl@pictsetdir}% \bbl@add\tikz@atbegin@node{\bbl@pictresetdir}% \fi}} @@ -1426,12 +1427,12 @@ end \@ifnextchar[% {\bbl@footnote@o{#1}{#2}{#3}}% {\bbl@footnote@x{#1}{#2}{#3}}} - \def\bbl@footnote@x#1#2#3#4{% + \long\def\bbl@footnote@x#1#2#3#4{% \bgroup \select@language@x{\bbl@main@language}% \bbl@fn@footnote{#2#1{\ignorespaces#4}#3}% \egroup} - \def\bbl@footnote@o#1#2#3[#4]#5{% + \long\def\bbl@footnote@o#1#2#3[#4]#5{% \bgroup \select@language@x{\bbl@main@language}% \bbl@fn@footnote[#4]{#2#1{\ignorespaces#5}#3}% @@ -1440,12 +1441,12 @@ end \@ifnextchar[% {\bbl@footnotetext@o{#1}{#2}{#3}}% {\bbl@footnotetext@x{#1}{#2}{#3}}} - \def\bbl@footnotetext@x#1#2#3#4{% + \long\def\bbl@footnotetext@x#1#2#3#4{% \bgroup \select@language@x{\bbl@main@language}% \bbl@fn@footnotetext{#2#1{\ignorespaces#4}#3}% \egroup} - \def\bbl@footnotetext@o#1#2#3[#4]#5{% + \long\def\bbl@footnotetext@o#1#2#3[#4]#5{% \bgroup \select@language@x{\bbl@main@language}% \bbl@fn@footnotetext[#4]{#2#1{\ignorespaces#5}#3}% diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf index 0f70a0a3afe..5b0643f9e62 100644 --- a/Master/texmf-dist/tex/generic/babel/nil.ldf +++ b/Master/texmf-dist/tex/generic/babel/nil.ldf @@ -32,7 +32,7 @@ %% extension |.ins|) which are part of the distribution. %% -\ProvidesLanguage{nil}[2020/10/03 3.49 Nil language] +\ProvidesLanguage{nil}[2020/10/06 3.50 Nil language] \LdfInit{nil}{datenil} \ifx\l@nil\@undefined \newlanguage\l@nil diff --git a/Master/texmf-dist/tex/generic/babel/txtbabel.def b/Master/texmf-dist/tex/generic/babel/txtbabel.def index 9d37e273020..f21edb445b2 100644 --- a/Master/texmf-dist/tex/generic/babel/txtbabel.def +++ b/Master/texmf-dist/tex/generic/babel/txtbabel.def @@ -99,12 +99,12 @@ \@ifnextchar[% {\bbl@footnote@o{#1}{#2}{#3}}% {\bbl@footnote@x{#1}{#2}{#3}}} - \def\bbl@footnote@x#1#2#3#4{% + \long\def\bbl@footnote@x#1#2#3#4{% \bgroup \select@language@x{\bbl@main@language}% \bbl@fn@footnote{#2#1{\ignorespaces#4}#3}% \egroup} - \def\bbl@footnote@o#1#2#3[#4]#5{% + \long\def\bbl@footnote@o#1#2#3[#4]#5{% \bgroup \select@language@x{\bbl@main@language}% \bbl@fn@footnote[#4]{#2#1{\ignorespaces#5}#3}% @@ -113,12 +113,12 @@ \@ifnextchar[% {\bbl@footnotetext@o{#1}{#2}{#3}}% {\bbl@footnotetext@x{#1}{#2}{#3}}} - \def\bbl@footnotetext@x#1#2#3#4{% + \long\def\bbl@footnotetext@x#1#2#3#4{% \bgroup \select@language@x{\bbl@main@language}% \bbl@fn@footnotetext{#2#1{\ignorespaces#4}#3}% \egroup} - \def\bbl@footnotetext@o#1#2#3[#4]#5{% + \long\def\bbl@footnotetext@o#1#2#3[#4]#5{% \bgroup \select@language@x{\bbl@main@language}% \bbl@fn@footnotetext[#4]{#2#1{\ignorespaces#5}#3}% -- cgit v1.2.3