[latex3-commits] [git/LaTeX3-latex3-babel] master: Labels involving captions moved to 'captions'. (b47bc27)
Javier
email at dante.de
Tue Aug 4 18:08:19 CEST 2020
Repository : https://github.com/latex3/babel
On branch : master
Link : https://github.com/latex3/babel/commit/b47bc275fec82ac9ff8e99b1e0250dba954d6173
>---------------------------------------------------------------
commit b47bc275fec82ac9ff8e99b1e0250dba954d6173
Author: Javier <email at localhost>
Date: Tue Aug 4 18:08:19 2020 +0200
Labels involving captions moved to 'captions'.
>---------------------------------------------------------------
b47bc275fec82ac9ff8e99b1e0250dba954d6173
README.md | 5 +-
babel.dtx | 198 +++++++++++++++++++++++++-------------------
babel.ins | 2 +-
babel.pdf | Bin 799884 -> 801579 bytes
bbcompat.dtx | 2 +-
locale/hu/babel-hu.ini | 17 ++--
locale/ja/babel-ja.ini | 15 +---
locale/ko/babel-ko-Hani.ini | 9 +-
locale/ko/babel-ko.ini | 7 +-
locale/zh/babel-zh-Hans.ini | 11 +--
locale/zh/babel-zh.ini | 12 +--
11 files changed, 159 insertions(+), 119 deletions(-)
diff --git a/README.md b/README.md
index 970df68..02be7a9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Babel 3.47.2085
+## Babel 3.47.2089
This package manages culturally-determined typographical (and other)
rules, and hyphenation patterns for a wide range of languages. Many
@@ -45,7 +45,8 @@ respective authors.
```
3.48 2020-07-31 (development)
- - New keys to customize labels (chapter, enumerate, etc.).
+ - New tools to customize some labels (like chapters in CJK and
+ Hungarian).
3.47 2020-07-13
- Fixes:
diff --git a/babel.dtx b/babel.dtx
index d2c84cd..072fe20 100644
--- a/babel.dtx
+++ b/babel.dtx
@@ -31,7 +31,7 @@
%
% \iffalse
%<*filedriver>
-\ProvidesFile{babel.dtx}[2020/07/31 v3.47.2085 The Babel package]
+\ProvidesFile{babel.dtx}[2020/08/04 v3.47.2089 The Babel package]
\documentclass{ltxdoc}
\GetFileInfo{babel.dtx}
\usepackage{fontspec}
@@ -79,7 +79,7 @@
\usepackage{framed}
\usepackage{multicol}
\usepackage{color,colortbl}
-\usepackage[linkbordercolor={.9 .7 .5}]{hyperref}
+\usepackage[linkcolor=blue,urlcolor=blue,colorlinks=true]{hyperref}
\newcommand\New[1]{%
\colorbox[rgb]{.92, .86, .73}{New #1}\enspace\ignorespaces}
\definecolor{thered} {rgb}{0.65,0.04,0.07}
@@ -234,35 +234,49 @@ Xe\largetex
\part{User guide}
-\begin{itemize}
-\item This user guide focuses on internationalization and localization
- with \LaTeX. There are also some notes on its use with Plain \TeX.
-
-\item Changes and new features with relation to version 3.8 are
- highlighted with \New{X.XX}\hspace{-.5em}, and there are some notes
- for the latest versions in
+\begin{description}
+\item[\sffamily\color{messages}WHAT IS THIS DOCUMENT ABOUT?] This user
+ guide focuses on internationalization and localization with \LaTeX and
+ \pdftex, \xetex{} and \luatex. There are also some notes on its use
+ with Plain \TeX.
+
+\item[\sffamily\color{messages}WHAT IF I'M INTERESTED ONLY IN THE
+ LATEST CHANGES?] Changes and new features with relation to version 3.8
+ are highlighted with \New{X.XX}\hspace{-.5em}, and there are some
+ notes for the latest versions in
\href{https://github.com/latex3/babel/wiki}{the \babel{} wiki}. The
- most recent features could be still unstable. Please, report any
+ most recent features could be still unstable.
+
+\item[\sffamily\color{messages}CAN I HELP?] Sure! If you are interested
+ in the \TeX{} multilingual support, please join the
+ \href{http://tug.org/mailman/listinfo/kadingira}{kadingira mail
+ list}. You can follow the development of \babel{} in
+ \href{https://github.com/latex3/babel}{GitHub}; feel free to fork it
+ and make pull requests. If you are the author of a package, send to
+ me a few test files which I'll add to mine, so that possible issues
+ could be caught in the development phase.
+
+\item[\sffamily\color{messages}I'VE FOUND AN ERROR.] Please, report any
issues you find in
\href{https://github.com/latex3/babel/issues}{GitHub}, which is
better than just complaining on an e-mail list or a web forum.
-\item If you are interested in the \TeX{} multilingual support, please
- join the \href{http://tug.org/mailman/listinfo/kadingira}{kadingira
- mail list}. You can follow the development of \babel{} in
- \href{https://github.com/latex3/babel}{GitHub} (which provides many
- \href{https://github.com/latex3/babel/tree/master/samples}{sample
- files}, too). If you are the author of a package, feel free to send
- to me a few test files which I'll add to mine, so that possible
- issues could be caught in the development phase.
+\item[\sffamily\color{messages}HOW CAN I CONTRIBUTE A NEW
+LANGUAGE?] See section \ref{contribute} for contributing a language.
-\item See section \ref{contribute} for contributing a language.
+\item[\sffamily\color{messages}I ONLY NEED LEARN THE MOST BASIC
+ FEATURES.] The first subsections (1.1-1.3) describe the traditional
+ way of loading a language (with |ldf| files). The alternative way
+ based on |ini| files, which complements the previous one (it does
+ \textit{not} replace it, although it is still necessary in some
+ languages), is described below; go to \ref{inifiles}.
-\item The first sections describe the traditional way of loading a
- language (with |ldf| files). The alternative way based on |ini|
- files, which complements the previous one (it does \textit{not}
- replace it), is described below.
-\end{itemize}
+\item[\sffamily\color{messages}I DON'T LIKE MANUALS. I PREFER SAMPLE
+ FILES.] This manual contains lots of examples and tips, but in GitHub
+ there are many
+ \href{https://github.com/latex3/babel/tree/master/samples}{sample
+ files}.
+\end{description}
\section{The user interface}\label{U-I}
@@ -1268,6 +1282,7 @@ be the same as the option name as set in |\usepackage|!).
\end{warning}
\subsection{\texttt{ini} files}
+\label{inifiles}
An alternative approach to define a language (or, more precisely, a
\textit{locale}) is by means of an \texttt{ini} file. Currently
@@ -2571,6 +2586,11 @@ bidi and fonts are processed (ie, to the node list as generated by the
bidirectional behavior (unlike |Numbers=Arabic| in \textsf{fontspec},
which is not recommended).
+\begin{note}
+ With \xetex{} you can use the option |Mapping| when defining a
+ font.
+\end{note}
+
\New{4.41} Many `ini` locale files has been extended with information
about non-positional numerical systems, based on those predefined in
CSS. They only work with \xetex{} and \luatex{} and are fully
@@ -4714,8 +4734,8 @@ help from Bernd Raichle, for which I am grateful.
% \section{Tools}
%
% \begin{macrocode}
-%<<version=3.47.2085>>
-%<<date=2020/07/31>>
+%<<version=3.47.2089>>
+%<<date=2020/08/04>>
% \end{macrocode}
%
% \textbf{Do not use the following macros in \texttt{ldf} files. They
@@ -11029,19 +11049,50 @@ help from Bernd Raichle, for which I am grateful.
% \begin{macrocode}
\def\bbl at ini@captions at aux#1#2{%
\bbl at trim@def\bbl at tempa{#1}%
- \bbl at ifblank{#2}%
- {\bbl at exp{%
- \toks@{\\\bbl at nocaption{\bbl at tempa}{\languagename\bbl at tempa name}}}}%
- {\bbl at trim\toks@{#2}}%
- \bbl at exp{%
- \\\bbl at add\\\bbl at savestrings{%
- \\\SetString\<\bbl at tempa name>{\the\toks@}}}%
- \toks@\expandafter{\bbl at captionslist}%
- \bbl at exp{\\\in@{\<\bbl at tempa name>}{\the\toks@}}%
- \ifin@\else
+ \bbl at xin@{.template}{\bbl at tempa}%
+ \ifin@
+ \bbl at replace\bbl at tempa{.template}{}%
+ \def\bbl at toreplace{#2}%
+ \bbl at replace\bbl at toreplace{[ ]}{\nobreakspace{}}%
+ \bbl at replace\bbl at toreplace{[[}{\bbl at bktoname}%
+ \bbl at replace\bbl at toreplace{[}{\bbl at bktothe}%
+ \bbl at replace\bbl at toreplace{]]}{\@@}%
+ \bbl at replace\bbl at toreplace{]}{\@@}%
+ \bbl at xin@{,\bbl at tempa,}{,chapter,}%
+ \ifin@
+ \bbl at patchchapter
+ \global\bbl at csarg\let{chapfmt@\languagename}\bbl at toreplace
+ \fi
+ \bbl at xin@{,\bbl at tempa,}{,appendix,}%
+ \ifin@
+ \bbl at patchchapter
+ \global\bbl at csarg\let{appxfmt@\languagename}\bbl at toreplace
+ \fi
+ \bbl at xin@{,\bbl at tempa,}{,part,}%
+ \ifin@
+ \bbl at patchpart
+ \global\bbl at csarg\let{partfmt@\languagename}\bbl at toreplace
+ \fi
+ \bbl at xin@{,\bbl at tempa,}{,figure,table,}%
+ \ifin@
+ \toks@\expandafter{\bbl at toreplace}%
+ \bbl at exp{\gdef\<fnum@\bbl at tempa>{\the\toks@}}%
+ \fi
+ \else
+ \bbl at ifblank{#2}%
+ {\bbl at exp{%
+ \toks@{\\\bbl at nocaption{\bbl at tempa}{\languagename\bbl at tempa name}}}}%
+ {\bbl at trim\toks@{#2}}%
\bbl at exp{%
- \\\bbl at add\<bbl at extracaps@\languagename>{\<\bbl at tempa name>}%
- \\\bbl at toglobal\<bbl at extracaps@\languagename>}%
+ \\\bbl at add\\\bbl at savestrings{%
+ \\\SetString\<\bbl at tempa name>{\the\toks@}}}%
+ \toks@\expandafter{\bbl at captionslist}%
+ \bbl at exp{\\\in@{\<\bbl at tempa name>}{\the\toks@}}%
+ \ifin@\else
+ \bbl at exp{%
+ \\\bbl at add\<bbl at extracaps@\languagename>{\<\bbl at tempa name>}%
+ \\\bbl at toglobal\<bbl at extracaps@\languagename>}%
+ \fi
\fi}
% \end{macrocode}
%
@@ -11063,53 +11114,34 @@ help from Bernd Raichle, for which I am grateful.
\def\bbl at inikv@labels#1=#2\@@{%
\in@{map.}{#1}%
\ifin@
- \def\bbl at tempc{#1}%
- \bbl at replace\bbl at tempc{map.}{}%
- \in@{,#2,}{,arabic,roman,Roman,alph,Alph,}%
- \bbl at exp{%
- \gdef\<bbl at map@\bbl at tempc @\languagename>%
- {\ifin@\<#2>\else\\\localecounter{#2}\fi}}%
- \bbl at foreach\bbl at list@the{%
- \bbl at exp{\let\\\bbl at tempd\<the##1>}%
- \bbl at exp{%
- \\\bbl at sreplace\<the##1>%
- {\<\bbl at tempc>{##1}}{\\\bbl at map@cnt{\bbl at tempc}{##1}}%
- \\\bbl at sreplace\<the##1>%
- {\<\@empty @\bbl at tempc>\<c@##1>}{\\\bbl at map@cnt{\bbl at tempc}{##1}}}%
- \expandafter\ifx\csname the##1\endcsname\bbl at tempd\else
- \toks@\expandafter\expandafter\expandafter{%
- \csname the##1\endcsname}
- \expandafter\xdef\csname the##1\endcsname{{\the\toks@}}%
- \fi}%
- %
- \else
- \def\bbl at toreplace{#2}%
- \bbl at replace\bbl at toreplace{[ ]}{\nobreakspace{}}%
- \bbl at replace\bbl at toreplace{[[}{\bbl at bktoname}%
- \bbl at replace\bbl at toreplace{[}{\bbl at bktothe}%
- \bbl at replace\bbl at toreplace{]]}{\@@}%
- \bbl at replace\bbl at toreplace{]}{\@@}%
- \in@{,#1,}{,chapter,}%
- \ifin@
- \bbl at patchchapter
- \global\bbl at csarg\let{chapfmt@\languagename}\bbl at toreplace
- \fi
- \in@{,#1,}{,appendix,}%
- \ifin@
- \bbl at patchchapter
- \global\bbl at csarg\let{appxfmt@\languagename}\bbl at toreplace
- \fi
- \in@{,#1,}{,part,}%
- \ifin@
- \bbl at patchpart
- \global\bbl at csarg\let{partfmt@\languagename}\bbl at toreplace
- \fi
- \in@{,#1,}{,figure,table,}%
- \ifin@
- \toks@\expandafter{\bbl at toreplace}%
- \bbl at exp{\gdef\<fnum@#1>{\the\toks@}}%
+ \ifx\bbl at KVP@labels\@nil\else
+ \bbl at xin@{ maps }{ \bbl at KVP@labels\space}%
+ \ifin@
+ \def\bbl at tempc{#1}%
+ \bbl at replace\bbl at tempc{map.}{}%
+ \in@{,#2,}{,arabic,roman,Roman,alph,Alph,}%
+ \bbl at exp{%
+ \gdef\<bbl at map@\bbl at tempc @\languagename>%
+ {\ifin@\<#2>\else\\\localecounter{#2}\fi}}%
+ \bbl at foreach\bbl at list@the{%
+ \bbl at exp{\let\\\bbl at tempd\<the##1>}%
+ \bbl at exp{%
+ \\\bbl at sreplace\<the##1>%
+ {\<\bbl at tempc>{##1}}{\\\bbl at map@cnt{\bbl at tempc}{##1}}%
+ \\\bbl at sreplace\<the##1>%
+ {\<\@empty @\bbl at tempc>\<c@##1>}{\\\bbl at map@cnt{\bbl at tempc}{##1}}}%
+ \expandafter\ifx\csname the##1\endcsname\bbl at tempd\else
+ \toks@\expandafter\expandafter\expandafter{%
+ \csname the##1\endcsname}%
+ \expandafter\xdef\csname the##1\endcsname{{\the\toks@}}%
+ \fi}%
+ \fi
\fi
+ %
+ \else
%
+ % The following code is still under study. You can test it and make
+ % suggestions.
\in@{enumerate.}{#1}%
\ifin@
\def\bbl at tempa{#1}%
diff --git a/babel.ins b/babel.ins
index 1228ffb..b797dee 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/07/31}
+\def\filedate{2020/08/04}
\def\batchfile{babel.ins}
\input docstrip.tex
diff --git a/babel.pdf b/babel.pdf
index a678b62..bbf371d 100644
Binary files a/babel.pdf and b/babel.pdf differ
diff --git a/bbcompat.dtx b/bbcompat.dtx
index 358805b..5583b76 100644
--- a/bbcompat.dtx
+++ b/bbcompat.dtx
@@ -30,7 +30,7 @@
%
% \iffalse
%<*dtx>
-\ProvidesFile{bbcompat.dtx}[2020/07/31 v3.47.2085]
+\ProvidesFile{bbcompat.dtx}[2020/08/04 v3.47.2089]
%</dtx>
%
%% File 'bbcompat.dtx'
diff --git a/locale/hu/babel-hu.ini b/locale/hu/babel-hu.ini
index a425977..b681831 100644
--- a/locale/hu/babel-hu.ini
+++ b/locale/hu/babel-hu.ini
@@ -11,8 +11,8 @@
[identification]
charset = utf8
-version = 1.2
-date = 2020-06-30
+version = 1.3
+date = 2020-08-06
name.local = magyar
name.english = Hungarian
name.babel = hungarian
@@ -33,13 +33,17 @@ preface = Előszó
ref = Hivatkozások
abstract = Kivonat
bib = Irodalomjegyzék
+chapter.template = [chapter].[ ][[chapter]]
chapter = fejezet
+appendix.template = [chapter].[ ][[appendix]]
appendix = függelék
contents = Tartalomjegyzék
listfigure = Ábrák jegyzéke
listtable = Táblázatok jegyzéke
index = Tárgymutató
+figure.template = [figure].[ ][[figure]]
figure = ábra
+table.template = [table].[ ][[table]]
table = táblázat
part = rész
encl = Melléklet
@@ -51,18 +55,23 @@ also = lásd még
proof = Bizonyítás
glossary = Szójegyzék
+
[captions.licr]
preface = El\H osz\'o
ref = Hivatkoz\'asok
abstract = Kivonat
bib = Irodalomjegyz\'ek
+chapter.template = [chapter].[ ][[chapter]]
chapter = fejezet
+appendix.template = [chapter].[ ][[appendix]]
appendix = f\"uggel\'ek
contents = Tartalomjegyz\'ek
listfigure = \'Abr\'ak jegyz\'eke
listtable = T\'abl\'azatok jegyz\'eke
index = T\'argymutat\'o
+figure.template = [figure].[ ][[figure]]
figure = \'abra
+table.template = [table].[ ][[table]]
table = t\'abl\'azat
part = r\'esz
encl = Mell\'eklet
@@ -74,10 +83,6 @@ also = l\'asd m\'eg
proof = Bizony\'\i t\'as
glossary = Sz\'ojegyz\'ek
-[labels]
-chapter = [chapter]. [[chapter]]
-appendix = [chapter]. [[appendix]]
-
[date.gregorian]
date.long = [y].[ ][MMMM] [d].
date.short = [y]. [MM]. [dd].
diff --git a/locale/ja/babel-ja.ini b/locale/ja/babel-ja.ini
index 9b708bd..8776e51 100644
--- a/locale/ja/babel-ja.ini
+++ b/locale/ja/babel-ja.ini
@@ -11,8 +11,8 @@
[identification]
charset = utf8
-version = 1.6
-date = 2020-07-10
+version = 1.7
+date = 2020-08-06
name.local = 日本語
name.english = Japanese
name.babel = japanese
@@ -34,8 +34,7 @@ preface = 前書き
ref = 参考文献
abstract = 概要
bib = 参考文献
-; empty
-chapter =
+chapter.template = [[prechapter]] [chapter] [[postchapter]]
prechapter = 第
postchapter = 章
appendix = 付録
@@ -45,8 +44,7 @@ listtable = 表目次
index = 索引
figure = 図
table = 表
-; empty
-part =
+part.template = [[prepart]] [part] [[postpart]]
prepart = 第
postpart = 部
encl =
@@ -58,11 +56,6 @@ also =
proof = 証明
glossary = 用語集
-[labels]
-chapter = [[prechapter]] [chapter] [[postchapter]]
-part = [[prepart]] [part] [[postpart]]
-; enumerate.1 = [enumi])
-
[captions.licr]
preface =
ref =
diff --git a/locale/ko/babel-ko-Hani.ini b/locale/ko/babel-ko-Hani.ini
index 0edc969..882c135 100644
--- a/locale/ko/babel-ko-Hani.ini
+++ b/locale/ko/babel-ko-Hani.ini
@@ -11,8 +11,8 @@
[identification]
charset = utf8
-version = 1.0
-date = 2020-07-10
+version = 1.1
+date = 2020-08-06
name.local = 한국어
name.english = Korean
name.babel = korean-han korean-hani
@@ -33,7 +33,8 @@ derivate = no
preface = 序文
ref = 參考 文獻
abstract = 要 約
-bib = 著書~目錄
+bib = 著書~目錄ç
+chapter.template = [[prechapter]] [chapter] [[postchapter]]
prechapter = 第
postchapter = 章
appendix = 附錄
@@ -43,6 +44,7 @@ listtable = 表 目次
index = 索引
figure = 그림
table = 表
+part.template = [[prepart]] [part] [[postpart]]
prepart = 第
postpart = 篇
encl = 同封物
@@ -55,6 +57,7 @@ see =
also =
proof = 證明
glossary = 語 彙
+section.template = [[presection]] [section] [[postsection]]
presection = 第
postsection = 節
diff --git a/locale/ko/babel-ko.ini b/locale/ko/babel-ko.ini
index 425073a..2010e5a 100644
--- a/locale/ko/babel-ko.ini
+++ b/locale/ko/babel-ko.ini
@@ -11,8 +11,8 @@
[identification]
charset = utf8
-version = 1.7
-date = 2020-07-10
+version = 1.8
+date = 2020-08-06
name.local = 한국어
name.english = Korean
name.babel = korean
@@ -35,6 +35,7 @@ preface = 서문
ref = 참고 문헌
abstract = 요 약
bib = 참고 문헌
+chapter.template = [[prechapter]] [chapter] [[postchapter]]
prechapter = 제
postchapter = 장
appendix = 부록
@@ -44,6 +45,7 @@ listtable = 표 차례
index = 찾아보기
figure = 그림
table = 표
+part.template = [[prepart]] [part] [[postpart]]
prepart = 제
postpart = 편
encl = 동봉물
@@ -56,6 +58,7 @@ see =
also =
proof = 증명
glossary = 용어집
+section.template = [[presection]] [section] [[postsection]]
presection = 제
postsection = 절
diff --git a/locale/zh/babel-zh-Hans.ini b/locale/zh/babel-zh-Hans.ini
index 2cf1c1e..7e6cddd 100644
--- a/locale/zh/babel-zh-Hans.ini
+++ b/locale/zh/babel-zh-Hans.ini
@@ -8,12 +8,13 @@
; * Common Locale Data Repository (license Unicode):
; http://cldr.unicode.org/
; http://unicode.org/copyright.html
-; * CTEX
+; * 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-08-06
name.local = 中文
name.english = Chinese
name.opentype = Chinese Simplified
@@ -34,7 +35,7 @@ preface =
ref = 参考文献
abstract = 摘要
bib = 参考文献
-chapter =
+chapter.template = [[prechapter]] [chapter] [[postchapter]]
prechapter = 第
postchapter = 部分
appendix = 附录
@@ -44,7 +45,7 @@ listtable = 表格
index = 索引
figure = 图
table = 表
-part =
+part.template = [[prepart]] [part] [[postpart]]
prepart = 第
postpart = 章
encl =
diff --git a/locale/zh/babel-zh.ini b/locale/zh/babel-zh.ini
index 5e66195..d8845e7 100644
--- a/locale/zh/babel-zh.ini
+++ b/locale/zh/babel-zh.ini
@@ -8,12 +8,13 @@
; * Common Locale Data Repository (license Unicode):
; http://cldr.unicode.org/
; http://unicode.org/copyright.html
-; * CTEX
+; * 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-08-06
name.local = 中文
name.english = Chinese
name.opentype = Chinese Simplified
@@ -35,7 +36,7 @@ preface =
ref = 参考文献
abstract = 摘要
bib = 参考文献
-chapter =
+chapter.template = [[prechapter]] [chapter] [[postchapter]]
prechapter = 第
postchapter = 部分
appendix = 附录
@@ -45,7 +46,7 @@ listtable = 表格
index = 索引
figure = 图
table = 表
-part =
+part.template = [[prepart]] [part] [[postpart]]
prepart = 第
postpart = 章
encl =
@@ -178,6 +179,7 @@ plusSign = +
superscriptingExponent = ×
[counters]
+; TODO. Add 壹 貳 叁...
cjk-earthly-branch = 子 丑 寅 卯 辰 巳 午 未 申 酉 戌 亥
cjk-heavenly-stem = 甲 乙 丙 丁 戊 己 庚 辛 壬 癸
fullwidth.lower.alpha = ａ ｂ ｃ ｄ ｅ ｆ ｇ ｈ ｉ ｊ ｋ ｌ ｍ ｎ ｏ ｐ ｑ ｒ ｓ ｔ ｕ ｖ ｗ ｘ ｙ ｚ
More information about the latex3-commits
mailing list.