diff options
author | Karl Berry <karl@freefriends.org> | 2024-05-18 20:14:56 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-05-18 20:14:56 +0000 |
commit | ff5e46c1e269323b708a65a702fa314f3bf8b45e (patch) | |
tree | 018529c29aa96cbef33ec04184938b3a569d761b /Master/texmf-dist | |
parent | e9b8746cc30f4af2b1ba44c228ae21d00fee091a (diff) |
babel (18may24)
git-svn-id: svn://tug.org/texlive/trunk@71296 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/babel/README.md | 20 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/babel/babel-code.pdf | bin | 647068 -> 647398 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/babel/babel.pdf | bin | 423110 -> 423656 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/babel/babel.dtx | 74 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/babel/babel.ins | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/babel/bbcompat.dtx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/babel/locale.zip | bin | 1088249 -> 1088254 bytes | |||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/babel.def | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/babel.sty | 12 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/hyphen.cfg | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-DZ.ini | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-MA.ini | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-TN.ini | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/luababel.def | 20 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/nil.ldf | 2 |
15 files changed, 90 insertions, 78 deletions
diff --git a/Master/texmf-dist/doc/latex/babel/README.md b/Master/texmf-dist/doc/latex/babel/README.md index 07a872c4ab4..3247ec987fa 100644 --- a/Master/texmf-dist/doc/latex/babel/README.md +++ b/Master/texmf-dist/doc/latex/babel/README.md @@ -1,6 +1,6 @@ -## Babel 24.4 +## Babel 24.5 -2024-04-20 +2024-05-18 `babel` is the multilingual framework for localizing documents in LaTeX, LuaLaTeX, XeLaTeX. It manages culturally-determined @@ -10,9 +10,9 @@ languages even work with Plain formats. The latest stable version is available on <https://ctan.org/pkg/babel>. -Changes in version 24.4 are described in: +Changes in version 24.5 are described in: -https://latex3.github.io/babel/news/whats-new-in-babel-24.4.html +https://latex3.github.io/babel/news/whats-new-in-babel-24.5.html Apart from the manual, you can find information on some aspects of babel at: @@ -48,10 +48,14 @@ respective authors. ### Summary of latest changes ``` -24.4 2024-04-20 - * New ‘interchar’ declarations for Cantonese, Chinese, Japanese and - Korean: linebreak.basic (xe). - * Fixed Tibetan line breaking with closing punctuation (lua). +24.5 2024-05-18 + * Change the first item in `abjad` and `maghrebi.abjad` counters + in `ar-DZ`, `ar-MA` and `ar-TN`), from ا to أ. Suggested by + @seloumi. + * Fixed an error when a locale is loaded on the fly and there are empty + captions in another language (#294) + * Fix in transforms (lua): negative values in `space` and `spacefactor` + raised and error. ``` ### Previous changes diff --git a/Master/texmf-dist/doc/latex/babel/babel-code.pdf b/Master/texmf-dist/doc/latex/babel/babel-code.pdf Binary files differindex b157d32efd3..fc188152cf6 100644 --- a/Master/texmf-dist/doc/latex/babel/babel-code.pdf +++ b/Master/texmf-dist/doc/latex/babel/babel-code.pdf diff --git a/Master/texmf-dist/doc/latex/babel/babel.pdf b/Master/texmf-dist/doc/latex/babel/babel.pdf Binary files differindex 55df378a612..b541f0bf05c 100644 --- a/Master/texmf-dist/doc/latex/babel/babel.pdf +++ b/Master/texmf-dist/doc/latex/babel/babel.pdf diff --git a/Master/texmf-dist/source/latex/babel/babel.dtx b/Master/texmf-dist/source/latex/babel/babel.dtx index 256ec0384cc..6a129d2c32b 100644 --- a/Master/texmf-dist/source/latex/babel/babel.dtx +++ b/Master/texmf-dist/source/latex/babel/babel.dtx @@ -32,7 +32,7 @@ % % \iffalse %<*filedriver> -\ProvidesFile{babel.dtx}[2024/04/20 v24.4 The Babel package] +\ProvidesFile{babel.dtx}[2024/05/18 v24.5 The Babel package] \documentclass{ltxdoc} \GetFileInfo{babel.dtx} \usepackage{fontspec} @@ -2567,11 +2567,11 @@ languages above. So, the previous example is best written as: \babelprovide[_import_]{hungarian} \end{verbatim} -There are about 250 |ini| files, with data taken from the |ldf| files -and the CLDR provided by Unicode. Not all languages in the latter are -complete, and therefore neither are the |ini| files. A few languages -may show a warning about the current lack of suitability of some -features. +There are 380 |ini| files for about 300 languages, with data taken from +the |ldf| files and the CLDR provided by Unicode. Not all languages in +the latter are complete, and therefore neither are the |ini| files. A +few languages may show a warning about the current lack of suitability +of some features. Besides |\today|, this option defines an additional command for dates: |\<language>date|, which takes three arguments, namely, year, month and @@ -3892,22 +3892,26 @@ There are some package options controlling bidi writing. $\string|$ \texttt{basic-r} $\string|$ \texttt{bidi-l} $\string|$ \texttt{bidi-r}} -\New{3.14} Selects the bidi algorithm to be used. With |default| the -bidi mechanism is just activated (by default it is not), but every -change must be marked up. In \xetex{} and \pdftex{} this is the only -option. +\New{3.14} Selects the bidi algorithm to be used. -In \luatex, |basic-r| provides a simple and fast method for R text, -which handles numbers and unmarked L text within an R context many in -typical cases. \New{3.19} Finally, |basic| supports both L and R text, -and it is the preferred method (support for |basic-r| is currently -limited). (They are named \texttt{basic} mainly because they only -consider the intrinsic direction of scripts and weak directionality.) +With |default| the bidi mechanism is just activated (by default it is +not), but every change must be marked up. In \pdftex{} this is the only +option. If the RL text only consists of letters and punctuation, it +will be fine in most cases, but numbers, for example, will be rendered +in the wrong order. -\New{3.29} In \xetex, |bidi-r| and |bidi-l| resort to the package -\textsf{bidi} (by Vafa Khalighi). Integration is still somewhat -tentative, but it mostly works. For RL documents use the former, and -for LR ones use the latter. +In \luatex, the preferred method is |basic|, which supports both L and +R text. |basic-r| was a first attempt to create a bidi algorith and +provides a simple and fast method for R text in some typical cases. +(They are named \texttt{basic} mainly because they only consider the +intrinsic direction of scripts and weak directionality.) + +In \xetex, |bidi-r| and |bidi-l| resort to the package \textsf{bidi} +(by Vafa Khalighi). For RL documents use the former, and for LR ones +use the latter. However, this package patches heavily lots of macros +and packages even if the RL script is not the main one, which can lead +to some surprising results, so for short and simple texts (letters and +punctuation) the |default| method can be preferable. There are samples on GitHub, under \texttt{/required/babel/samples}. See particularly |lua-bidibasic.tex| and |lua-secenum.tex|. @@ -5475,8 +5479,8 @@ wouldn’t exist. % \section{Tools} % % \begin{macrocode} -%<<version=24.4>> -%<<date=2024/04/20>> +%<<version=24.5>> +%<<date=2024/05/18>> % \end{macrocode} % % \textbf{Do not use the following macros in \texttt{ldf} files. They @@ -10354,15 +10358,15 @@ wouldn’t exist. \@namedef{extras#1}{}% \@namedef{noextras#1}{}% \bbl@startcommands*{#1}{captions}% - \ifx\bbl@KVP@captions\@nnil % and also if import, implicit + \ifx\bbl@KVP@captions\@nnil % and also if import, implicit \def\bbl@tempb##1{% elt for \bbl@captionslist - \ifx##1\@empty\else + \ifx##1\@nnil\else \bbl@exp{% \\\SetString\\##1{% \\\bbl@nocaption{\bbl@stripslash##1}{#1\bbl@stripslash##1}}}% \expandafter\bbl@tempb \fi}% - \expandafter\bbl@tempb\bbl@captionslist\@empty + \expandafter\bbl@tempb\bbl@captionslist\@nnil \else \ifx\bbl@initoload\relax \bbl@read@ini{\bbl@KVP@captions}2% % Here letters cat = 11 @@ -14592,10 +14596,10 @@ end }} \begingroup \catcode`\%=12 -\catcode`\^=14 +\catcode`\&=14 \catcode`\'=12 \catcode`\~=12 -\gdef\bbl@seaintraspace{^ +\gdef\bbl@seaintraspace{& \let\bbl@seaintraspace\relax \directlua{ Babel = Babel or {} @@ -14611,7 +14615,7 @@ end function Babel.sea_disc_to_space (head) local sea_ranges = Babel.sea_ranges local last_char = nil - local quad = 655360 ^% 10 pt = 655360 = 10 * 65536 + local quad = 655360 &% 10 pt = 655360 = 10 * 65536 for item in node.traverse(head) do local i = item.id if i == node.id'glyph' then @@ -14621,16 +14625,16 @@ end quad = font.getfont(last_char.font).size for lg, rg in pairs(sea_ranges) do if last_char.char > rg[1] and last_char.char < rg[2] then - lg = lg:sub(1, 4) ^% Remove trailing number of, eg, Cyrl1 + lg = lg:sub(1, 4) &% Remove trailing number of, eg, Cyrl1 local intraspace = Babel.intraspaces[lg] local intrapenalty = Babel.intrapenalties[lg] local n if intrapenalty ~= 0 then - n = node.new(14, 0) ^% penalty + n = node.new(14, 0) &% penalty n.penalty = intrapenalty node.insert_before(head, item, n) end - n = node.new(12, 13) ^% (glue, spaceskip) + n = node.new(12, 13) &% (glue, spaceskip) node.setglue(n, intraspace.b * quad, intraspace.p * quad, intraspace.m * quad) @@ -14641,7 +14645,7 @@ end end end end - }^^ + }& \bbl@luahyphenate} % \end{macrocode} % @@ -15321,9 +15325,11 @@ end rep = rep:gsub('^%s*(insert)%s*,', 'insert = true, ') rep = rep:gsub('(string)%s*=%s*([^%s,]*)', Babel.capture_func) if #1 == 0 or #1 == 2 then - rep = rep:gsub('(space)%s*=%s*([%d%.]+)%s+([%d%.]+)%s+([%d%.]+)', + rep = rep:gsub(&% + '(space)%s*=%s*([%-%d%.]+)%s+([%-%d%.]+)%s+([%-%d%.]+)', 'space = {' .. '%2, %3, %4' .. '}') - rep = rep:gsub('(spacefactor)%s*=%s*([%d%.]+)%s+([%d%.]+)%s+([%d%.]+)', + rep = rep:gsub(&% + '(spacefactor)%s*=%s*([%-%d%.]+)%s+([%-%d%.]+)%s+([%-%d%.]+)', 'spacefactor = {' .. '%2, %3, %4' .. '}') rep = rep:gsub('(kashida)%s*=%s*([^%s,]*)', Babel.capture_kashida) else diff --git a/Master/texmf-dist/source/latex/babel/babel.ins b/Master/texmf-dist/source/latex/babel/babel.ins index 4bd22c8667b..d70ae40c626 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{2024/04/20} +\def\filedate{2024/05/18} \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 f36bd4b7050..00e5a6b8b57 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}[2024/04/20 v24.4] +\ProvidesFile{bbcompat.dtx}[2024/05/18 v24.5] %</dtx> % %% File 'bbcompat.dtx' diff --git a/Master/texmf-dist/source/latex/babel/locale.zip b/Master/texmf-dist/source/latex/babel/locale.zip Binary files differindex 9c28655c29f..094a3df50be 100644 --- a/Master/texmf-dist/source/latex/babel/locale.zip +++ b/Master/texmf-dist/source/latex/babel/locale.zip diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def index af17a4db0ee..a6abaeded14 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.def +++ b/Master/texmf-dist/tex/generic/babel/babel.def @@ -40,7 +40,7 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{babel.def}[2024/04/20 v24.4 Babel common definitions] +\ProvidesFile{babel.def}[2024/05/18 v24.5 Babel common definitions] \ifx\AtBeginDocument\@undefined % TODO. change test. \def\@empty{} \def\loadlocalcfg#1{% @@ -596,8 +596,8 @@ \toks@\expandafter{\bbl@tempc#3}% \expandafter\edef\csname extras\languagename\endcsname{\the\toks@}% \fi} -\def\bbl@version{24.4} -\def\bbl@date{2024/04/20} +\def\bbl@version{24.5} +\def\bbl@date{2024/05/18} \ifx\language\@undefined \csname newcount\endcsname\language \fi diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty index 9e75ee48de2..18ccb3675bd 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.sty +++ b/Master/texmf-dist/tex/generic/babel/babel.sty @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] -\ProvidesPackage{babel}[2024/04/20 v24.4 The Babel package] +\ProvidesPackage{babel}[2024/05/18 v24.5 The Babel package] \@ifpackagewith{babel}{debug} {\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}% \let\bbl@debug\@firstofone @@ -466,8 +466,8 @@ \expandafter\@secondoftwo \fi} \fi -\def\bbl@version{24.4} -\def\bbl@date{2024/04/20} +\def\bbl@version{24.5} +\def\bbl@date{2024/05/18} \ifx\language\@undefined \csname newcount\endcsname\language \fi @@ -2613,15 +2613,15 @@ \@namedef{extras#1}{}% \@namedef{noextras#1}{}% \bbl@startcommands*{#1}{captions}% - \ifx\bbl@KVP@captions\@nnil % and also if import, implicit + \ifx\bbl@KVP@captions\@nnil % and also if import, implicit \def\bbl@tempb##1{% elt for \bbl@captionslist - \ifx##1\@empty\else + \ifx##1\@nnil\else \bbl@exp{% \\\SetString\\##1{% \\\bbl@nocaption{\bbl@stripslash##1}{#1\bbl@stripslash##1}}}% \expandafter\bbl@tempb \fi}% - \expandafter\bbl@tempb\bbl@captionslist\@empty + \expandafter\bbl@tempb\bbl@captionslist\@nnil \else \ifx\bbl@initoload\relax \bbl@read@ini{\bbl@KVP@captions}2% % Here letters cat = 11 diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg index 690a0deb2d7..01719325f44 100644 --- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg +++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg @@ -38,10 +38,10 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{hyphen.cfg}[2024/04/20 v24.4 Babel hyphens] +\ProvidesFile{hyphen.cfg}[2024/05/18 v24.5 Babel hyphens] \xdef\bbl@format{\jobname} -\def\bbl@version{24.4} -\def\bbl@date{2024/04/20} +\def\bbl@version{24.5} +\def\bbl@date{2024/05/18} \ifx\AtBeginDocument\@undefined \def\@empty{} \fi diff --git a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-DZ.ini b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-DZ.ini index 95541fd0d87..39985522385 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-DZ.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-DZ.ini @@ -9,8 +9,8 @@ [identification] charset = utf8 -version = 1.12 -date = 2022-12-08 +version = 1.13 +date = 2024-05-16 name.local = العربية name.english = Arabic name.babel = arabic-algeria arabic-dz @@ -173,8 +173,8 @@ plusSign = + superscriptingExponent = × [counters] -abjad = ا ب ج د ه و ز ح ط ي ك ل م ن س ع ف ص ق ر ش ت ث خ ذ ض ظ غ -maghrebi.abjad = ا ب ج د ه و ز ح ط ي ك ل م ن ص ع ف ض ق ر س ت ث خ ذ ظ غ ش +abjad = أ ب ج د ه و ز ح ط ي ك ل م ن س ع ف ص ق ر ش ت ث خ ذ ض ظ غ +maghrebi.abjad = أ ب ج د ه و ز ح ط ي ك ل م ن ص ع ف ض ق ر س ت ث خ ذ ظ غ ش [transforms.prehyphenation] kashida.plain.1.0 = { ()[يئهشسقفغعضصنمكلظطخحجثتب]()[ًٍَُِّ]*[يئهشسقفغعضصنمكلظطخحجثتباأإآوؤذدزرة] } diff --git a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-MA.ini b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-MA.ini index dd03dd797c9..0813b15d188 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-MA.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-MA.ini @@ -9,8 +9,8 @@ [identification] charset = utf8 -version = 1.12 -date = 2022-12-08 +version = 1.13 +date = 2024-05-16 name.local = العربية name.english = Arabic name.babel = arabic-morocco arabic-ma @@ -173,8 +173,8 @@ plusSign = + superscriptingExponent = × [counters] -abjad = ا ب ج د ه و ز ح ط ي ك ل م ن س ع ف ص ق ر ش ت ث خ ذ ض ظ غ -maghrebi.abjad = ا ب ج د ه و ز ح ط ي ك ل م ن ص ع ف ض ق ر س ت ث خ ذ ظ غ ش +abjad = أ ب ج د ه و ز ح ط ي ك ل م ن س ع ف ص ق ر ش ت ث خ ذ ض ظ غ +maghrebi.abjad = أ ب ج د ه و ز ح ط ي ك ل م ن ص ع ف ض ق ر س ت ث خ ذ ظ غ ش [transforms.prehyphenation] kashida.plain.1.0 = { ()[يئهشسقفغعضصنمكلظطخحجثتب]()[ًٍَُِّ]*[يئهشسقفغعضصنمكلظطخحجثتباأإآوؤذدزرة] } diff --git a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-TN.ini b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-TN.ini index 1a7d1a538dd..5e268ba82a9 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-TN.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar-TN.ini @@ -9,8 +9,8 @@ [identification] charset = utf8 -version = 1.1 -date = 2022-12-08 +version = 1.2 +date = 2024-05-16 name.local = العربية name.english = Arabic name.babel = arabic-tunisia arabic-tn @@ -173,8 +173,8 @@ plusSign = + superscriptingExponent = × [counters] -abjad = ا ب ج د ه و ز ح ط ي ك ل م ن س ع ف ص ق ر ش ت ث خ ذ ض ظ غ -maghrebi.abjad = ا ب ج د ه و ز ح ط ي ك ل م ن ص ع ف ض ق ر س ت ث خ ذ ظ غ ش +abjad = أ ب ج د ه و ز ح ط ي ك ل م ن س ع ف ص ق ر ش ت ث خ ذ ض ظ غ +maghrebi.abjad = أ ب ج د ه و ز ح ط ي ك ل م ن ص ع ف ض ق ر س ت ث خ ذ ظ غ ش [transforms.prehyphenation] kashida.plain.1.0 = { ()[يئهشسقفغعضصنمكلظطخحجثتب]()[ًٍَُِّ]*[يئهشسقفغعضصنمكلظطخحجثتباأإآوؤذدزرة] } diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def index 4575df0f80a..2173499d17f 100644 --- a/Master/texmf-dist/tex/generic/babel/luababel.def +++ b/Master/texmf-dist/tex/generic/babel/luababel.def @@ -411,10 +411,10 @@ end }} \begingroup \catcode`\%=12 -\catcode`\^=14 +\catcode`\&=14 \catcode`\'=12 \catcode`\~=12 -\gdef\bbl@seaintraspace{^ +\gdef\bbl@seaintraspace{& \let\bbl@seaintraspace\relax \directlua{ Babel = Babel or {} @@ -430,7 +430,7 @@ end function Babel.sea_disc_to_space (head) local sea_ranges = Babel.sea_ranges local last_char = nil - local quad = 655360 ^% 10 pt = 655360 = 10 * 65536 + local quad = 655360 &% 10 pt = 655360 = 10 * 65536 for item in node.traverse(head) do local i = item.id if i == node.id'glyph' then @@ -440,16 +440,16 @@ end quad = font.getfont(last_char.font).size for lg, rg in pairs(sea_ranges) do if last_char.char > rg[1] and last_char.char < rg[2] then - lg = lg:sub(1, 4) ^% Remove trailing number of, eg, Cyrl1 + lg = lg:sub(1, 4) &% Remove trailing number of, eg, Cyrl1 local intraspace = Babel.intraspaces[lg] local intrapenalty = Babel.intrapenalties[lg] local n if intrapenalty ~= 0 then - n = node.new(14, 0) ^% penalty + n = node.new(14, 0) &% penalty n.penalty = intrapenalty node.insert_before(head, item, n) end - n = node.new(12, 13) ^% (glue, spaceskip) + n = node.new(12, 13) &% (glue, spaceskip) node.setglue(n, intraspace.b * quad, intraspace.p * quad, intraspace.m * quad) @@ -460,7 +460,7 @@ end end end end - }^^ + }& \bbl@luahyphenate} \catcode`\%=14 \gdef\bbl@cjkintraspace{% @@ -1222,9 +1222,11 @@ end rep = rep:gsub('^%s*(insert)%s*,', 'insert = true, ') rep = rep:gsub('(string)%s*=%s*([^%s,]*)', Babel.capture_func) if #1 == 0 or #1 == 2 then - rep = rep:gsub('(space)%s*=%s*([%d%.]+)%s+([%d%.]+)%s+([%d%.]+)', + rep = rep:gsub(&% + '(space)%s*=%s*([%-%d%.]+)%s+([%-%d%.]+)%s+([%-%d%.]+)', 'space = {' .. '%2, %3, %4' .. '}') - rep = rep:gsub('(spacefactor)%s*=%s*([%d%.]+)%s+([%d%.]+)%s+([%d%.]+)', + rep = rep:gsub(&% + '(spacefactor)%s*=%s*([%-%d%.]+)%s+([%-%d%.]+)%s+([%-%d%.]+)', 'spacefactor = {' .. '%2, %3, %4' .. '}') rep = rep:gsub('(kashida)%s*=%s*([^%s,]*)', Babel.capture_kashida) else diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf index 94709c5e575..3e4916af39a 100644 --- a/Master/texmf-dist/tex/generic/babel/nil.ldf +++ b/Master/texmf-dist/tex/generic/babel/nil.ldf @@ -33,7 +33,7 @@ %% extension |.ins|) which are part of the distribution. %% -\ProvidesLanguage{nil}[2024/04/20 v24.4 Nil language] +\ProvidesLanguage{nil}[2024/05/18 v24.5 Nil language] \LdfInit{nil}{datenil} \ifx\l@nil\@undefined \newlanguage\l@nil |