[latex3-commits] [git/LaTeX3-latex3-babel] master: \BabelEnsureInfo now loads data for main language. Minor fixes. (f6b0ae8)
Javier
email at dante.de
Mon Jun 22 18:59:11 CEST 2020
Repository : https://github.com/latex3/babel
On branch : master
Link : https://github.com/latex3/babel/commit/f6b0ae8c4fdfde347392e148150640f726ac8f95
>---------------------------------------------------------------
commit f6b0ae8c4fdfde347392e148150640f726ac8f95
Author: Javier <email at localhost>
Date: Mon Jun 22 18:59:11 2020 +0200
\BabelEnsureInfo now loads data for main language. Minor fixes.
>---------------------------------------------------------------
f6b0ae8c4fdfde347392e148150640f726ac8f95
README.md | 2 +-
babel.dtx | 44 +++++++++++++++++++++++++++++++++-----------
babel.ins | 2 +-
babel.pdf | Bin 790907 -> 792236 bytes
bbcompat.dtx | 2 +-
locale/km/babel-km.ini | 2 +-
6 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/README.md b/README.md
index 09c9dd8..63bab3e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Babel 3.45.2039
+## Babel 3.45.2046
This package manages culturally-determined typographical (and other)
rules, and hyphenation patterns for a wide range of languages. Many
diff --git a/babel.dtx b/babel.dtx
index 909f356..cebc9e1 100644
--- a/babel.dtx
+++ b/babel.dtx
@@ -31,7 +31,7 @@
%
% \iffalse
%<*filedriver>
-\ProvidesFile{babel.dtx}[2020/06/15 v3.45.2039 The Babel package]
+\ProvidesFile{babel.dtx}[2020/06/22 v3.45.2046 The Babel package]
\documentclass{ltxdoc}
\GetFileInfo{babel.dtx}
\usepackage{fontspec}
@@ -2677,8 +2677,8 @@ respectively.
\Describe{\localeinfo}{\marg{field}}
\New{3.38} If an |ini| file has been loaded for the current language,
-you may access the information stored in it. This macros is fully
-expandable and the available fields are:
+you may access the information stored in it. This macro is fully
+expandable, and the available fields are:
\begin{description}
\itemsep=-\parskip
\item[|name.english|] as provided by the Unicode CLDR.
@@ -4656,8 +4656,8 @@ help from Bernd Raichle, for which I am grateful.
% \section{Tools}
%
% \begin{macrocode}
-%<<version=3.45.2039>>
-%<<date=2020/06/15>>
+%<<version=3.45.2046>>
+%<<date=2020/06/22>>
% \end{macrocode}
%
% \textbf{Do not use the following macros in \texttt{ldf} files. They
@@ -7165,7 +7165,7 @@ help from Bernd Raichle, for which I am grateful.
\newif\ifbbl at usedategroup
\def\bbl at switch#1{% from select@, foreign@
% make sure there is info for the language if so requested
- \bbl at ensureinfo{#1}%
+ \bbl at ensureinfo{\localename}%
% restore
\originalTeX
\expandafter\def\expandafter\originalTeX\expandafter{%
@@ -10636,6 +10636,10 @@ help from Bernd Raichle, for which I am grateful.
\bbl at savedate
\fi
\bbl at endcommands
+ \bbl at ifsamestring{\bbl at ensured@main}{#1}%
+ {\bbl at csarg\let{bbl at lname@#1}\relax
+ \let\bbl at ensured@main\relax}%
+ {}%
\bbl at ifunset{bbl at lname@#1}% TODO. Duplicated
{\def\BabelBeforeIni##1##2{%
\begingroup
@@ -10904,7 +10908,10 @@ help from Bernd Raichle, for which I am grateful.
\bbl at exp{\\\bbl at exportkey{sname}{identification.script.name.opentype}%
{\csname bbl at esname@\languagename\endcsname}}%
\bbl at exportkey{sbcp}{identification.script.tag.bcp47}{}%
- \bbl at exportkey{sotf}{identification.script.tag.opentype}{DFLT}}
+ \bbl at exportkey{sotf}{identification.script.tag.opentype}{DFLT}%
+ \ifbbl at bcptoname
+ \bbl at csarg\xdef{bcp at map@\bbl at cl{lbcp}}{\languagename}%
+ \fi}
\let\bbl at inikv@typography\bbl at inikv
\let\bbl at inikv@characters\bbl at inikv
\let\bbl at inikv@numbers\bbl at inikv
@@ -11056,7 +11063,7 @@ help from Bernd Raichle, for which I am grateful.
% \begin{macrocode}
\let\bbl at calendar\@empty
\newcommand\BabelDateSpace{\nobreakspace}
-\newcommand\BabelDateDot{.\@}
+\newcommand\BabelDateDot{.\@} % TODO. \let instead of repeating
\newcommand\BabelDated[1]{{\number#1}}
\newcommand\BabelDatedd[1]{{\ifnum#1<10 0\fi\number#1}}
\newcommand\BabelDateM[1]{{\number#1}}
@@ -11095,7 +11102,8 @@ help from Bernd Raichle, for which I am grateful.
% Note after \bbl at replace \toks@ contains the resulting string.
% TODO - Using this implicit behavior doesn't seem a good idea.
\bbl at replace@finish at iii\bbl at toreplace}
-\def\bbl at datecntr[#1|#2]{\localenumeral{#2}{#1}}
+\def\bbl at datecntr{\expandafter\bbl at xdatecntr\expandafter}
+\def\bbl at xdatecntr[#1|#2]{\localenumeral{#2}{#1}}
% \end{macrocode}
%
% Language and Script values to be used when defining a font or
@@ -11124,6 +11132,7 @@ help from Bernd Raichle, for which I am grateful.
\AtBeginDocument{%
\expandafter\bbl at add
\csname selectfont \endcsname{\bbl at xenohyph}%
+ \expandafter\selectlanguage\expandafter{\languagename}%
\expandafter\bbl at toglobal\csname selectfont \endcsname}%
\fi}}%
\fi
@@ -11249,11 +11258,18 @@ help from Bernd Raichle, for which I am grateful.
\@namedef{bbl at info@script.tag.bcp47}{sbcp}
\@namedef{bbl at info@script.tag.opentype}{sotf}
\let\bbl at ensureinfo\@gobble
+\let\bbl at ensured@main\relax
\newcommand\BabelEnsureInfo{%
+ \AddBabelHook{babel-ensureinfo}{beforestart}{%
+ \bbl at foreach\bbl at loaded{{%
+ \def\languagename{####1}%
+ \bbl at ensureinfo{####1}}}}%
\def\bbl at ensureinfo##1{%
- \ifx\InputIfFileExists\@undefined\else % not in plain
+ \ifx\InputIfFileExists\@undefined\else % not in plain - move out
\bbl at ifunset{bbl at lname@##1}{\bbl at ini@basic{##1}}{}%
- \fi}}
+ \fi}%
+ \bbl at ensureinfo{\bbl at main@language}%
+ \let\bbl at ensured@main\bbl at main@language} % A flag. TODO. Better solution.
% \end{macrocode}
%
% More general, but non-expandable, is |\getlocaleproperty|. To inspect
@@ -11277,6 +11293,7 @@ help from Bernd Raichle, for which I am grateful.
\string#1 will be set to \relax}%
{Perhaps you misspelled it.}%
\fi}
+\let\bbl at ini@loaded\@empty
\newcommand\LocaleForEach{\bbl at foreach\bbl at ini@loaded}
% \end{macrocode}
%
@@ -11357,6 +11374,11 @@ help from Bernd Raichle, for which I am grateful.
\let\bbl at autoload@bcpoptions\@empty
\@namedef{bbl at ADJ@autoload.bcp47.options}#1{%
\def\bbl at autoload@bcpoptions{#1}}
+\newif\ifbbl at bcptoname
+\@namedef{bbl at ADJ@bcp47.toname at on}{%
+ \bbl at bcptonametrue}
+\@namedef{bbl at ADJ@bcp47.toname at off}{%
+ \bbl at bcptonamefalse}
% TODO: use babel name, override
%
% As the final task, load the code for lua.
diff --git a/babel.ins b/babel.ins
index 9578add..b068aea 100644
--- a/babel.ins
+++ b/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/06/15}
+\def\filedate{2020/06/22}
\def\batchfile{babel.ins}
\input docstrip.tex
diff --git a/babel.pdf b/babel.pdf
index cc5576b..a980f44 100644
Binary files a/babel.pdf and b/babel.pdf differ
diff --git a/bbcompat.dtx b/bbcompat.dtx
index 0a60967..b614dc4 100644
--- a/bbcompat.dtx
+++ b/bbcompat.dtx
@@ -30,7 +30,7 @@
%
% \iffalse
%<*dtx>
-\ProvidesFile{bbcompat.dtx}[2020/06/15 v3.45.2039]
+\ProvidesFile{bbcompat.dtx}[2020/06/22 v3.45.2046]
%</dtx>
%
%% File 'bbcompat.dtx'
diff --git a/locale/km/babel-km.ini b/locale/km/babel-km.ini
index a535a8a..871ef5c 100644
--- a/locale/km/babel-km.ini
+++ b/locale/km/babel-km.ini
@@ -138,7 +138,7 @@ hyphenrules =
lefthyphenmin =
righthyphenmin =
hyphenchar =
-prehyphenchar = 1
+prehyphenchar = 0
posthyphenchar =
exhyphenchar =
preexhyphenchar =
More information about the latex3-commits
mailing list.