[latex3-commits] [git/LaTeX3-latex3-babel] master: Optional argument in \foreignlanguage. CSS counters for Ethiopic. (ff1774e)
Javier
email at dante.de
Sat May 9 12:39:23 CEST 2020
Repository : https://github.com/latex3/babel
On branch : master
Link : https://github.com/latex3/babel/commit/ff1774e221f517ceeb2963778f9d46703c0994d5
>---------------------------------------------------------------
commit ff1774e221f517ceeb2963778f9d46703c0994d5
Author: Javier <email at localhost>
Date: Sat May 9 12:39:23 2020 +0200
Optional argument in \foreignlanguage. CSS counters for Ethiopic.
>---------------------------------------------------------------
ff1774e221f517ceeb2963778f9d46703c0994d5
README.md | 15 ++++++++----
babel.dtx | 62 +++++++++++++++++++++++++++++++++++++------------
babel.ins | 2 +-
babel.pdf | Bin 776634 -> 776272 bytes
bbcompat.dtx | 2 +-
locale/am/babel-am.ini | 25 ++++++++++++++++++++
locale/el/babel-el.ini | 2 +-
7 files changed, 85 insertions(+), 23 deletions(-)
diff --git a/README.md b/README.md
index bde412a..cf95bab 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Babel 3.43.1998
+## Babel 3.43.2002
This package manages culturally-determined typographical (and other)
rules, and hyphenation patterns for a wide range of languages. Many
@@ -44,10 +44,15 @@ respective authors.
### Latest changes
```
-3.44 2020-05-??
- - \localedigits, \localedate
- - [|] syntax in dates
- - Line breaking in Amharic
+3.44 2020-05-14??
+ - \localedigits, \localedate, to print digits and date with the
+ current locale.
+ - [|] syntax in dates, to represent a value with any counter
+ defined in the ini files.
+ - Amharic: line breaking, counters
+ - Improvements in French, Portuguese
+ - Optional argument in \foreignlanguage and otherlanguage*,
+ to switch date and/or captions.
3.43 2020-04-28
- Autoloading based on the BCP47 codes, with basic lookup.
diff --git a/babel.dtx b/babel.dtx
index 8de6c8d..ece1b0b 100644
--- a/babel.dtx
+++ b/babel.dtx
@@ -31,7 +31,7 @@
%
% \iffalse
%<*filedriver>
-\ProvidesFile{babel.dtx}[2020/05/05 v3.43.1998 The Babel package]
+\ProvidesFile{babel.dtx}[2020/05/09 v3.43.2002 The Babel package]
\documentclass{ltxdoc}
\GetFileInfo{babel.dtx}
\usepackage{fontspec}
@@ -390,6 +390,15 @@ Package babel Warning: No hyphenation patterns were preloaded for
it.
\end{troubleshooting}
+\begin{note}
+ With \textsf{hyperref} you may want to set the document language with
+ something like:
+\begin{verbatim}
+\usepackage[_pdflang=es-MX_]{hyperref}
+\end{verbatim}
+This is not currently done by \babel{} and you must set it by hand.
+\end{note}
+
\subsection{Multilingual documents}
In multilingual documents, just use a list of the required languages as
@@ -1411,6 +1420,7 @@ captions):
\tag{ebu} Embu
\tag{ee} Ewe
\tag{el} Greek\hascapu\hascapl
+\tag{el-polyton} Polytonic Greek\hascapu\hascapl
\tag{en-AU} English\hascapu\hascapl
\tag{en-CA} English\hascapu\hascapl
\tag{en-GB} English\hascapu\hascapl
@@ -1438,6 +1448,7 @@ captions):
\tag{ga} Irish\hascapu\hascapl
\tag{gd} Scottish Gaelic\hascapu\hascapl
\tag{gl} Galician\hascapu\hascapl
+\tag{grc} Ancient Greek\hascapu\hascapl
\tag{gsw} Swiss German
\tag{gu} Gujarati
\tag{guz} Gusii
@@ -1639,6 +1650,7 @@ akan\\
albanian\\
american\\
amharic\\
+ancientgreek\\
arabic\\
arabic-algeria\\
arabic-DZ\\
@@ -1848,6 +1860,7 @@ pashto\\
persian\\
piedmontese\\
polish\\
+polytonicgreek\\
portuguese-br\\
portuguese-brazil\\
portuguese-portugal\\
@@ -4554,8 +4567,8 @@ help from Bernd Raichle, for which I am grateful.
% \section{Tools}
%
% \begin{macrocode}
-%<<version=3.43.1998>>
-%<<date=2020/05/05>>
+%<<version=3.43.2002>>
+%<<date=2020/05/09>>
% \end{macrocode}
%
% \textbf{Do not use the following macros in \texttt{ldf} files. They
@@ -7109,13 +7122,24 @@ help from Bernd Raichle, for which I am grateful.
\csname date#1\endcsname\relax
\fi
\else
- \ifbbl at usedategroup % if \foreign... within \<lang>date
- \bbl at usedategroupfalse
- \ifhmode
- \hskip\z at skip % trick to ignore spaces
+ \ifhmode
+ \hskip\z at skip % trick to ignore spaces
+ \bbl at xin@{,captions,}{,\bbl at select@opts,}%
+ \ifin@
+ \csname captions#1\endcsname\relax
+ \fi
+ \bbl at xin@{,date,}{,\bbl at select@opts,}%
+ \ifin@ % if \foreign... within \<lang>date
\csname date#1\endcsname\relax
- \loop\ifdim\lastskip>\z@\unskip\repeat\unskip
- \else
+ \fi
+ \loop\ifdim\lastskip>\z@\unskip\repeat\unskip
+ \else
+ \bbl at xin@{,captions,}{,\bbl at select@opts,}%
+ \ifin@
+ \csname captions#1\endcsname\relax
+ \fi
+ \bbl at xin@{,date,}{,\bbl at select@opts,}%
+ \ifin@
\csname date#1\endcsname\relax
\fi
\fi
@@ -7188,9 +7212,12 @@ help from Bernd Raichle, for which I am grateful.
% This environment makes use of |\foreign at language|.
%
% \begin{macrocode}
-\expandafter\def\csname otherlanguage*\endcsname#1{%
+\expandafter\def\csname otherlanguage*\endcsname{%
+ \@ifnextchar[\bbl at otherlanguage@s{\bbl at otherlanguage@s[]}}
+\def\bbl at otherlanguage@s[#1]#2{%
\ifnum\bbl at hymapsel=\@cclv\chardef\bbl at hymapsel4\relax\fi
- \foreign at language{#1}}
+ \def\bbl at select@opts{#1}%
+ \foreign at language{#2}}
% \end{macrocode}
%
% At the end of the environment we need to switch off the extra
@@ -7249,13 +7276,14 @@ help from Bernd Raichle, for which I am grateful.
\expandafter\noexpand\csname foreignlanguage \endcsname}
\expandafter\def\csname foreignlanguage \endcsname{%
\@ifstar\bbl at foreign@s\bbl at foreign@x}
-\def\bbl at foreign@x#1#2{%
+\newcommand\bbl at foreign@x[3][]{%
\begingroup
+ \def\bbl at select@opts{#1}%
\let\BabelText\@firstofone
\bbl at beforeforeign
- \foreign at language{#1}%
+ \foreign at language{#2}%
\bbl at usehooks{foreign}{}%
- \BabelText{#2}% Now in horizontal mode!
+ \BabelText{#3}% Now in horizontal mode!
\endgroup}
\def\bbl at foreign@s#1#2{% TODO - \shapemode, \@setpar, ?\@@par
\begingroup
@@ -7282,6 +7310,10 @@ help from Bernd Raichle, for which I am grateful.
\def\foreign at language#1{%
% set name
\edef\languagename{#1}%
+ \ifbbl at usedategroup
+ \bbl at add\bbl at select@opts{,date,}%
+ \bbl at usedategroupfalse
+ \fi
\bbl at fixname\languagename
% TODO. name at map here?
\bbl at provide@locale
@@ -10871,7 +10903,7 @@ help from Bernd Raichle, for which I am grateful.
\ifcase\bbl at engine\let\bbl at savedate\@empty\fi}
\fi
% TODO. With the following there is no need to ensure if \select...
-\newcommand\localedate{\@nameuse{\languagename date}}
+\newcommand\localedate{\@nameuse{bbl at date@\languagename}}
% eg: 1=months, 2=wide, 3=1, 4=dummy
\def\bbl at inidate#1.#2.#3.#4\relax#5#6{% TODO - ignore with 'captions'
\bbl at trim@def\bbl at tempa{#1.#2}%
diff --git a/babel.ins b/babel.ins
index 3c51d57..2d847e8 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/05/05}
+\def\filedate{2020/05/09}
\def\batchfile{babel.ins}
\input docstrip.tex
diff --git a/babel.pdf b/babel.pdf
index c954569..a2431b5 100644
Binary files a/babel.pdf and b/babel.pdf differ
diff --git a/bbcompat.dtx b/bbcompat.dtx
index c3e13ad..828aa8c 100644
--- a/bbcompat.dtx
+++ b/bbcompat.dtx
@@ -30,7 +30,7 @@
%
% \iffalse
%<*dtx>
-\ProvidesFile{bbcompat.dtx}[2020/05/05 v3.43.1998]
+\ProvidesFile{bbcompat.dtx}[2020/05/09 v3.43.2002]
%</dtx>
%
%% File 'bbcompat.dtx'
diff --git a/locale/am/babel-am.ini b/locale/am/babel-am.ini
index d8246dc..d30d707 100644
--- a/locale/am/babel-am.ini
+++ b/locale/am/babel-am.ini
@@ -187,3 +187,28 @@ plusSign = +
superscriptingExponent = ×
[counters]
+; suffix is ፦
+; These counters actually belong to different Ethiopic languages
+; They have been taken directly from CSS
+afar = ሀ ለ ሐ መ ረ ሰ በ ተ ነ አ ከ ወ ዐ የ ደ ዸ ገ ጸ ፈ
+agaw = ሀ ለ ሐ መ ረ ሰ ሸ ቀ ቐ በ ቨ ተ ቸ ነ ኘ ጀ ገ ጘ ጠ ጨ ጰ ጸ ፈ ፐ
+ari = ሀ ለ መ ረ ሰ ሸ በ ቨ ተ ቸ ነ ጀ ገ ጨ ፀ ፐ
+blin = ሀ ለ ሐ መ ሰ ሸ ረ ቀ ቐ በ ተ ነ ጀ ገ ጘ ጠ ጨ ፈ ቸ ኘ ጸ ጰ ፐ
+dizi = ሀ ለ መ ረ ሰ ሸ ቀ በ ተ ቸ ነ ኘ ጀ ገ ጠ ጨ ጸ ፀ ፈ
+gedeo = ሀ ለ መ ረ ሰ ሸ ቀ በ ተ ቸ ነ ጀ ገ ጠ ጨ ጰ ጸ ፈ ፐ
+gumuz = ሀ ሐ ለ ሐ መ ረ ሰ ሸ ቀ በ ቨ ተ ቸ ነ ኘ ገ ጨ ጰ ፀ ፐ
+hadiyya = ሀ ለ መ ረ ሰ ሸ ቀ በ ተ ቸ ነ ጀ ገ ጠ ጨ ጰ ፈ ፐ
+harari = ሐ ለ መ ረ ሰ ሸ ቀ በ ተ ቸ ነ ኘ ጀ ገ ጠ ጨ ፈ
+kaffa = ሀ ለ ሐ መ ሠ ረ ሰ ሸ ቀ በ ተ ቸ ኀ ነ ጀ ገ ጠ ጨ ጰ ፈ ፐ
+kebena = ሀ ለ መ ረ ሰ ሸ ቀ በ ተ ቸ ነ ጀ ገ ጠ ጨ ጰ ፈ ፐ
+kembata = ሀ ለ መ ረ ሰ ሸ ቀ በ ቨ ተ ቸ ነ ጀ ገ ጠ ጨ ጰ ፈ
+konso = ሀ ለ መ ረ ሰ ሸ ቀ በ ተ ቸ ነ ኘ ጀ ፈ ፐ
+kunama = ሀ ለ መ ረ ሰ ሸ በ ተ ቸ ነ ኘ ጀ ገ
+meen = ሀ ለ መ ረ ሰ ሸ ቀ በ ተ ቸ ኀ ነ ኘ ጀ ገ ጠ ጨ ጰ ፐ ፀ
+oromo = ሀ ለ መ ረ ሰ ሸ ቀ በ ተ ቸ ነ ኘ አ ከ ወ የ ደ ዸ ጀ ገ ጠ ጨ ጰ ጸ ፈ
+saho = ሀ ለ ሐ መ ረ ሰ ቀ በ ተ ነ ገ ጠ ጨ ጰ ጸ ፈ
+sidama = ሀ ለ መ ረ ሰ ሸ ቀ በ ተ ቸ ነ ኘ አ ከ ወ የ ደ ዸ ጀ ገ ጠ ጨ ጰ ጸ ፈ
+silti = ሀ ለ መ ረ ሰ ሸ ቀ በ ተ ቸ ነ ኘ ጀ ገ ጠ ጨ ጰ ፈ
+tigre = ሀ ለ ሐ መ ረ ሰ ሸ ቀ በ ተ ቸ ነ አ ከ ወ ዐ ዘ የ ደ ጀ ገ ጠ ጨ ጰ ጸ ፈ ፐ
+wolaita = ሀ ለ መ ረ ሰ ሸ ቀ በ ተ ቸ ነ ኘ ሰ ገ ጠ ጨ ጰ ጸ ፀ ፈ ፐ
+yemsa = ሀ ለ መ ረ ሰ ሸ ቀ በ ቨ ተ ቸ ነ ኘ ጀ ገ ጘ ጠ ጨ ጰ ፈ ፐ
\ No newline at end of file
diff --git a/locale/el/babel-el.ini b/locale/el/babel-el.ini
index 787c2db..8db2d59 100644
--- a/locale/el/babel-el.ini
+++ b/locale/el/babel-el.ini
@@ -161,7 +161,7 @@ postexhyphenchar =
hyphenationmin =
; The syntax is liable to change in 'other' values
hyphenate.other.locale = "0027 "2019 "02BC
-hyphenate.other.script ="1FBD "1FBF
+hyphenate.other.script = "1FBD "1FBF
[characters]
delimiters.quotes = «»“”
More information about the latex3-commits
mailing list.