summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-09-01 21:37:03 +0000
committerKarl Berry <karl@freefriends.org>2020-09-01 21:37:03 +0000
commit351d7c716e345c25b042e722ac910dd40af96080 (patch)
tree43b511674f175005561ef167c48b890cd8ab7641 /Master/texmf-dist/tex/generic
parent668fe9fee20ff2f37545ee9bef5b407d47b0a7ef (diff)
babel (1sep20)
git-svn-id: svn://tug.org/texlive/trunk@56239 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.def195
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.sty14
-rw-r--r--Master/texmf-dist/tex/generic/babel/hyphen.cfg6
-rw-r--r--Master/texmf-dist/tex/generic/babel/locale/hu/babel-hu.ini13
-rw-r--r--Master/texmf-dist/tex/generic/babel/locale/ja/babel-ja.ini8
-rw-r--r--Master/texmf-dist/tex/generic/babel/locale/ko/babel-ko-Hani.ini9
-rw-r--r--Master/texmf-dist/tex/generic/babel/locale/ko/babel-ko.ini7
-rw-r--r--Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans.ini36
-rw-r--r--Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh.ini37
-rw-r--r--Master/texmf-dist/tex/generic/babel/nil.ldf2
10 files changed, 249 insertions, 78 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index 85484179dd5..216b0cb7cab 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/07/13 3.47 Babel common definitions]
+\ProvidesFile{babel.def}[2020/09/01 3.48 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.47}
-\def\bbl@date{2020/07/13}
+\def\bbl@version{3.48}
+\def\bbl@date{2020/09/01}
\def\adddialect#1#2{%
\global\chardef#1#2\relax
\bbl@usehooks{adddialect}{{#1}{#2}}%
@@ -522,11 +522,12 @@
\ifx\languagename\@undefined\else
\xdef\bbl@language@stack{\languagename+\bbl@language@stack}%
\fi}
-\def\bbl@pop@lang#1+#2&#3{%
- \edef\languagename{#1}\xdef#3{#2}}
+\def\bbl@pop@lang#1+#2\@@{%
+ \edef\languagename{#1}%
+ \xdef\bbl@language@stack{#2}}
\let\bbl@ifrestoring\@secondoftwo
\def\bbl@pop@language{%
- \expandafter\bbl@pop@lang\bbl@language@stack&\bbl@language@stack
+ \expandafter\bbl@pop@lang\bbl@language@stack\@@
\let\bbl@ifrestoring\@firstoftwo
\expandafter\bbl@set@language\expandafter{\languagename}%
\let\bbl@ifrestoring\@secondoftwo}
@@ -634,13 +635,13 @@
% set the locale id
\bbl@id@assign
% switch captions, date
- \ifcase\bbl@select@type
- \bbl@bsphack
+ % No text is supposed to be added here, so we remove any
+ % spurious spaces.
+ \bbl@bsphack
+ \ifcase\bbl@select@type
\csname captions#1\endcsname\relax
\csname date#1\endcsname\relax
- \bbl@esphack
- \else
- \bbl@bsphack
+ \else
\bbl@xin@{,captions,}{,\bbl@select@opts,}%
\ifin@
\csname captions#1\endcsname\relax
@@ -649,8 +650,8 @@
\ifin@ % if \foreign... within \<lang>date
\csname date#1\endcsname\relax
\fi
- \bbl@esphack
- \fi
+ \fi
+ \bbl@esphack
% switch extras
\bbl@usehooks{beforeextras}{}%
\csname extras#1\endcsname\relax
@@ -1549,7 +1550,7 @@
{\bbl@putsh@i#1\@empty\@nnil}%
{\csname bbl@active@\string#1\endcsname}}
\def\bbl@putsh@i#1#2\@nnil{%
- \csname\languagename @sh@\string#1@%
+ \csname\language@group @sh@\string#1@%
\ifx\@empty#2\else\string#2@\fi\endcsname}
\ifx\bbl@opt@shorthands\@nnil\else
\let\bbl@s@initiate@active@char\initiate@active@char
@@ -2269,7 +2270,11 @@
{Use this macro as documented}}%
{\bbl@provide@renew{#2}}}%
% Post tasks
- \bbl@exp{\\\babelensure[exclude=\\\today]{#2}}%
+ \bbl@ifunset{bbl@extracaps@#2}%
+ {\bbl@exp{\\\babelensure[exclude=\\\today]{#2}}}%
+ {\toks@\expandafter\expandafter\expandafter
+ {\csname bbl@extracaps@#2\endcsname}%
+ \bbl@exp{\\\babelensure[exclude=\\\today,include=\the\toks@}]{#2}}%
\bbl@ifunset{bbl@ensure@\languagename}%
{\bbl@exp{%
\\\DeclareRobustCommand\<bbl@ensure@\languagename>[1]{%
@@ -2860,13 +2865,151 @@
\fi
\def\bbl@ini@captions@aux#1#2{%
\bbl@trim@def\bbl@tempa{#1}%
- \bbl@ifblank{#2}%
- {\bbl@exp{%
- \toks@{\\\bbl@nocaption{\bbl@tempa}{\languagename\bbl@tempa name}}}}%
- {\bbl@trim\toks@{#2}}%
- \bbl@exp{%
- \\\bbl@add\\\bbl@savestrings{%
- \\\SetString\<\bbl@tempa name>{\the\toks@}}}}
+ \bbl@xin@{.template}{\bbl@tempa}%
+ \ifin@
+ \bbl@replace\bbl@tempa{.template}{}%
+ \def\bbl@toreplace{#2}%
+ \bbl@replace\bbl@toreplace{[ ]}{\nobreakspace{}}%
+ \bbl@replace\bbl@toreplace{[[}{\csname}%
+ \bbl@replace\bbl@toreplace{[}{\csname the}%
+ \bbl@replace\bbl@toreplace{]]}{name\endcsname{}}%
+ \bbl@replace\bbl@toreplace{]}{\endcsname{}}%
+ \bbl@xin@{,\bbl@tempa,}{,chapter,}%
+ \ifin@
+ \bbl@patchchapter
+ \global\bbl@csarg\let{chapfmt@\languagename}\bbl@toreplace
+ \fi
+ \bbl@xin@{,\bbl@tempa,}{,appendix,}%
+ \ifin@
+ \bbl@patchchapter
+ \global\bbl@csarg\let{appxfmt@\languagename}\bbl@toreplace
+ \fi
+ \bbl@xin@{,\bbl@tempa,}{,part,}%
+ \ifin@
+ \bbl@patchpart
+ \global\bbl@csarg\let{partfmt@\languagename}\bbl@toreplace
+ \fi
+ \bbl@xin@{,\bbl@tempa,}{,figure,table,}%
+ \ifin@
+ \toks@\expandafter{\bbl@toreplace}%
+ \bbl@exp{\gdef\<fnum@\bbl@tempa>{\the\toks@}}%
+ \fi
+ \else
+ \bbl@ifblank{#2}%
+ {\bbl@exp{%
+ \toks@{\\\bbl@nocaption{\bbl@tempa}{\languagename\bbl@tempa name}}}}%
+ {\bbl@trim\toks@{#2}}%
+ \bbl@exp{%
+ \\\bbl@add\\\bbl@savestrings{%
+ \\\SetString\<\bbl@tempa name>{\the\toks@}}}%
+ \toks@\expandafter{\bbl@captionslist}%
+ \bbl@exp{\\\in@{\<\bbl@tempa name>}{\the\toks@}}%
+ \ifin@\else
+ \bbl@exp{%
+ \\\bbl@add\<bbl@extracaps@\languagename>{\<\bbl@tempa name>}%
+ \\\bbl@toglobal\<bbl@extracaps@\languagename>}%
+ \fi
+ \fi}
+\def\bbl@list@the{%
+ part,chapter,section,subsection,subsubsection,paragraph,%
+ subparagraph,enumi,enumii,enumiii,enumiv,equation,figure,%
+ table,page,footnote,mpfootnote,mpfn}
+\def\bbl@map@cnt#1{% #1:roman,etc, // #2:enumi,etc
+ \bbl@ifunset{bbl@map@#1@\languagename}%
+ {\@nameuse{#1}}%
+ {\@nameuse{bbl@map@#1@\languagename}}}
+\def\bbl@inikv@labels#1=#2\@@{%
+ \in@{.map}{#1}%
+ \ifin@
+ \ifx\bbl@KVP@labels\@nil\else
+ \bbl@xin@{ map }{ \bbl@KVP@labels\space}%
+ \ifin@
+ \def\bbl@tempc{#1}%
+ \bbl@replace\bbl@tempc{.map}{}%
+ \in@{,#2,}{,arabic,roman,Roman,alph,Alph,fnsymbol,}%
+ \bbl@exp{%
+ \gdef\<bbl@map@\bbl@tempc @\languagename>%
+ {\ifin@\<#2>\else\\\localecounter{#2}\fi}}%
+ \bbl@foreach\bbl@list@the{%
+ \bbl@ifunset{the##1}{}%
+ {\bbl@exp{\let\\\bbl@tempd\<the##1>}%
+ \bbl@exp{%
+ \\\bbl@sreplace\<the##1>%
+ {\<\bbl@tempc>{##1}}{\\\bbl@map@cnt{\bbl@tempc}{##1}}%
+ \\\bbl@sreplace\<the##1>%
+ {\<\@empty @\bbl@tempc>\<c@##1>}{\\\bbl@map@cnt{\bbl@tempc}{##1}}}%
+ \expandafter\ifx\csname the##1\endcsname\bbl@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. Eg, enumerate.2 = ([enumi]).([enumii]). It's
+ % language dependent.
+ \in@{enumerate.}{#1}%
+ \ifin@
+ \def\bbl@tempa{#1}%
+ \bbl@replace\bbl@tempa{enumerate.}{}%
+ \def\bbl@toreplace{#2}%
+ \bbl@replace\bbl@toreplace{[ ]}{\nobreakspace{}}%
+ \bbl@replace\bbl@toreplace{[}{\csname the}%
+ \bbl@replace\bbl@toreplace{]}{\endcsname{}}%
+ \toks@\expandafter{\bbl@toreplace}%
+ \bbl@exp{%
+ \\\bbl@add\<extras\languagename>{%
+ \\\babel@save\<labelenum\romannumeral\bbl@tempa>%
+ \def\<labelenum\romannumeral\bbl@tempa>{\the\toks@}}%
+ \\\bbl@toglobal\<extras\languagename>}%
+ \fi
+ \fi}
+\def\bbl@chaptype{chap}
+\ifx\@makechapterhead\@undefined
+ \let\bbl@patchchapter\relax
+\else\ifx\thechapter\@undefined
+ \let\bbl@patchchapter\relax
+\else\ifx\ps@headings\@undefined
+ \let\bbl@patchchapter\relax
+\else
+ \def\bbl@patchchapter{%
+ \global\let\bbl@patchchapter\relax
+ \bbl@add\appendix{\def\bbl@chaptype{appx}}% Not harmful, I hope
+ \bbl@toglobal\appendix
+ \bbl@sreplace\ps@headings
+ {\@chapapp\ \thechapter}%
+ {\bbl@chapterformat}%
+ \bbl@toglobal\ps@headings
+ \bbl@sreplace\chaptermark
+ {\@chapapp\ \thechapter}%
+ {\bbl@chapterformat}%
+ \bbl@toglobal\chaptermark
+ \bbl@sreplace\@makechapterhead
+ {\@chapapp\space\thechapter}%
+ {\bbl@chapterformat}%
+ \bbl@toglobal\@makechapterhead
+ \gdef\bbl@chapterformat{%
+ \bbl@ifunset{bbl@\bbl@chaptype fmt@\languagename}%
+ {\@chapapp\space\thechapter}
+ {\@nameuse{bbl@\bbl@chaptype fmt@\languagename}}}}
+\fi\fi\fi
+\ifx\@part\@undefined
+ \let\bbl@patchpart\relax
+\else
+ \def\bbl@patchpart{%
+ \global\let\bbl@patchpart\relax
+ \bbl@sreplace\@part
+ {\partname\nobreakspace\thepart}%
+ {\bbl@partformat}%
+ \bbl@toglobal\@part
+ \gdef\bbl@partformat{%
+ \bbl@ifunset{bbl@partfmt@\languagename}%
+ {\partname\nobreakspace\thepart}
+ {\@nameuse{bbl@partfmt@\languagename}}}}
+\fi
\let\bbl@calendar\@empty
\DeclareRobustCommand\localedate[1][]{\bbl@localedate{#1}}
\def\bbl@cased{% TODO. Move
@@ -3009,12 +3152,12 @@
\else\iffontchar\font"200B
\hyphenchar\font"200B
\else
- \bbl@error
+ \bbl@warning
{Neither 0 nor ZERO WIDTH SPACE are available\\%
in the current font, and therefore the hyphen\\%
- will be printed. Try with 'HyphenChar', but be\\%
- aware this setting is not safe (see the manual).}%
- {See the manual.}%
+ will be printed. Try changing the fontspec's\\%
+ 'HyphenChar' to another value, but be aware\\%
+ this setting is not safe (see the manual)}%
\hyphenchar\font\defaulthyphenchar
\fi\fi
\fi}%
diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty
index 8fd14ead9e0..7cd6d69fe7b 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/07/13 3.47 The Babel package]
+\ProvidesPackage{babel}[2020/09/01 3.48 The Babel package]
\@ifpackagewith{babel}{debug}
{\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}%
\let\bbl@debug\@firstofone}
@@ -232,7 +232,7 @@
\bbl@warning{%
Some functions for '#1' are tentative.\\%
They might not work as expected and their behavior\\%
- could change in the future.\\%
+ may change in the future.\\%
Reported}}
\def\@nolanerr#1{%
\bbl@error
@@ -509,8 +509,10 @@
\set@typeset@protect
\expandafter\select@language@x\expandafter{\bbl@main@language}%
\let\protect\noexpand
- \edef\thepage{% TODO. Only with bidi. See also above
- \noexpand\babelsublr{\unexpanded\expandafter{\thepage}}}}%
+ \ifcase\bbl@bidimode\else % Only with bidi. See also above
+ \edef\thepage{%
+ \noexpand\babelsublr{\unexpanded\expandafter{\thepage}}}%
+ \fi}%
\fi}
{\ifbbl@single\else
\bbl@ifunset{markright }\bbl@redefine\bbl@redefinerobust
@@ -587,10 +589,6 @@
\def\@currname{hhline}\input{hhline.sty}\makeatother
\fi}%
{}}}
-\AtBeginDocument{%
- \ifx\pdfstringdefDisableCommands\@undefined\else
- \pdfstringdefDisableCommands{\languageshorthands{system}}%
- \fi}
\DeclareRobustCommand{\FOREIGNLANGUAGE}[1]{%
\lowercase{\foreignlanguage{#1}}}
\def\substitutefontfamily#1#2#3{%
diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
index 6a89e399069..1b9e6a23100 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/07/13 3.47 Babel hyphens]
+\ProvidesFile{hyphen.cfg}[2020/09/01 3.48 Babel hyphens]
\xdef\bbl@format{\jobname}
-\def\bbl@version{3.47}
-\def\bbl@date{2020/07/13}
+\def\bbl@version{3.48}
+\def\bbl@date{2020/09/01}
\ifx\AtBeginDocument\@undefined
\def\@empty{}
\let\orig@dump\dump
diff --git a/Master/texmf-dist/tex/generic/babel/locale/hu/babel-hu.ini b/Master/texmf-dist/tex/generic/babel/locale/hu/babel-hu.ini
index f0c4baa1234..b681831d8d4 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/hu/babel-hu.ini
+++ b/Master/texmf-dist/tex/generic/babel/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
diff --git a/Master/texmf-dist/tex/generic/babel/locale/ja/babel-ja.ini b/Master/texmf-dist/tex/generic/babel/locale/ja/babel-ja.ini
index 2e255489afb..8776e511570 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/ja/babel-ja.ini
+++ b/Master/texmf-dist/tex/generic/babel/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,6 +34,7 @@ preface = 前書き
ref = 参考文献
abstract = 概要
bib = 参考文献
+chapter.template = [[prechapter]] [chapter] [[postchapter]]
prechapter = 第
postchapter = 章
appendix = 付録
@@ -43,7 +44,8 @@ listtable = 表目次
index = 索引
figure = 図
table = 表
-part = 第
+part.template = [[prepart]] [part] [[postpart]]
+prepart = 第
postpart = 部
encl =
cc =
diff --git a/Master/texmf-dist/tex/generic/babel/locale/ko/babel-ko-Hani.ini b/Master/texmf-dist/tex/generic/babel/locale/ko/babel-ko-Hani.ini
index 0edc9693f15..882c135235c 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/ko/babel-ko-Hani.ini
+++ b/Master/texmf-dist/tex/generic/babel/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/Master/texmf-dist/tex/generic/babel/locale/ko/babel-ko.ini b/Master/texmf-dist/tex/generic/babel/locale/ko/babel-ko.ini
index 425073acf50..2010e5a5bc1 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/ko/babel-ko.ini
+++ b/Master/texmf-dist/tex/generic/babel/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/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans.ini b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans.ini
index ae363736d91..7e6cddd1ae9 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans.ini
+++ b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh-Hans.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-08-06
name.local = 中文
name.english = Chinese
name.opentype = Chinese Simplified
@@ -30,25 +32,29 @@ derivate = no
[captions]
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 =
page =
see =
also =
-proof =
+proof = 证明
glossary =
[captions.licr]
diff --git a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh.ini b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh.ini
index 0bf15d3c083..d8845e7f85a 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh.ini
+++ b/Master/texmf-dist/tex/generic/babel/locale/zh/babel-zh.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-08-06
name.local = 中文
name.english = Chinese
name.opentype = Chinese Simplified
@@ -31,25 +33,29 @@ derivate = no
[captions]
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 =
page =
see =
also =
-proof =
+proof = 证明
glossary =
[captions.licr]
@@ -173,6 +179,7 @@ plusSign = +
superscriptingExponent = ×
[counters]
+; TODO. Add 壹 貳 叁...
cjk-earthly-branch = 子 丑 寅 卯 辰 巳 午 未 申 酉 戌 亥
cjk-heavenly-stem = 甲 乙 丙 丁 戊 己 庚 辛 壬 癸
fullwidth.lower.alpha = a b c d e f g h i j k l m n o p q r s t u v w x y z
diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf
index 0f9709a66bb..80e18612f0e 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/07/13 3.47 Nil language]
+\ProvidesLanguage{nil}[2020/09/01 3.48 Nil language]
\LdfInit{nil}{datenil}
\ifx\l@nil\@undefined
\newlanguage\l@nil