From 3e77979c65d09a262497f9d5df7414009d5c6a4a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 13 Jul 2020 21:11:36 +0000 Subject: babel (13jul20) git-svn-id: svn://tug.org/texlive/trunk@55830 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/babel/README.md | 21 ++- Master/texmf-dist/doc/latex/babel/babel.pdf | Bin 793176 -> 792238 bytes Master/texmf-dist/source/latex/babel/babel.dtx | 105 ++++++----- 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 770813 -> 776821 bytes Master/texmf-dist/tex/generic/babel/babel.def | 75 ++++---- Master/texmf-dist/tex/generic/babel/babel.sty | 14 +- Master/texmf-dist/tex/generic/babel/hyphen.cfg | 6 +- .../tex/generic/babel/locale/ja/babel-ja.ini | 49 ++--- .../tex/generic/babel/locale/ko/babel-ko-Hani.ini | 202 +++++++++++++++++++++ .../tex/generic/babel/locale/ko/babel-ko.ini | 102 ++++++----- .../generic/babel/locale/ko/babel-korean-han.tex | 12 ++ .../generic/babel/locale/ko/babel-korean-hani.tex | 12 ++ Master/texmf-dist/tex/generic/babel/nil.ldf | 2 +- 15 files changed, 440 insertions(+), 164 deletions(-) create mode 100644 Master/texmf-dist/tex/generic/babel/locale/ko/babel-ko-Hani.ini create mode 100644 Master/texmf-dist/tex/generic/babel/locale/ko/babel-korean-han.tex create mode 100644 Master/texmf-dist/tex/generic/babel/locale/ko/babel-korean-hani.tex diff --git a/Master/texmf-dist/doc/latex/babel/README.md b/Master/texmf-dist/doc/latex/babel/README.md index 6ac28f4107d..51b28dd172c 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.46 +## Babel 3.47 This package manages culturally-determined typographical (and other) rules, and hyphenation patterns for a wide range of languages. Many @@ -7,11 +7,11 @@ lualatex out of the box. A few even work with plain formats. The latest stable version is available on . -Changes in version 3.46 are described in: +Changes in version 3.47 are described in: -https://github.com/latex3/babel/wiki/What's-new-in-babel-3.46 +https://github.com/latex3/babel/wiki/What's-new-in-babel-3.47 -Included is a set of ini files for about 200 languages. +Included is a set of ini files for about 200 languages. The best way to install and/or update it is with the help of package managers. @@ -44,7 +44,19 @@ respective authors. ### Latest changes ``` +3.47 2020-07-13 + - Fixes: + - Spurious spaces when autoloading locales (bug introduced + in 3.46 when fixing #80). + - In dtx files, autoloading printed some spurious text + (because % is set to ignore, #87). + - New - \getlocaleproperty*, which doesn't raise an error. + - Basic ini+tex templates for about 500 languages in the GitHub + repository. + 3.46 2020-07-06 + - Languages can now be optionally selected with their BCP 47 + tags. - \BabelEnsureInfo now loads the basic data for the requested languages immediately (formerly it was done at the end of the preamble). @@ -56,6 +68,7 @@ respective authors. - Locale info was not loaded if the name had uppercase letters in some OSs (#80). - The [..|..] syntax in ini dates didn't recognize 'digits'. +https://github.com/latex3/babel/wiki/What's-new-in-babel-3.46 3.45 2020-06-10 - Minor fixes in Hindi, Ancient Greek, Macedonian. diff --git a/Master/texmf-dist/doc/latex/babel/babel.pdf b/Master/texmf-dist/doc/latex/babel/babel.pdf index 0a1444e5833..1e8c2a087dd 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 736f7e25bf9..acc0b3953c4 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/07/07 v3.46 The Babel package] +\ProvidesFile{babel.dtx}[2020/07/13 v3.47 The Babel package] \documentclass{ltxdoc} \GetFileInfo{babel.dtx} \usepackage{fontspec} @@ -2304,13 +2304,15 @@ Conveniently, some options allow to fill the language, and \babel{} warns you about what to do if there is a missing string. Very likely you will find alerts like that in the |log| file: \begin{verbatim} -Package babel Warning: \mylangchaptername not set. Please, define -(babel) it in the preamble with something like: +Package babel Warning: \mylangchaptername not set. Please, define it +(babel) after the language has been loaded (typically +(babel) in the preamble) with something like: (babel) \renewcommand\maylangchaptername{..} (babel) Reported on input line 18. \end{verbatim} -In most cases, you will only need to define a few macros. +In most cases, you will only need to define a few macros. Note +languages loaded on the fly are not yet available in the preamble. \begin{example} If you need a language named |arhinish|: @@ -2710,7 +2712,9 @@ expandable, and the available fields are: counterintuitive. \end{warning} -\Describe{\getlocaleproperty}{\marg{macro}\marg{locale}\marg{property}} +\Describe{\getlocaleproperty}{% + \colorbox{thegrey}{\ttfamily\hskip-.2em*\hskip-.2em}% + \marg{macro}\marg{locale}\marg{property}} \New{3.42} The value of any locale property as set by the |ini| files (or added/modified with |\babelprovide|) can be retrieved and stored in @@ -2721,6 +2725,10 @@ a macro with this command. For example, after: the macro |\hechap| will contain the string {\fontspec[Scale=.87,Script=Hebrew]{Liberation Mono}\textdir TRT פרק}. +If the key does not exist, the macro is set to |\relax| and an error is +raised. \New{3.47} With the starred version no error is raised, so that +you can take your own actions with undefined properties. + \Babel{} remembers which |ini| files have been loaded. There is a loop named |\LocaleForEach| to traverse the list, where |#1| is the name of the current item, so that |\LocaleForEach{\message{ **#1** }}| just @@ -3942,7 +3950,8 @@ but if you want to do it, here are a few guidelines. \end{itemize} The following page provides a starting point: -\texttt{http://www.texnia.com/incubator.html}. +\texttt{http://www.texnia.com/incubator.html}. See also +\texttt{https://github.com/latex3/babel/wiki/List-of-locale-templates}. If you need further assistance and technical advice in the development of language styles, I am willing to help you. And of @@ -4682,8 +4691,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 @@ -4965,6 +4974,19 @@ help from Bernd Raichle, for which I am grateful. \else \@ne \fi +% \end{macrocode} +% +% A somewhat hackish tool (hence its name) to avoid spurious spaces in +% some contexts. +% +% \begin{macrocode} +\def\bbl@bsphack{% + \ifhmode + \hskip\z@skip + \def\bbl@esphack{\loop\ifdim\lastskip>\z@\unskip\repeat\unskip}% + \else + \let\bbl@esphack\@empty + \fi} %<> % \end{macrocode} % @@ -5090,8 +5112,9 @@ help from Bernd Raichle, for which I am grateful. \global\@namedef{#2}{\textbf{?#1?}}% \@nameuse{#2}% \bbl@warning{% - \@backslashchar#2 not set. Please, define\\% - it in the preamble with something like:\\% + \@backslashchar#2 not set. Please, define it\\% + after the language has been loaded (typically\\% + in the preamble) with something like:\\% \string\renewcommand\@backslashchar#2{..}\\% Reported}} \def\bbl@tentative{\protect\bbl@tentative@i} @@ -7204,18 +7227,12 @@ help from Bernd Raichle, for which I am grateful. \bbl@id@assign % switch captions, date \ifcase\bbl@select@type - \ifhmode - \hskip\z@skip % trick to ignore spaces - \csname captions#1\endcsname\relax - \csname date#1\endcsname\relax - \loop\ifdim\lastskip>\z@\unskip\repeat\unskip - \else + \bbl@bsphack \csname captions#1\endcsname\relax \csname date#1\endcsname\relax - \fi + \bbl@esphack \else - \ifhmode - \hskip\z@skip % trick to ignore spaces + \bbl@bsphack \bbl@xin@{,captions,}{,\bbl@select@opts,}% \ifin@ \csname captions#1\endcsname\relax @@ -7224,17 +7241,7 @@ help from Bernd Raichle, for which I am grateful. \ifin@ % if \foreign... within \date \csname date#1\endcsname\relax \fi - \loop\ifdim\lastskip>\z@\unskip\repeat\unskip - \else - \bbl@xin@{,captions,}{,\bbl@select@opts,}% - \ifin@ - \csname captions#1\endcsname\relax - \fi - \bbl@xin@{,date,}{,\bbl@select@opts,}% - \ifin@ - \csname date#1\endcsname\relax - \fi - \fi + \bbl@esphack \fi % switch extras \bbl@usehooks{beforeextras}{}% @@ -7651,8 +7658,9 @@ help from Bernd Raichle, for which I am grateful. \global\@namedef{#2}{\textbf{?#1?}}% \@nameuse{#2}% \bbl@warning{% - \@backslashchar#2 not set. Please, define\\% - it in the preamble with something like:\\% + \@backslashchar#2 not set. Please, define it\\% + after the language has been loaded (typically\\% + in the preamble) with something like:\\% \string\renewcommand\@backslashchar#2{..}\\% Reported}} \def\bbl@tentative{\protect\bbl@tentative@i} @@ -10278,6 +10286,7 @@ help from Bernd Raichle, for which I am grateful. % \global\@namedef{bbl@lcname@#2}{#2}% \bbl@id@assign \let\bbl@KVP@captions\@nil + \let\bbl@KVP@date\@nil \let\bbl@KVP@import\@nil \let\bbl@KVP@main\@nil \let\bbl@KVP@script\@nil @@ -10306,7 +10315,7 @@ help from Bernd Raichle, for which I am grateful. {\ifx\bbl@initoload\relax \begingroup \def\BabelBeforeIni##1##2{\gdef\bbl@KVP@import{##1}\endinput}% - \bbl@input@ini{#2}% + \bbl@input@texini{#2}% \endgroup \else \xdef\bbl@KVP@import{\bbl@initoload}% @@ -10548,7 +10557,7 @@ help from Bernd Raichle, for which I am grateful. \let\BabelBeforeIni\@gobbletwo \chardef\atcatcode=\catcode`\@ \catcode`\@=11\relax - \bbl@input@ini{\bbl@cs{rqtex@\languagename}}% + \bbl@input@texini{\bbl@cs{rqtex@\languagename}}% \catcode`\@=\atcatcode \let\atcatcode\relax \fi}% @@ -10674,7 +10683,7 @@ help from Bernd Raichle, for which I am grateful. {\def\BabelBeforeIni##1##2{% \begingroup \catcode`\[=12 \catcode`\]=12 \catcode`\==12 - \catcode`\;=12 \catcode`\|=12 % + \catcode`\;=12 \catcode`\|=12 \catcode`\%=14 \let\bbl@ini@captions@aux\@gobbletwo \def\bbl@inidate ####1.####2.####3.####4\relax ####5####6{}% \bbl@read@ini{##1}0% @@ -10692,7 +10701,7 @@ help from Bernd Raichle, for which I am grateful. \endgroup}% \begingroup % boxed, to avoid extra spaces: \ifx\bbl@initoload\relax - \bbl@input@ini{#1}% + \bbl@input@texini{#1}% \else \setbox\z@\hbox{\BabelBeforeIni{\bbl@initoload}{}}% \fi @@ -10748,8 +10757,13 @@ help from Bernd Raichle, for which I am grateful. \ifx\bbl@readstream\@undefined \csname newread\endcsname\bbl@readstream \fi -\def\bbl@input@ini#1{% - \bbl@exp{\lowercase{\\\InputIfFileExists{babel-#1.tex}{}{}}}} +\def\bbl@input@texini#1{% + \bbl@bsphack + \bbl@exp{% + \catcode`\\\%=14 + \lowercase{\\\InputIfFileExists{babel-#1.tex}{}{}}% + \catcode`\\\%=\the\catcode`\%\relax}% + \bbl@esphack} \def\bbl@inipreread#1=#2\@@{% \bbl@trim@def\bbl@tempa{#1}% Redundant below !! \bbl@trim\toks@{#2}% @@ -11187,11 +11201,11 @@ help from Bernd Raichle, for which I am grateful. \begingroup \bbl@add\bbl@secpost@identification{\closein\bbl@readstream }% \catcode`\[=12 \catcode`\]=12 \catcode`\==12 - \catcode`\;=12 \catcode`\|=12 % + \catcode`\;=12 \catcode`\|=12 \catcode`\%=14 \bbl@read@ini{##1}1% \endinput % babel- .tex may contain onlypreamble's \endgroup}% boxed, to avoid extra spaces: - {\bbl@input@ini{#1}}} + {\bbl@input@texini{#1}}} % \end{macrocode} % % Alphabetic counters must be converted from a space separated list to @@ -11287,14 +11301,18 @@ help from Bernd Raichle, for which I am grateful. % |\bbl@read@ini|. % % \begin{macrocode} -\newcommand\getlocaleproperty[3]{% +\newcommand\getlocaleproperty{% + \@ifstar\bbl@getproperty@s\bbl@getproperty@x} +\def\bbl@getproperty@s#1#2#3{% \let#1\relax \def\bbl@elt##1##2##3{% \bbl@ifsamestring{##1/##2}{#3}% {\providecommand#1{##3}% \def\bbl@elt####1####2####3{}}% {}}% - \bbl@cs{inidata@#2}% + \bbl@cs{inidata@#2}}% +\def\bbl@getproperty@x#1#2#3{% + \bbl@getproperty@s{#1}{#2}{#3}% \ifx#1\relax \bbl@error {Unknown key for locale '#2':\\% @@ -11386,8 +11404,7 @@ help from Bernd Raichle, for which I am grateful. \newif\ifbbl@bcptoname \@namedef{bbl@ADJ@bcp47.toname@on}{% \bbl@bcptonametrue - \BabelEnsureInfo - } + \BabelEnsureInfo} \@namedef{bbl@ADJ@bcp47.toname@off}{% \bbl@bcptonamefalse} % TODO: use babel name, override diff --git a/Master/texmf-dist/source/latex/babel/babel.ins b/Master/texmf-dist/source/latex/babel/babel.ins index 5c8abdc75d9..f967de9e715 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/07/07} +\def\filedate{2020/07/13} \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 84777f9f2af..9a2431ff450 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/07/07 v3.46] +\ProvidesFile{bbcompat.dtx}[2020/07/13 v3.47] % % %% File 'bbcompat.dtx' diff --git a/Master/texmf-dist/source/latex/babel/locale.zip b/Master/texmf-dist/source/latex/babel/locale.zip index 93c76982378..35464afff59 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 3fd75d82914..85484179dd5 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/07 3.46 Babel common definitions] +\ProvidesFile{babel.def}[2020/07/13 3.47 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.46} -\def\bbl@date{2020/07/07} +\def\bbl@version{3.47} +\def\bbl@date{2020/07/13} \def\adddialect#1#2{% \global\chardef#1#2\relax \bbl@usehooks{adddialect}{{#1}{#2}}% @@ -635,18 +635,12 @@ \bbl@id@assign % switch captions, date \ifcase\bbl@select@type - \ifhmode - \hskip\z@skip % trick to ignore spaces + \bbl@bsphack \csname captions#1\endcsname\relax \csname date#1\endcsname\relax - \loop\ifdim\lastskip>\z@\unskip\repeat\unskip - \else - \csname captions#1\endcsname\relax - \csname date#1\endcsname\relax - \fi + \bbl@esphack \else - \ifhmode - \hskip\z@skip % trick to ignore spaces + \bbl@bsphack \bbl@xin@{,captions,}{,\bbl@select@opts,}% \ifin@ \csname captions#1\endcsname\relax @@ -655,17 +649,7 @@ \ifin@ % if \foreign... within \date \csname date#1\endcsname\relax \fi - \loop\ifdim\lastskip>\z@\unskip\repeat\unskip - \else - \bbl@xin@{,captions,}{,\bbl@select@opts,}% - \ifin@ - \csname captions#1\endcsname\relax - \fi - \bbl@xin@{,date,}{,\bbl@select@opts,}% - \ifin@ - \csname date#1\endcsname\relax - \fi - \fi + \bbl@esphack \fi % switch extras \bbl@usehooks{beforeextras}{}% @@ -865,8 +849,9 @@ \global\@namedef{#2}{\textbf{?#1?}}% \@nameuse{#2}% \bbl@warning{% - \@backslashchar#2 not set. Please, define\\% - it in the preamble with something like:\\% + \@backslashchar#2 not set. Please, define it\\% + after the language has been loaded (typically\\% + in the preamble) with something like:\\% \string\renewcommand\@backslashchar#2{..}\\% Reported}} \def\bbl@tentative{\protect\bbl@tentative@i} @@ -1045,6 +1030,13 @@ \else \@ne \fi +\def\bbl@bsphack{% + \ifhmode + \hskip\z@skip + \def\bbl@esphack{\loop\ifdim\lastskip>\z@\unskip\repeat\unskip}% + \else + \let\bbl@esphack\@empty + \fi} \bbl@trace{Compatibility with language.def} \ifx\bbl@languages\@undefined \ifx\directlua\@undefined @@ -2227,6 +2219,7 @@ % \global\@namedef{bbl@lcname@#2}{#2}% \bbl@id@assign \let\bbl@KVP@captions\@nil + \let\bbl@KVP@date\@nil \let\bbl@KVP@import\@nil \let\bbl@KVP@main\@nil \let\bbl@KVP@script\@nil @@ -2255,7 +2248,7 @@ {\ifx\bbl@initoload\relax \begingroup \def\BabelBeforeIni##1##2{\gdef\bbl@KVP@import{##1}\endinput}% - \bbl@input@ini{#2}% + \bbl@input@texini{#2}% \endgroup \else \xdef\bbl@KVP@import{\bbl@initoload}% @@ -2497,7 +2490,7 @@ \let\BabelBeforeIni\@gobbletwo \chardef\atcatcode=\catcode`\@ \catcode`\@=11\relax - \bbl@input@ini{\bbl@cs{rqtex@\languagename}}% + \bbl@input@texini{\bbl@cs{rqtex@\languagename}}% \catcode`\@=\atcatcode \let\atcatcode\relax \fi}% @@ -2604,7 +2597,7 @@ {\def\BabelBeforeIni##1##2{% \begingroup \catcode`\[=12 \catcode`\]=12 \catcode`\==12 - \catcode`\;=12 \catcode`\|=12 % + \catcode`\;=12 \catcode`\|=12 \catcode`\%=14 \let\bbl@ini@captions@aux\@gobbletwo \def\bbl@inidate ####1.####2.####3.####4\relax ####5####6{}% \bbl@read@ini{##1}0% @@ -2622,7 +2615,7 @@ \endgroup}% \begingroup % boxed, to avoid extra spaces: \ifx\bbl@initoload\relax - \bbl@input@ini{#1}% + \bbl@input@texini{#1}% \else \setbox\z@\hbox{\BabelBeforeIni{\bbl@initoload}{}}% \fi @@ -2666,8 +2659,13 @@ \ifx\bbl@readstream\@undefined \csname newread\endcsname\bbl@readstream \fi -\def\bbl@input@ini#1{% - \bbl@exp{\lowercase{\\\InputIfFileExists{babel-#1.tex}{}{}}}} +\def\bbl@input@texini#1{% + \bbl@bsphack + \bbl@exp{% + \catcode`\\\%=14 + \lowercase{\\\InputIfFileExists{babel-#1.tex}{}{}}% + \catcode`\\\%=\the\catcode`\%\relax}% + \bbl@esphack} \def\bbl@inipreread#1=#2\@@{% \bbl@trim@def\bbl@tempa{#1}% Redundant below !! \bbl@trim\toks@{#2}% @@ -3027,11 +3025,11 @@ \begingroup \bbl@add\bbl@secpost@identification{\closein\bbl@readstream }% \catcode`\[=12 \catcode`\]=12 \catcode`\==12 - \catcode`\;=12 \catcode`\|=12 % + \catcode`\;=12 \catcode`\|=12 \catcode`\%=14 \bbl@read@ini{##1}1% \endinput % babel- .tex may contain onlypreamble's \endgroup}% boxed, to avoid extra spaces: - {\bbl@input@ini{#1}}} + {\bbl@input@texini{#1}}} \def\bbl@buildifcase#1 {% Returns \bbl@tempa, requires \toks@={} \ifx\\#1% % \\ before, in case #1 is multiletter \bbl@exp{% @@ -3095,14 +3093,18 @@ \bbl@foreach\bbl@loaded{{% \def\languagename{##1}% \bbl@ensureinfo{##1}}}} -\newcommand\getlocaleproperty[3]{% +\newcommand\getlocaleproperty{% + \@ifstar\bbl@getproperty@s\bbl@getproperty@x} +\def\bbl@getproperty@s#1#2#3{% \let#1\relax \def\bbl@elt##1##2##3{% \bbl@ifsamestring{##1/##2}{#3}% {\providecommand#1{##3}% \def\bbl@elt####1####2####3{}}% {}}% - \bbl@cs{inidata@#2}% + \bbl@cs{inidata@#2}}% +\def\bbl@getproperty@x#1#2#3{% + \bbl@getproperty@s{#1}{#2}{#3}% \ifx#1\relax \bbl@error {Unknown key for locale '#2':\\% @@ -3182,8 +3184,7 @@ \newif\ifbbl@bcptoname \@namedef{bbl@ADJ@bcp47.toname@on}{% \bbl@bcptonametrue - \BabelEnsureInfo - } + \BabelEnsureInfo} \@namedef{bbl@ADJ@bcp47.toname@off}{% \bbl@bcptonamefalse} \ifx\directlua\@undefined\else diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty index 4079dcd81b3..8fd14ead9e0 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/07 3.46 The Babel package] +\ProvidesPackage{babel}[2020/07/13 3.47 The Babel package] \@ifpackagewith{babel}{debug} {\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}% \let\bbl@debug\@firstofone} @@ -187,6 +187,13 @@ \else \@ne \fi +\def\bbl@bsphack{% + \ifhmode + \hskip\z@skip + \def\bbl@esphack{\loop\ifdim\lastskip>\z@\unskip\repeat\unskip}% + \else + \let\bbl@esphack\@empty + \fi} % Temporarily repeat here the code for errors \def\bbl@error#1#2{% \begingroup @@ -215,8 +222,9 @@ \global\@namedef{#2}{\textbf{?#1?}}% \@nameuse{#2}% \bbl@warning{% - \@backslashchar#2 not set. Please, define\\% - it in the preamble with something like:\\% + \@backslashchar#2 not set. Please, define it\\% + after the language has been loaded (typically\\% + in the preamble) with something like:\\% \string\renewcommand\@backslashchar#2{..}\\% Reported}} \def\bbl@tentative{\protect\bbl@tentative@i} diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg index c31e4933a24..6a89e399069 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/07 3.46 Babel hyphens] +\ProvidesFile{hyphen.cfg}[2020/07/13 3.47 Babel hyphens] \xdef\bbl@format{\jobname} -\def\bbl@version{3.46} -\def\bbl@date{2020/07/07} +\def\bbl@version{3.47} +\def\bbl@date{2020/07/13} \ifx\AtBeginDocument\@undefined \def\@empty{} \let\orig@dump\dump 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 851f410cbce..2e255489afb 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.5 -date = 2020-06-30 +version = 1.6 +date = 2020-07-10 name.local = 日本語 name.english = Japanese name.babel = japanese @@ -29,27 +29,30 @@ encodings = derivate = no [captions] -preface = -ref = -abstract = -bib = -chapter = -appendix = -contents = -listfigure = -listtable = -index = -figure = -table = -part = -encl = -cc = -headto = -page = -see = -also = -proof = -glossary = +; some key names are tentative +preface = 前書き +ref = 参考文献 +abstract = 概要 +bib = 参考文献 +prechapter = 第 +postchapter = 章 +appendix = 付録 +contents = 目次 +listfigure = 図目次 +listtable = 表目次 +index = 索引 +figure = 図 +table = 表 +part = 第 +postpart = 部 +encl = +cc = +headto = +page = +see = +also = +proof = 証明 +glossary = 用語集 [captions.licr] preface = 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 new file mode 100644 index 00000000000..0edc9693f15 --- /dev/null +++ b/Master/texmf-dist/tex/generic/babel/locale/ko/babel-ko-Hani.ini @@ -0,0 +1,202 @@ +; This file is part of babel. For further details see: +; https://www.ctan.org/pkg/babel +; Data has been collected mainly from the following sources: +; * babel language styles (license LPPL): +; https://www.ctan.org/pkg/babel-contrib +; * polyglossia language styles (license LPPL) +; https://www.ctan.org/pkg/polyglossia +; * Common Locale Data Repository (license Unicode): +; http://cldr.unicode.org/ +; http://unicode.org/copyright.html + +[identification] +charset = utf8 +version = 1.0 +date = 2020-07-10 +name.local = 한국어 +name.english = Korean +name.babel = korean-han korean-hani +name.polyglossia = korean +tag.bcp47 = ko +language.tag.bcp47 = ko +tag.opentype = KOR +script.name = Han +script.name.opentype = CJK +script.tag.bcp47 = Hani +script.tag.opentype = hani +level = 1 +encodings = +derivate = no + +[captions] +; names based on kotex +preface = 序文 +ref = 參考 文獻 +abstract = 要 約 +bib = 著書~目錄 +prechapter = 第 +postchapter = 章 +appendix = 附錄 +contents = 目 次 +listfigure = 그림 目次 +listtable = 表 目次 +index = 索引 +figure = 그림 +table = 表 +prepart = 第 +postpart = 篇 +encl = 同封物 +cc = 寫本 +headto = 受信人 +page = 面 +; see = \을~參考 +see = +; also = \을~參考 +also = +proof = 證明 +glossary = 語 彙 +presection = 第 +postsection = 節 + +[captions.licr] +preface = +ref = +abstract = +bib = +chapter = +appendix = +contents = +listfigure = +listtable = +index = +figure = +table = +part = +encl = +cc = +headto = +page = +see = +also = +proof = +glossary = + +[date.gregorian] +date.long = [y|digits]年 [m|hanja.informal]月 [d|hanja.informal]日 +date.short = [yy]. [M]. [d]. +months.wide.1 = 1月 +months.wide.2 = 2月 +months.wide.3 = 3月 +months.wide.4 = 4月 +months.wide.5 = 5月 +months.wide.6 = 6月 +months.wide.7 = 7月 +months.wide.8 = 8月 +months.wide.9 = 9月 +months.wide.10 = 10月 +months.wide.11 = 11月 +months.wide.12 = 12月 +months.narrow.1 = 1月 +months.narrow.2 = 2月 +months.narrow.3 = 3月 +months.narrow.4 = 4月 +months.narrow.5 = 5月 +months.narrow.6 = 6月 +months.narrow.7 = 7月 +months.narrow.8 = 8月 +months.narrow.9 = 9月 +months.narrow.10 = 10月 +months.narrow.11 = 11月 +months.narrow.12 = 12月 +days.wide.mon = 월요일 +days.wide.tue = 화요일 +days.wide.wed = 수요일 +days.wide.thu = 목요일 +days.wide.fri = 금요일 +days.wide.sat = 토요일 +days.wide.sun = 일요일 +days.abbreviated.mon = 월 +days.abbreviated.tue = 화 +days.abbreviated.wed = 수 +days.abbreviated.thu = 목 +days.abbreviated.fri = 금 +days.abbreviated.sat = 토 +days.abbreviated.sun = 일 +days.narrow.mon = 월 +days.narrow.tue = 화 +days.narrow.wed = 수 +days.narrow.thu = 목 +days.narrow.fri = 금 +days.narrow.sat = 토 +days.narrow.sun = 일 +dayPeriods.abbreviated.am = AM +dayPeriods.abbreviated.pm = PM +dayPeriods.narrow.am = AM +dayPeriods.narrow.pm = PM +dayPeriods.wide.am = 오전 +dayPeriods.wide.pm = 오후 + +[time.gregorian] +time.medium = [a] [h]:[mm]:[ss] +time.short = [a] [h]:[mm] + +[typography] +frenchspacing = +hyphenrules = +lefthyphenmin = +righthyphenmin = +hyphenchar = +prehyphenchar = +posthyphenchar = +exhyphenchar = +preexhyphenchar = +postexhyphenchar = +hyphenationmin = +intraspace = 0 .1 0 +linebreaking = c + +[characters] +delimiters.quotes = “”‘’ +auxiliary = [ᄀ-ᄒ ᅡ-ᅵ ᆨ-ᇂ 丘 串 乃 久 乖 九 乞 乫 乾 亂 亘 交 京 仇 今 介 件 价 企 伋 伎 伽 佳 佶 侃 來 侊 供 係 俓 俱 個 倞 倦 倨 假 偈 健 傀 傑 傾 僅 僑 價 儆 儉 儺 光 克 兢 內 公 共 其 具 兼 冀 冠 凱 刊 刮 券 刻 剋 剛 劇 劍 劒 功 加 劤 劫 勁 勍 勘 勤 勸 勻 勾 匡 匣 區 南 卦 却 卵 卷 卿 厥 去 及 口 句 叩 叫 可 各 吉 君 告 呱 呵 咎 咬 哥 哭 啓 喀 喇 喝 喫 喬 嗜 嘉 嘔 器 囊 困 固 圈 國 圭 圻 均 坎 坑 坤 坰 坵 垢 基 埼 堀 堅 堈 堪 堺 塊 塏 境 墾 壙 壞 夔 奇 奈 奎 契 奸 妓 妗 姑 姜 姦 娘 娜 嫁 嬌 孔 季 孤 宏 官 客 宮 家 寄 寇 寡 寬 尻 局 居 屆 屈 岐 岡 岬 崎 崑 崗 嵌 嵐 嶇 嶠 工 巧 巨 己 巾 干 幹 幾 庚 庫 康 廊 廐 廓 廣 建 弓 强 彊 徑 忌 急 怪 怯 恐 恝 恪 恭 悸 愆 感 愧 愷 愾 慊 慣 慤 慨 慶 慷 憩 憬 憾 懃 懇 懦 懶 懼 戈 戒 戟 戡 扱 技 抉 拉 拏 拐 拒 拘 括 拮 拱 拳 拷 拿 捏 据 捲 捺 掘 掛 控 揀 揆 揭 擊 擎 擒 據 擧 攪 攷 改 攻 故 敎 救 敢 敬 敲 斛 斤 旗 旣 昆 昑 景 晷 暇 暖 暠 暻 曠 曲 更 曷 朗 朞 期 机 杆 杞 杰 枏 果 枯 架 枸 柑 柩 柬 柯 校 根 格 桀 桂 桔 桿 梏 梗 械 梱 棄 棋 棍 棘 棨 棺 楗 楠 極 槁 構 槐 槨 槪 槻 槿 樂 橄 橋 橘 機 檄 檎 檢 櫃 欄 權 欺 款 歌 歐 歸 殼 毆 毬 氣 求 江 汨 汲 決 汽 沂 沽 洛 洸 浪 涇 淃 淇 減 渠 渴 湳 溝 溪 滑 滾 漑 潔 潰 澗 激 濫 灌 灸 炅 炚 炬 烙 烱 煖 爛 牽 犬 狂 狗 狡 狼 獗 玖 玘 珂 珏 珖 珙 珞 珪 球 琦 琨 琪 琯 琴 瑾 璂 璟 璣 璥 瓊 瓘 瓜 甄 甘 甲 男 畇 界 畸 畺 畿 疆 疥 疳 痂 痙 痼 癎 癩 癸 皆 皎 皐 盖 監 看 眷 睾 瞰 瞼 瞿 矜 矩 矯 硅 硬 碁 碣 磎 磬 磯 磵 祁 祇 祈 祛 祺 禁 禽 科 稈 稼 稽 稿 穀 究 穹 空 窘 窟 窮 窺 竅 竟 竭 競 竿 筋 筐 筠 箇 箕 箝 管 簡 粳 糠 系 糾 紀 納 紘 級 紺 絅 結 絞 給 絳 絹 絿 經 綱 綺 緊 繫 繭 繼 缺 罐 罫 羅 羈 羌 羔 群 羹 翹 考 耆 耉 耕 耭 耿 肌 肝 股 肩 肯 肱 胛 胱 脚 脛 腔 腱 膈 膏 膠 臘 臼 舅 舊 舡 艮 艱 芎 芥 芩 芹 苛 苟 苦 苽 茄 莖 菅 菊 菌 菓 菫 菰 落 葛 葵 蓋 蕎 蕨 薑 藁 藍 藿 蘭 蘿 虔 蚣 蛟 蝎 螺 蠟 蠱 街 衢 衲 衾 衿 袈 袞 袴 裙 裸 褐 襁 襟 襤 見 規 覡 覲 覺 觀 角 計 記 訣 訶 詭 誇 誡 誥 課 諫 諾 謙 講 謳 謹 譏 警 譴 谷 谿 豈 貢 貫 貴 賈 購 赳 起 跏 距 跨 踞 蹇 蹶 躬 軀 車 軌 軍 軻 較 輕 轎 轟 辜 近 迦 迲 适 逑 逕 逵 過 遣 遽 邏 那 邯 邱 郊 郎 郡 郭 酪 醵 金 鈐 鈞 鉀 鉅 鉗 鉤 銶 鋸 鋼 錡 錤 錦 錮 鍋 鍵 鎌 鎧 鏡 鑑 鑒 鑛 開 間 閘 閣 閨 闕 關 降 階 隔 隙 雇 難 鞏 鞠 鞨 鞫 頃 頸 顆 顧 飢 餃 館 饉 饋 饑 駒 駕 駱 騎 騏 騫 驅 驕 驚 驥 骨 高 鬼 魁 鮫 鯤 鯨 鱇 鳩 鵑 鵠 鷄 鷗 鸞 麒 麴 黔 鼓 龕 龜] +exemplarCharacters = [가-힣] +index = [ㄱ ㄴ ㄷ ㄹ ㅁ ㅂ ㅅ ㅇ ㅈ ㅊ ㅋ ㅌ ㅍ ㅎ] +punctuation = [‾ _ _ \\- - ‐ — ― 〜 ・ , , 、 ; ; \\: : ! ! ¡ ? ? ¿ . . ‥ … 。 · ' ‘ ’ \" " “ ” ( ( ) ) \\[ [ \\] ] \\{ { \\} } 〈 〉 《 》 「 」 『 』 【 】 〔 〕 § ¶ @ @ * * / / \\\\ \ \\& & # # % % ‰ † ‡ ′ ″ 〃 ※] + +[numbers] +defaultNumberingSystem = latn +digits.native = 〇一二三四五六七八九 +minimumGroupingDigits = 1 +decimal = . +exponential = E +group = , +infinity = ∞ +list = ; +minusSign = - +nan = NaN +perMille = ‰ +percentSign = % +plusSign = + +superscriptingExponent = × + +[counters] +consonant = ㄱ ㄴ ㄷ ㄹ ㅁ ㅂ ㅅ ㅇ ㅈ ㅊ ㅋ ㅌ ㅍ ㅎ +syllabe = 가 나 다 라 마 바 사 아 자 차 카 타 파 하 +hanja.informal.F.0 = 零 +hanja.informal.1 = 一 二 三 四 五 六 七 八 九 +hanja.informal.2 = 十 二十 三十 四十 五十 六十 七十 八十 九十 +hanja.informal.3 = 百 二百 三百 四百 五百 六百 七百 八百 九百 +hanja.informal.4 = 千 二千 三千 四千 五千 六千 七千 八千 九千 +hanja.formal.F.0 = 零 +hanja.formal.1 = 壹 貳 參 四 五 六 七 八 九 +hanja.formal.2 = 壹拾 貳拾 參拾 四拾 五拾 六拾 七拾 八拾 九拾 +hanja.formal.3 = 壹百 貳百 參百 四百 五百 六百 七百 八百 九百 +hanja.formal.4 = 壹仟 貳仟 參仟 四仟 五仟 六仟 七仟 八仟 九仟 +hangul.formal.F.0 = 영 +hangul.formal.1 = 일 이 삼 사 오 육 칠 팔 구 +hangul.formal.2 = 일십 이십 삼십 사십 오십 육십 칠십 팔십 구십 +hangul.formal.3 = 일백 이백 삼백 사백 오백 육백 칠백 팔백 구백 +hangul.formal.4 = 일천 이천 삼천 사천 오천 육천 칠천 팔천 구천 +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 +fullwidth.upper.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/locale/ko/babel-ko.ini b/Master/texmf-dist/tex/generic/babel/locale/ko/babel-ko.ini index 88a619ab524..425073acf50 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.6 -date = 2020-06-30 +version = 1.7 +date = 2020-07-10 name.local = 한국어 name.english = Korean name.babel = korean @@ -30,27 +30,34 @@ encodings = derivate = no [captions] -preface = -ref = -abstract = -bib = -chapter = -appendix = -contents = -listfigure = -listtable = -index = -figure = -table = -part = -encl = -cc = -headto = -page = -see = +; names based on kotex +preface = 서문 +ref = 참고 문헌 +abstract = 요 약 +bib = 참고 문헌 +prechapter = 제 +postchapter = 장 +appendix = 부록 +contents = 차 례 +listfigure = 그림 차례 +listtable = 표 차례 +index = 찾아보기 +figure = 그림 +table = 표 +prepart = 제 +postpart = 편 +encl = 동봉물 +cc = 사본 +headto = 받는이 +page = 페이지 +; see = \을~참고 +see = +; also = \을~함께~참고 also = -proof = -glossary = +proof = 증명 +glossary = 용어집 +presection = 제 +postsection = 절 [captions.licr] preface = @@ -76,32 +83,32 @@ proof = glossary = [date.gregorian] -date.long = [y]년 [M]월 [d]일 +date.long = [y|digits]年 [m|hanja.informal]月 [d|hanja.informal]日 date.short = [yy]. [M]. [d]. -months.wide.1 = 1월 -months.wide.2 = 2월 -months.wide.3 = 3월 -months.wide.4 = 4월 -months.wide.5 = 5월 -months.wide.6 = 6월 -months.wide.7 = 7월 -months.wide.8 = 8월 -months.wide.9 = 9월 -months.wide.10 = 10월 -months.wide.11 = 11월 -months.wide.12 = 12월 -months.narrow.1 = 1월 -months.narrow.2 = 2월 -months.narrow.3 = 3월 -months.narrow.4 = 4월 -months.narrow.5 = 5월 -months.narrow.6 = 6월 -months.narrow.7 = 7월 -months.narrow.8 = 8월 -months.narrow.9 = 9월 -months.narrow.10 = 10월 -months.narrow.11 = 11월 -months.narrow.12 = 12월 +months.wide.1 = 1月 +months.wide.2 = 2月 +months.wide.3 = 3月 +months.wide.4 = 4月 +months.wide.5 = 5月 +months.wide.6 = 6月 +months.wide.7 = 7月 +months.wide.8 = 8月 +months.wide.9 = 9月 +months.wide.10 = 10月 +months.wide.11 = 11月 +months.wide.12 = 12月 +months.narrow.1 = 1月 +months.narrow.2 = 2月 +months.narrow.3 = 3月 +months.narrow.4 = 4月 +months.narrow.5 = 5月 +months.narrow.6 = 6月 +months.narrow.7 = 7月 +months.narrow.8 = 8月 +months.narrow.9 = 9月 +months.narrow.10 = 10月 +months.narrow.11 = 11月 +months.narrow.12 = 12月 days.wide.mon = 월요일 days.wide.tue = 화요일 days.wide.wed = 수요일 @@ -158,6 +165,7 @@ punctuation = [‾ _ _ \\- - ‐ — ― 〜 ・ , , 、 ; ; \\: : ! [numbers] defaultNumberingSystem = latn +digits.native = 〇一二三四五六七八九 minimumGroupingDigits = 1 decimal = . exponential = E diff --git a/Master/texmf-dist/tex/generic/babel/locale/ko/babel-korean-han.tex b/Master/texmf-dist/tex/generic/babel/locale/ko/babel-korean-han.tex new file mode 100644 index 00000000000..3f201337e99 --- /dev/null +++ b/Master/texmf-dist/tex/generic/babel/locale/ko/babel-korean-han.tex @@ -0,0 +1,12 @@ +% This file is part of babel. For further details see: +% https://www.ctan.org/pkg/babel +\ifx\BabelBeforeIni\undefined + \PackageError{babel}% + {This file is a component of babel and cannot\MessageBreak + be loaded directly. I'll stop immediately}% + {Just use babel as documented.}% + \stop +\fi +\BabelBeforeIni{ko-Hani}{% +} +\endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/generic/babel/locale/ko/babel-korean-hani.tex b/Master/texmf-dist/tex/generic/babel/locale/ko/babel-korean-hani.tex new file mode 100644 index 00000000000..3f201337e99 --- /dev/null +++ b/Master/texmf-dist/tex/generic/babel/locale/ko/babel-korean-hani.tex @@ -0,0 +1,12 @@ +% This file is part of babel. For further details see: +% https://www.ctan.org/pkg/babel +\ifx\BabelBeforeIni\undefined + \PackageError{babel}% + {This file is a component of babel and cannot\MessageBreak + be loaded directly. I'll stop immediately}% + {Just use babel as documented.}% + \stop +\fi +\BabelBeforeIni{ko-Hani}{% +} +\endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf index 9900f90accc..0f9709a66bb 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/07 3.46 Nil language] +\ProvidesLanguage{nil}[2020/07/13 3.47 Nil language] \LdfInit{nil}{datenil} \ifx\l@nil\@undefined \newlanguage\l@nil -- cgit v1.2.3