diff options
Diffstat (limited to 'Master/texmf-dist/tex')
10 files changed, 316 insertions, 110 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/babel-data-cjk.lua b/Master/texmf-dist/tex/generic/babel/babel-data-cjk.lua index a444e647d4d..26f6dc39632 100644 --- a/Master/texmf-dist/tex/generic/babel/babel-data-cjk.lua +++ b/Master/texmf-dist/tex/generic/babel/babel-data-cjk.lua @@ -36,8 +36,10 @@ Babel = Babel or {} Babel.cjk_characters = { [0x0021]={c='ex'}, + [0x0022]={c='qu'}, [0x0024]={c='pr'}, [0x0025]={c='po'}, + [0x0027]={c='qu'}, [0x0028]={c='op'}, [0x0029]={c='cp'}, [0x002B]={c='pr'}, @@ -58,10 +60,18 @@ Babel.cjk_characters = { [0x00A3]={c='pr'}, [0x00A4]={c='pr'}, [0x00A5]={c='pr'}, + [0x00AB]={c='qu'}, [0x00B0]={c='po'}, [0x00B1]={c='pr'}, + [0x00BB]={c='qu'}, + [0x2018]={c='qu'}, + [0x2019]={c='qu'}, [0x201A]={c='op'}, + [0x201B]={c='qu'}, + [0x201C]={c='qu'}, + [0x201D]={c='qu'}, [0x201E]={c='op'}, + [0x201F]={c='qu'}, [0x2024]={c='in'}, [0x2025]={c='in'}, [0x2026]={c='in'}, @@ -73,6 +83,8 @@ Babel.cjk_characters = { [0x2035]={c='po'}, [0x2036]={c='po'}, [0x2037]={c='po'}, + [0x2039]={c='qu'}, + [0x203A]={c='qu'}, [0x203C]={c='ns'}, [0x203D]={c='ns'}, [0x2044]={c='is'}, @@ -131,7 +143,23 @@ Babel.cjk_characters = { [0x29FD]={c='cl'}, [0x2CF9]={c='ex'}, [0x2CFE]={c='ex'}, + [0x2E02]={c='qu'}, + [0x2E03]={c='qu'}, + [0x2E04]={c='qu'}, + [0x2E05]={c='qu'}, + [0x2E06]={c='qu'}, + [0x2E07]={c='qu'}, + [0x2E08]={c='qu'}, + [0x2E09]={c='qu'}, + [0x2E0A]={c='qu'}, + [0x2E0B]={c='qu'}, + [0x2E0C]={c='qu'}, + [0x2E0D]={c='qu'}, [0x2E18]={c='op'}, + [0x2E1C]={c='qu'}, + [0x2E1D]={c='qu'}, + [0x2E20]={c='qu'}, + [0x2E21]={c='qu'}, [0x2E22]={c='op'}, [0x2E23]={c='cl'}, [0x2E24]={c='op'}, @@ -284,6 +312,7 @@ Babel.cjk_breaks = { ['po'] = { ['op']=1, ['pr']=1, ['po']=1, ['in']=1, ['I']=1 }, ['in'] = { ['op']=1, ['pr']=1, ['po']=1, ['I']=1 }, ['hy'] = { ['op']=1, ['pr']=1, ['po']=1, ['in']=1, ['I']=1 }, + ['qu'] = { }, -- ['I'] = { ['op']=1, ['pr']=1, ['I']=1, ['O']=1 }, ['O'] = { ['I']=1 } diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def index 44121348c6e..04fa196156e 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}[2021/04/26 3.58 Babel common definitions] +\ProvidesFile{babel.def}[2021/05/16 3.59 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.58} -\def\bbl@date{2021/04/26} +\def\bbl@version{3.59} +\def\bbl@date{2021/05/16} \def\adddialect#1#2{% \global\chardef#1#2\relax \bbl@usehooks{adddialect}{{#1}{#2}}% @@ -694,9 +694,13 @@ \else \edef\bbl@tempa{\bbl@cl{lnbrk}}% \fi + % linebreaking - handle u, e, k (v in the future) \bbl@xin@{/u}{/\bbl@tempa}% + \ifin@\else\bbl@xin@{/e}{/\bbl@tempa}\fi % elongated forms + \ifin@\else\bbl@xin@{/k}{/\bbl@tempa}\fi % only kashida + \ifin@\else\bbl@xin@{/v}{/\bbl@tempa}\fi % variable font \ifin@ - % 'unhyphenated' = allow stretching + % unhyphenated/kashida/elongated = allow stretching \language\l@unhyphenated \babel@savevariable\emergencystretch \emergencystretch\maxdimen @@ -1483,7 +1487,7 @@ \def\babel@texpdf#1#2#3#4{% \ifx\texorpdfstring\@undefined - \textormath{#1}{#2}% + \textormath{#1}{#3}% \else \texorpdfstring{\textormath{#1}{#3}}{#2}% % \texorpdfstring{\textormath{#1}{#3}}{\textormath{#2}{#4}}% @@ -2357,6 +2361,7 @@ \let\bbl@KVP@language\@nil \let\bbl@KVP@hyphenrules\@nil \let\bbl@KVP@linebreaking\@nil + \let\bbl@KVP@justification\@nil \let\bbl@KVP@mapfont\@nil \let\bbl@KVP@maparabic\@nil \let\bbl@KVP@mapdigits\@nil @@ -2537,6 +2542,20 @@ \bbl@csarg\edef{intsp@#2}{\bbl@KVP@intraspace}% \fi \bbl@provide@intraspace + % + \ifx\bbl@KVP@justification\@nil\else + \let\bbl@KVP@linebreaking\bbl@KVP@justification + \fi + \ifx\bbl@KVP@linebreaking\@nil\else + \bbl@xin@{,\bbl@KVP@linebreaking,}{,elongated,kashida,cjk,unhyphenated,}% + \ifin@ + \bbl@csarg\xdef + {lnbrk@\languagename}{\expandafter\@car\bbl@KVP@linebreaking\@nil}% + \fi + \fi + \bbl@xin@{/e}{/\bbl@cl{lnbrk}}% + \ifin@\else\bbl@xin@{/k}{/\bbl@cl{lnbrk}}\fi + \ifin@\bbl@arabicjust\fi % == Line breaking: hyphenate.other.locale/.script== \ifx\bbl@lbkflag\@empty \bbl@ifunset{bbl@hyotl@\languagename}{}% @@ -3478,6 +3497,10 @@ \bbl@adjust@lua{linebreak}{cjk_enabled=true}} \@namedef{bbl@ADJ@linebreak.cjk@off}{% \bbl@adjust@lua{linebreak}{cjk_enabled=false}} +\@namedef{bbl@ADJ@justify.arabic@on}{% + \bbl@adjust@lua{linebreak}{arabic.justify_enabled=true}} +\@namedef{bbl@ADJ@justify.arabic@off}{% + \bbl@adjust@lua{linebreak}{arabic.justify_enabled=false}} \def\bbl@adjust@layout#1{% \ifvmode #1% diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty index 5dcf713e174..70e1c6651e6 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}[2021/04/26 3.58 The Babel package] +\ProvidesPackage{babel}[2021/05/16 3.59 The Babel package] \@ifpackagewith{babel}{debug} {\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}% \let\bbl@debug\@firstofone diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg index cfeb41401d3..6ff6f771f40 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}[2021/04/26 3.58 Babel hyphens] +\ProvidesFile{hyphen.cfg}[2021/05/16 3.59 Babel hyphens] \xdef\bbl@format{\jobname} -\def\bbl@version{3.58} -\def\bbl@date{2021/04/26} +\def\bbl@version{3.59} +\def\bbl@date{2021/05/16} \ifx\AtBeginDocument\@undefined \def\@empty{} \let\orig@dump\dump diff --git a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar.ini b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar.ini index ca0c4ff1005..b5ac99ccdaa 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-ar.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.9 -date = 2021-04-24 +version = 1.10 +date = 2021-05-16 name.local = العربية name.english = Arabic name.babel = arabic @@ -207,5 +207,10 @@ transliteration.dad.7.2 = { string = {1|AauiIbnf|آأؤإئٮںڡ} } ; 1-letter transliteration.dad.8.0 = { ([{007C}AbtjHxdrzsSDTZ`RfqklmnhUIYaui+opCvgJe]) } transliteration.dad.8.1 = { string = {1|{007C}AbtjHxdrzsSDTZ`RfqklmnhUIYaui+opCvgJe|ءابتجحخدرزسصضطظعغفقكلمنهوىيَُِّْپچڤگژۀ} } +; +kashida.plain.1.0 = { ()[يئهشسقفغعضصنمكلظطخحجثتب]()[يئهشسقفغعضصنمكلظطخحجثتباأإآوؤذدزرة] } +kashida.plain.1.1 = { kashida = 500 } +kashida.plain.2.0 = { ()ل()[اأإآ] } +kashida.plain.2.1 = { kashida = 0 } diff --git a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic.tex b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic.tex index fbad8834d4d..5207dfdbcd4 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic.tex +++ b/Master/texmf-dist/tex/generic/babel/locale/ar/babel-arabic.tex @@ -10,87 +10,4 @@ \BabelBeforeIni{ar}{% } -\ifcase\bbl@engine\or - -\directlua{ - -Babel.ar_tolong = {} - -function Babel.ar_justify(head) - local substlist = Babel.ar_tolong - local GLYPH = node.id'glyph' - local substs, width, goal - local subst_done = true % false - math.randomseed(1) - for line in node.traverse_id(node.id'hlist', head) do - if (line.glue_sign == 1 and line.glue_order == 0) then % exclude last line! - substs = {} % we store all “expandable” letters of each line - for n in node.traverse_id(GLYPH, line.head) do - if (substlist[n.char]) then - table.insert(substs, n) - end - end - line.glue_set = 0 % deactivate normal glue expansion - width = node.dimensions(line.head) % check the new width - goal = line.width - - while (width < goal and \string#substs > 0) do - x = math.random(\string#substs) % choose randomly a glyph - oldchar = substs[x].char - substs[x].char = substlist[substs[x].char] - subst_done = true - width = node.dimensions(line.head) % check if the line is too wide - % substitute back if the line would be too wide and break: - if width > goal then substs[x].char = oldchar break end - % if further substitutions have to be done, remove the just - % substituted node from the list: - table.remove(substs,x) - end - % Must take into account marks and ins, see luatex manual. - % Have to be executed only if there are changes. - if subst_done then - line.head = node.hpack(line.head, goal, 'exactly') - end - end - end - return head -end - -} - -\gdef\ArabicSetupJust{% - \directlua{ - Babel.ar_tolong = {} - luatexbase.add_to_callback('post_linebreak_filter', - Babel.ar_justify, 'Babel.ar_justify') - }% - % It must be done for each font, and stored separately. - % Locale must be taken into account too. Brute force. - % No rules at all, yet. The ideal: look at jalt table. - % And perhaps other tables (falt?, cswh?). What about kaf? - \begingroup - \bbl@foreach{% - 0628,0629,062A,062B,062C,062D,062E,062F,0630,0631,0632,0633,% - 0634,0635,0636,0637,0638,0639,063A,063B,063C,063D,063E,063F,% - 0640,0641,0642,0643,0644,0645,0646,0647,0649}{% - \setbox\z@\hbox{% Only final, for the moment - ^^^^200d\char"##1=% - \addfontfeature{RawFeature=+jalt}% - ^^^^200d\char"##1}% - \directlua{ - local chars = {} - for item in node.traverse(tex.box[0].head) do - if item.id == node.id'glyph' and item.char > 128 and - not (item.char == 0x200D) then - table.insert(chars, item.char) - end - end - if not (chars[1] == chars[2]) then - Babel.ar_tolong[chars[1]] = chars[2] - end - }}% - \endgroup} - -\fi - -\endinput
\ No newline at end of file +\endinput diff --git a/Master/texmf-dist/tex/generic/babel/locale/fa/babel-fa.ini b/Master/texmf-dist/tex/generic/babel/locale/fa/babel-fa.ini index a931a40e675..dcd28df14c9 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/fa/babel-fa.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/fa/babel-fa.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.7 -date = 2020-10-11 +version = 1.8 +date = 2021-05-16 name.local = فارسی name.english = Persian name.babel = persian @@ -177,3 +177,9 @@ superscriptingExponent = × abjad = ا ب ج د ه و ز ح ط ی ک ل م ن س ع ف ص ق ر ش ت ث خ ذ ض ظ غ alphabetic = ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن و ه ی +[transforms.prehyphenation] +kashida.plain.1.0 = { ()[يئهشسقفغعضصنمكلظطخحچجثتپب]()[يئهشسقفغعضصنمكلظطخحچجثتپباأإآوؤذدژزرة] } +kashida.plain.1.1 = { kashida = 500 } +kashida.plain.2.0 = { ()ل()[اأإآ] } +kashida.plain.2.1 = { kashida = 0 } + diff --git a/Master/texmf-dist/tex/generic/babel/locale/nb/babel-nb.ini b/Master/texmf-dist/tex/generic/babel/locale/nb/babel-nb.ini index 9e2f41bd4ba..80d16d27ba1 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/nb/babel-nb.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/nb/babel-nb.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.4 -date = 2021-04-24 +version = 1.5 +date = 2021-05-16 name.local = norsk bokmål name.english = Norwegian Bokmål name.babel = norsk norwegianbokmal @@ -186,8 +186,4 @@ superscriptingExponent = × [counters] -[transforms.posthyphenation] -doubleletter.hyphen.1.0 = {()([BDFGLMNPRSTbdfglmnprst])|(){1}} -doubleletter.hyphen.1.1 = { no = {1}, pre = {1}{1}- } -doubleletter.hyphen.1.2 = remove diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def index ef70c733ef4..51225cfa08a 100644 --- a/Master/texmf-dist/tex/generic/babel/luababel.def +++ b/Master/texmf-dist/tex/generic/babel/luababel.def @@ -534,6 +534,203 @@ \ifx\bbl@KVP@intrapenalty\@nil\else \expandafter\bbl@intrapenalty\bbl@KVP@intrapenalty\@@ \fi}} +\ifnum\bbl@bidimode>100 \ifnum\bbl@bidimode<200 +\def\bblar@chars{% + 0628,0629,062A,062B,062C,062D,062E,062F,0630,0631,0632,0633,% + 0634,0635,0636,0637,0638,0639,063A,063B,063C,063D,063E,063F,% + 0640,0641,0642,0643,0644,0645,0646,0647,0649} +\def\bblar@elongated{% + 0626,0628,062A,062B,0633,0634,0635,0636,063B,% + 063C,063D,063E,063F,0641,0642,0643,0644,0646,% + 0649,064A} +\begingroup + \catcode`_=11 \catcode`:=11 + \gdef\bblar@nofswarn{\gdef\msg_warning:nnx##1##2##3{}} +\endgroup +\gdef\bbl@arabicjust{% + \let\bbl@arabicjust\relax + \newattribute\bblar@kashida + \bblar@kashida=\z@ + \expandafter\bbl@add\csname selectfont \endcsname{{\bbl@parsejalt}}% + \directlua{ + Babel.arabic.elong_map = Babel.arabic.elong_map or {} + Babel.arabic.elong_map[\the\localeid] = {} + luatexbase.add_to_callback('post_linebreak_filter', + Babel.arabic.justify, 'Babel.arabic.justify') + }}% +\def\bblar@fetchjalt#1#2#3#4{% + \bbl@exp{\\\bbl@foreach{#1}}{% + \bbl@ifunset{bblar@JE@##1}% + {\setbox\z@\hbox{^^^^200d\char"##1#2}}% + {\setbox\z@\hbox{^^^^200d\char"\@nameuse{bblar@JE@##1}#2}}% + \directlua{% + local last = nil + for item in node.traverse(tex.box[0].head) do + if item.id == node.id'glyph' and item.char > 0x600 and + not (item.char == 0x200D) then + last = item + end + end + Babel.arabic.#3['##1#4'] = last.char + }}} +\gdef\bbl@parsejalt{% + \ifx\addfontfeature\@undefined\else + \bbl@xin@{/e}{/\bbl@cl{lnbrk}}% + \ifin@ + \directlua{% + if Babel.arabic.elong_map[\the\localeid][\fontid\font] == nil then + Babel.arabic.elong_map[\the\localeid][\fontid\font] = {} + tex.print([[\string\csname\space bbl@parsejalti\endcsname]]) + end + }% + \fi + \fi} +\gdef\bbl@parsejalti{% + \begingroup + \let\bbl@parsejalt\relax % To avoid infinite loop + \edef\bbl@tempb{\fontid\font}% + \bblar@nofswarn + \bblar@fetchjalt\bblar@elongated{}{from}{}% + \bblar@fetchjalt\bblar@chars{^^^^064a}{from}{a}% Alef maksura + \bblar@fetchjalt\bblar@chars{^^^^0649}{from}{y}% Yeh + \addfontfeature{RawFeature=+jalt}% + % \@namedef{bblar@JE@0643}{06AA}% todo: catch medial kaf + \bblar@fetchjalt\bblar@elongated{}{dest}{}% + \bblar@fetchjalt\bblar@chars{^^^^064a}{dest}{a}% + \bblar@fetchjalt\bblar@chars{^^^^0649}{dest}{y}% + \directlua{% + for k, v in pairs(Babel.arabic.from) do + if Babel.arabic.dest[k] and + not (Babel.arabic.from[k] == Babel.arabic.dest[k]) then + Babel.arabic.elong_map[\the\localeid][\bbl@tempb] + [Babel.arabic.from[k]] = Babel.arabic.dest[k] + end + end + }% + \endgroup} +\begingroup +\catcode`#=11 +\catcode`~=11 +\directlua{ + +Babel.arabic = Babel.arabic or {} +Babel.arabic.from = {} +Babel.arabic.dest = {} +Babel.arabic.justify_factor = 0.95 +Babel.arabic.justify_enabled = true + +function Babel.arabic.justify(head) + if not Babel.arabic.justify_enabled then return head end + local d, new + local k_list, k_item, pos_inline + local width, width_new, full, k_curr, wt_pos, goal + local subst_done = false + local elong_map = Babel.arabic.elong_map + local last_line + local GLYPH = node.id'glyph' + local KASHIDA = luatexbase.registernumber'bblar@kashida' + local LOCALE = luatexbase.registernumber'bbl@attr@locale' + + for line in node.traverse_id(node.id'hlist', head) do + % Exclude last line. todo. But-- it discards one-word lines, too! + % ? Look for glue = 12:15 + if (line.glue_sign == 1 and line.glue_order == 0) then + elongs = {} % Stores elongated candidates of each line + k_list = {} % And all letters with kashida + pos_inline = 0 % Not yet used + + for n in node.traverse_id(GLYPH, line.head) do + pos_inline = pos_inline + 1 % To find where it is. Not used. + + % Elongated glyphs + if elong_map then + local locale = node.get_attribute(n, LOCALE) + if elong_map[locale] and elong_map[locale][n.font] and + elong_map[locale][n.font][n.char] then + table.insert(elongs, {node = n, locale = locale} ) + node.set_attribute(n.prev, KASHIDA, 0) + end + end + + % Tatwil + if Babel.kashida_wts then + local k_wt = node.get_attribute(n, KASHIDA) + if k_wt > 0 then % todo. parameter for multi inserts + table.insert(k_list, {node = n, weight = k_wt, pos = pos_inline}) + end + end + + end % of node.traverse_id + + if #elongs == 0 and #k_list == 0 then goto next_line end + + full = line.width + goal = full * Babel.arabic.justify_factor % A bit crude + width = node.dimensions(line.head) % The 'natural' width + + % == Elongated == + % Original idea taken from 'chikenize' + while (#elongs > 0 and width < goal) do + subst_done = true + local x = #elongs + local curr = elongs[x].node + local oldchar = curr.char + curr.char = elong_map[elongs[x].locale][curr.font][curr.char] + width = node.dimensions(line.head) % Check if the line is too wide + % Substitute back if the line would be too wide and break: + if width > goal then + curr.char = oldchar + break + end + % If continue, pop the just substituted node from the list: + table.remove(elongs, x) + end + + % == Tatwil == + if #k_list == 0 then goto next_line end + + width = node.dimensions(line.head) % The 'natural' width + k_curr = #k_list + wt_pos = 1 + + while width < goal do + subst_done = true + k_item = k_list[k_curr].node + if k_list[k_curr].weight == Babel.kashida_wts[wt_pos] then + d = node.copy(k_item) + d.char = 0x0640 + line.head, new = node.insert_after(line.head, k_item, d) + width_new = node.dimensions(line.head) + if width > goal or width == width_new then + node.remove(line.head, new) % Better compute before + break + end + width = width_new + end + if k_curr == 1 then + k_curr = #k_list + wt_pos = (wt_pos >= table.getn(Babel.kashida_wts)) and 1 or wt_pos+1 + else + k_curr = k_curr - 1 + end + end + + ::next_line:: + + % Must take into account marks and ins, see luatex manual. + % Have to be executed only if there are changes. Investigate + % what's going on exactly. + if subst_done then + node.insert_before(head, line, node.hpack(line.head, full, 'exactly')) + node.remove(head, line) + end + end % if process line + end % for lines + return head +end +} +\endgroup +\fi\fi % Arabic just block \AddBabelHook{babel-fontspec}{afterextras}{\bbl@switchfont} \AddBabelHook{babel-fontspec}{beforestart}{\bbl@ckeckstdfonts} \DisableBabelHook{babel-fontspec} @@ -1113,6 +1310,7 @@ end &% after the match, either as found by u.match (faster) or the &% computed position based on sc if w has changed. local last_match = 0 + local step = 0 &% For every match. while true do @@ -1120,9 +1318,9 @@ end print('=====') end local new &% used when inserting and removing nodes - local refetch = false local matches = { u.match(w, p, last_match) } + if #matches < 2 then break end &% Get and remove empty captures (with ()'s, which return a @@ -1188,6 +1386,10 @@ end item_base = data_nodes[crep.data] end + if crep then + step = crep.step or 0 + end + if crep and next(crep) == nil then &% = {} last_match = save_last &% Optimization goto next @@ -1197,7 +1399,14 @@ end table.remove(w_nodes, sc) w = u.sub(w, 1, sc-1) .. u.sub(w, sc+1) sc = sc - 1 &% Nothing has been inserted. - last_match = utf8.offset(w, sc+1) + last_match = utf8.offset(w, sc+1+step) + goto next + + elseif crep and crep.kashida then &% Experimental + node.set_attribute(item, + luatexbase.registernumber'bblar@kashida', + crep.kashida) + last_match = utf8.offset(w, sc+1+step) goto next elseif crep and crep.string then @@ -1233,7 +1442,7 @@ end end &% for node.remove(head, item) end &% if '' - last_match = utf8.offset(w, sc+1) + last_match = utf8.offset(w, sc+1+step) goto next elseif mode == 1 and crep and (crep.pre or crep.no or crep.post) then @@ -1302,7 +1511,7 @@ end w = u.sub(w, 1, sc-1) .. placeholder .. u.sub(w, sc+1) end - last_match = utf8.offset(w, sc+1) + last_match = utf8.offset(w, sc+1+step) ::next:: @@ -1372,6 +1581,26 @@ end return "]]..Babel.capt_map(m[" .. capno .. "]," .. (mlen) .. ").." .. "[[" end + + &% Create/Extend reversed sorted list of kashida weights: + function Babel.capture_kashida(key, wt) + wt = tonumber(wt) + if Babel.kashida_wts then + for p, q in ipairs(Babel.kashida_wts) do + if wt == q then + break + elseif wt > q then + table.insert(Babel.kashida_wts, p, wt) + break + elseif table.getn(Babel.kashida_wts) == p then + table.insert(Babel.kashida_wts, wt) + end + end + else + Babel.kashida_wts = { wt } + end + return 'kashida = ' .. wt + end } \catcode`\#=6 \gdef\babelposthyphenation#1#2#3{&% @@ -1432,10 +1661,11 @@ end rep = rep:gsub('^%s*(remove)%s*$', 'remove = true') rep = rep:gsub('^%s*(insert)%s*,', 'insert = true, ') rep = rep:gsub('(string)%s*=%s*([^%s,]*)', Babel.capture_func) - 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) tex.print([[\string\babeltempa{{]] .. rep .. [[}}]]) }}}&% \directlua{ diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf index 03d94c0f99d..1ad201a54bc 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}[2021/04/26 3.58 Nil language] +\ProvidesLanguage{nil}[2021/05/16 3.59 Nil language] \LdfInit{nil}{datenil} \ifx\l@nil\@undefined \newlanguage\l@nil |