babel (16dec20)

git-svn-id: svn://tug.org/texlive/trunk@57153 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 258 insertions, 230 deletions

diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index 5b22adf11eb..4ad65905c01 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/10/27 3.51 Babel common definitions]
+\ProvidesFile{babel.def}[2020/12/16 3.52 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.51}
-\def\bbl@date{2020/10/27}
+\def\bbl@version{3.52}
+\def\bbl@date{2020/12/16}
 \def\adddialect#1#2{%
   \global\chardef#1#2\relax
   \bbl@usehooks{adddialect}{{#1}{#2}}%
@@ -671,7 +671,7 @@
       \csname\languagename @bbl@hyphenmap\endcsname
     \fi
   \fi
-  \global\let\bbl@hymapsel\@cclv
+  \let\bbl@hymapsel\@cclv
   % hyphenation - select patterns
   \bbl@patterns{#1}%
   % hyphenation - allow stretching with babelnohyphens
@@ -1121,17 +1121,17 @@
   \def\bbl@tempa##1,#3=##2,##3\@empty{\def\bbl@tempb{##2}}%
   \expandafter\bbl@tempa\bbl@evargs,#3=,\@empty
   \bbl@ifunset{bbl@ev@#2@#3@#1}%
-    {\bbl@csarg\bbl@add{ev@#3@#1}{\bbl@elt{#2}}}%
+    {\bbl@csarg\bbl@add{ev@#3@#1}{\bbl@elth{#2}}}%
     {\bbl@csarg\let{ev@#2@#3@#1}\relax}%
   \bbl@csarg\newcommand{ev@#2@#3@#1}[\bbl@tempb]}
 \newcommand\EnableBabelHook[1]{\bbl@csarg\let{hk@#1}\@firstofone}
 \newcommand\DisableBabelHook[1]{\bbl@csarg\let{hk@#1}\@gobble}
 \def\bbl@usehooks#1#2{%
-  \def\bbl@elt##1{%
+  \def\bbl@elth##1{%
     \bbl@cs{hk@##1}{\bbl@cs{ev@##1@#1@}#2}}%
   \bbl@cs{ev@#1@}%
   \ifx\languagename\@undefined\else % Test required for Plain (?)
-    \def\bbl@elt##1{%
+    \def\bbl@elth##1{%
       \bbl@cs{hk@##1}{\bbl@cl{ev@##1@#1}#2}}%
     \bbl@cl{ev@#1}%
   \fi}
@@ -2780,7 +2780,7 @@
       {Fix the name or reinstall babel.}%
   \else
     \catcode`\[=12 \catcode`\]=12 \catcode`\==12 \catcode`\&=12
-    \catcode`\;=12 \catcode`\|=12 \catcode`\%=14
+    \catcode`\;=12 \catcode`\|=12 \catcode`\%=14 \catcode`\-=12
     \bbl@info{Importing
                 \ifcase#2 \or font and identification \or basic \fi
                 data for \languagename\\%
diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty
index d163aecce59..0b745bc02d4 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.sty
+++ b/Master/texmf-dist/tex/generic/babel/babel.sty
@@ -33,12 +33,20 @@
 %%
 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{babel}[2020/10/27 3.51 The Babel package]
+\ProvidesPackage{babel}[2020/12/16 3.52 The Babel package]
 \@ifpackagewith{babel}{debug}
   {\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}%
-   \let\bbl@debug\@firstofone}
+   \let\bbl@debug\@firstofone
+   \ifx\directlua\@undefined\else
+     \directlua{ Babel = Babel or {}
+       Babel.debug = true }%
+   \fi}
   {\providecommand\bbl@trace[1]{}%
-   \let\bbl@debug\@gobble}
+   \let\bbl@debug\@gobble
+   \ifx\directlua\@undefined\else
+     \directlua{ Babel = Babel or {}
+       Babel.debug = false }%
+   \fi}
 \bbl@trace{Basic macros}
 \def\bbl@stripslash{\expandafter\@gobble\string}
 \def\bbl@add#1#2{%
@@ -1014,7 +1022,6 @@
   \IfFileExists{\CurrentOption.ldf}%
     {\bbl@load@language{\CurrentOption}}%
     {#1\bbl@load@language{#2}#3}}
-\DeclareOption{afrikaans}{\bbl@try@load@lang{}{dutch}{}}
 \DeclareOption{hebrew}{%
   \input{rlbabel.def}%
   \bbl@load@language{hebrew}}
@@ -1044,16 +1051,16 @@
 \fi
 \let\bbl@tempc\relax
 \bbl@foreach\bbl@language@opts{%
-  \ifcase\bbl@iniflag
+  \ifcase\bbl@iniflag  % Default
     \bbl@ifunset{ds@#1}%
       {\DeclareOption{#1}{\bbl@load@language{#1}}}%
       {}%
-  \or
+  \or    % provide=*
     \@gobble % case 2 same as 1
-  \or
+  \or    % provide+=*
     \bbl@ifunset{ds@#1}%
       {\IfFileExists{#1.ldf}{}%
-        {\IfFileExists{babel-#1.tex}{}{\DeclareOption{#1}{}}}}%
+        {\IfFileExists{babel-#1.tex}{}{\@namedef{ds@#1}{}}}}%
       {}%
     \bbl@ifunset{ds@#1}%
       {\def\bbl@tempc{#1}%
@@ -1066,7 +1073,7 @@
            \bbl@load@language{#1}%
          \fi}}%
       {}%
-  \or
+  \or    % provide*=*
     \def\bbl@tempc{#1}%
     \bbl@ifunset{ds@#1}%
       {\DeclareOption{#1}{%
@@ -1079,7 +1086,7 @@
 \bbl@foreach\@classoptionslist{%
   \bbl@ifunset{ds@#1}%
     {\IfFileExists{#1.ldf}{}%
-      {\IfFileExists{babel-#1.tex}{}{\DeclareOption{#1}{}}}}%
+      {\IfFileExists{babel-#1.tex}{}{\@namedef{ds@#1}{}}}}%
     {}%
   \bbl@ifunset{ds@#1}%
     {\def\bbl@tempb{#1}%
diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
index 04e33b599e8..7803766a21a 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/10/27 3.51 Babel hyphens]
+\ProvidesFile{hyphen.cfg}[2020/12/16 3.52 Babel hyphens]
 \xdef\bbl@format{\jobname}
-\def\bbl@version{3.51}
-\def\bbl@date{2020/10/27}
+\def\bbl@version{3.52}
+\def\bbl@date{2020/12/16}
 \ifx\AtBeginDocument\@undefined
   \def\@empty{}
   \let\orig@dump\dump
diff --git a/Master/texmf-dist/tex/generic/babel/locale/sq/babel-sq.ini b/Master/texmf-dist/tex/generic/babel/locale/sq/babel-sq.ini
index 1ae73931ca5..3b8c892185c 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/sq/babel-sq.ini
+++ b/Master/texmf-dist/tex/generic/babel/locale/sq/babel-sq.ini
@@ -11,8 +11,8 @@
 
 [identification]
 charset = utf8
-version = 1.2
-date = 2020-06-30
+version = 1.3
+date = 2020-11-25
 name.local = shqip
 name.english = Albanian
 name.babel = albanian
@@ -35,7 +35,7 @@ abstract = Përmbledhja
 bib = Bibliografia
 chapter = Kapitulli
 appendix = Shtesa
-contents = Përmbajta
+contents = Përmbajtja
 listfigure = Figurat
 listtable = Tabelat
 index = Indeksi
diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def
index 840b6369e76..d843a2e3e55 100644
--- a/Master/texmf-dist/tex/generic/babel/luababel.def
+++ b/Master/texmf-dist/tex/generic/babel/luababel.def
@@ -195,7 +195,7 @@
 \endinput\fi
   % Here stops reading code for hyphen.cfg
   % The following is read the 2nd time it's loaded
-\begingroup
+\begingroup  % TODO - to a lua file
 \catcode`\%=12
 \catcode`\'=12
 \catcode`\"=12
@@ -380,7 +380,7 @@
     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
@@ -390,16 +390,16 @@
           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)
@@ -896,14 +896,17 @@ end
     Babel.chr_to_loc[\the\count@] =
       \bbl@ifblank{#1}{-1000}{\the\bbl@cs{id@@#1}}\space
   }}
-\begingroup
+\begingroup % TODO - to a lua file
+\catcode`\~=12
 \catcode`\#=12
 \catcode`\%=12
 \catcode`\&=14
 \directlua{
-  Babel.linebreaking.post_replacements = {}
-  Babel.linebreaking.pre_replacements = {}
+  Babel.linebreaking.replacements = {}
+  Babel.linebreaking.replacements[0] = {}  &% pre
+  Babel.linebreaking.replacements[1] = {}  &% post
 
+  &% Discretionaries contain strings as nodes
   function Babel.str_to_nodes(fn, matches, base)
     local n, head, last
     if fn == nil then return nil end
@@ -923,7 +926,11 @@ end
     return head
   end
 
-  function Babel.fetch_word(head, funct)
+  Babel.fetch_subtext = {}
+
+  &% Merging both functions doesn't seen feasible, because there are too
+  &% many differences.
+  Babel.fetch_subtext[0] = function(head)
     local word_string = ''
     local word_nodes = {}
     local lang
@@ -932,149 +939,49 @@ end
 
     while item do
 
-      if item.id == 29
-          and not(item.char == 124) &% ie, not |
-          and not(item.char == 61)  &% ie, not =
-          and not inmath
-          and (item.lang == lang or lang == nil) then
-        lang = lang or item.lang
-        word_string = word_string .. unicode.utf8.char(item.char)
-        word_nodes[#word_nodes+1] = item
+      if item.id == 11 then
+        inmath = (item.subtype == 0)
+      end
 
-      elseif item.id == 7 and item.subtype == 2 and not inmath then
-        word_string = word_string .. '='
-        word_nodes[#word_nodes+1] = item
+      if inmath then
+        &% pass
 
-      elseif item.id == 7 and item.subtype == 3 and not inmath then
-        word_string = word_string .. '|'
-        word_nodes[#word_nodes+1] = item
+      elseif item.id == 29 then
+        local locale = node.get_attribute(item, Babel.attr_locale)
 
-      elseif item.id == 11 and item.subtype == 0 then
-        inmath = true
+        if lang == locale or lang == nil then
+          if (item.char ~= 124) then &% ie, not | = space
+            lang = lang or locale
+            word_string = word_string .. unicode.utf8.char(item.char)
+            word_nodes[#word_nodes+1] = item
+          end
+        else
+          break
+        end
 
-      elseif word_string == '' then
-        &% pass
+      elseif item.id == 12 and item.subtype == 13 then
+        word_string = word_string .. '|'
+        word_nodes[#word_nodes+1] = item
 
-      else
-        return word_string, word_nodes, item, lang
+      &% Ignore leading unrecognized nodes, too.
+      elseif word_string ~= '' then
+        word_string = word_string .. Babel.us_char
+        word_nodes[#word_nodes+1] = item  &% Will be ignored
       end
 
       item = item.next
     end
-  end
-
-  function Babel.post_hyphenate_replace(head)
-    local u = unicode.utf8
-    local lbkr = Babel.linebreaking.post_replacements
-    local word_head = head
-
-    while true do
-      local w, wn, nw, lang = Babel.fetch_word(word_head)
-      if not lang then return head end
-
-      if not lbkr[lang] then
-        break
-      end
-
-      for k=1, #lbkr[lang] do
-        local p = lbkr[lang][k].pattern
-        local r = lbkr[lang][k].replace
-
-        while true do
-          local matches = { u.match(w, p) }
-          if #matches < 2 then break end
-
-          local first = table.remove(matches, 1)
-          local last =  table.remove(matches, #matches)
-
-          &% Fix offsets, from bytes to unicode.
-          first = u.len(w:sub(1, first-1)) + 1
-          last  = u.len(w:sub(1, last-1))
 
-          local new  &% used when inserting and removing nodes
-          local changed = 0
-
-          &% This loop traverses the replace list and takes the
-          &% corresponding actions
-          for q = first, last do
-            local crep = r[q-first+1]
-            local char_node = wn[q]
-            local char_base = char_node
-
-            if crep and crep.data then
-              char_base = wn[crep.data+first-1]
-            end
-
-            if crep == {} then
-              break
-            elseif crep == nil then
-              changed = changed + 1
-              node.remove(head, char_node)
-            elseif crep and (crep.pre or crep.no or crep.post) then
-              changed = changed + 1
-              d = node.new(7, 0)   &% (disc, discretionary)
-              d.pre = Babel.str_to_nodes(crep.pre, matches, char_base)
-              d.post = Babel.str_to_nodes(crep.post, matches, char_base)
-              d.replace = Babel.str_to_nodes(crep.no, matches, char_base)
-              d.attr = char_base.attr
-              if crep.pre == nil then  &% TeXbook p96
-                d.penalty  = crep.penalty or tex.hyphenpenalty
-              else
-                d.penalty  = crep.penalty or tex.exhyphenpenalty
-              end
-              head, new = node.insert_before(head, char_node, d)
-              node.remove(head, char_node)
-              if q == 1 then
-                word_head = new
-              end
-            elseif crep and crep.string then
-              changed = changed + 1
-              local str = crep.string(matches)
-              if str == '' then
-                if q == 1 then
-                  word_head = char_node.next
-                end
-                head, new = node.remove(head, char_node)
-              elseif char_node.id == 29 and u.len(str) == 1 then
-                char_node.char = string.utfvalue(str)
-              else
-                local n
-                for s in string.utfvalues(str) do
-                  if char_node.id == 7 then
-                    log('Automatic hyphens cannot be replaced, just removed.')
-                  else
-                    n = node.copy(char_base)
-                  end
-                  n.char = s
-                  if q == 1 then
-                    head, new = node.insert_before(head, char_node, n)
-                    word_head = new
-                  else
-                    node.insert_before(head, char_node, n)
-                  end
-                end
-
-                node.remove(head, char_node)
-              end  &% string length
-            end  &% if char and char.string
-          end  &% for char in match
-          if changed > 20 then
-            texio.write('Too many changes. Ignoring the rest.')
-          elseif changed > 0 then
-            w, wn, nw = Babel.fetch_word(word_head)
-          end
-
-        end  &% for match
-      end  &% for patterns
-      word_head = nw
-    end  &% for words
-    return head
+    &% Here and above we remove some trailing chars but not the
+    &% corresponding nodes. But they aren't accessed.
+    if word_string:sub(-1) == '|' then
+      word_string = word_string:sub(1,-2)
+    end
+    word_string = unicode.utf8.gsub(word_string, Babel.us_char .. '+$', '')
+    return word_string, word_nodes, item, lang
   end
 
-  &%%%
-  &% Preliminary code for \babelprehyphenation
-  &% TODO. Copypaste pattern. Merge with fetch_word
-  function Babel.fetch_subtext(head, funct)
+  Babel.fetch_subtext[1] = function(head)
     local word_string = ''
     local word_nodes = {}
     local lang
@@ -1083,145 +990,256 @@ end
 
     while item do
 
-      if item.id == 29 then
-        local locale = node.get_attribute(item, Babel.attr_locale)
+      if item.id == 11 then
+        inmath = (item.subtype == 0)
+      end
 
-        if not(item.char == 124) &% ie, not | = space
-            and not inmath
-            and (locale == lang or lang == nil) then
-          lang = lang or locale
-          word_string = word_string .. unicode.utf8.char(item.char)
-          word_nodes[#word_nodes+1] = item
-        end
+      if inmath then
+        &% pass
 
-        if item == node.tail(head) then
-          item = nil
-          return word_string, word_nodes, item, lang
+      elseif item.id == 29 then
+        if item.lang == lang or lang == nil then
+          if (item.char ~= 124) and (item.char ~= 61) then &% not =, not |
+            lang = lang or item.lang
+            word_string = word_string .. unicode.utf8.char(item.char)
+            word_nodes[#word_nodes+1] = item
+          end
+        else
+          break
         end
 
-      elseif item.id == 12 and item.subtype == 13 and not inmath then
-        word_string = word_string .. '|'
+      elseif item.id == 7 and item.subtype == 2 then
+        word_string = word_string .. '='
         word_nodes[#word_nodes+1] = item
 
-        if item == node.tail(head) then
-          item = nil
-          return word_string, word_nodes, item, lang
-        end
-
-      elseif item.id == 11 and item.subtype == 0 then
-          inmath = true
+      elseif item.id == 7 and item.subtype == 3 then
+        word_string = word_string .. '|'
+        word_nodes[#word_nodes+1] = item
 
+      &% (1) Go to next word if nothing was found, and (2) implictly
+      &% remove leading USs.
       elseif word_string == '' then
         &% pass
 
+      &% This is the responsible for splitting by words.
+      elseif (item.id == 12 and item.subtype == 13) then
+        break
+
       else
-        return word_string, word_nodes, item, lang
+        word_string = word_string .. Babel.us_char
+        word_nodes[#word_nodes+1] = item  &% Will be ignored
       end
 
       item = item.next
     end
+
+    word_string = unicode.utf8.gsub(word_string, Babel.us_char .. '+$', '')
+    return word_string, word_nodes, item, lang
   end
 
-  &% TODO. Copypaste pattern. Merge with pre_hyphenate_replace
   function Babel.pre_hyphenate_replace(head)
+    Babel.hyphenate_replace(head, 0)
+  end
+
+  function Babel.post_hyphenate_replace(head)
+    Babel.hyphenate_replace(head, 1)
+  end
+
+  Babel.us_char = string.char(31)
+
+  function Babel.hyphenate_replace(head, mode)
     local u = unicode.utf8
-    local lbkr = Babel.linebreaking.pre_replacements
+    local lbkr = Babel.linebreaking.replacements[mode]
+
     local word_head = head
 
-    while true do
-      local w, wn, nw, lang = Babel.fetch_subtext(word_head)
-      if not lang then return head end
+    while true do  &% for each subtext block
 
-      if not lbkr[lang] then
-        break
+      local w, wn, nw, lang = Babel.fetch_subtext[mode](word_head)
+
+      if Babel.debug then
+        print()
+        print('@@@@@', w, nw)
       end
 
+      if nw == nil and w == '' then break end
+
+      if not lang then goto next end
+      if not lbkr[lang] then goto next end
+
+      &% For each saved (pre|post)hyphenation. TODO. Reconsider how
+      &% loops are nested.
       for k=1, #lbkr[lang] do
         local p = lbkr[lang][k].pattern
         local r = lbkr[lang][k].replace
 
+        if Babel.debug then
+          print('=====', p, mode)
+        end
+
+        &% This variable is set in some cases below to the first *byte*
+        &% 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
+
+        &% For every match.
         while true do
-          local matches = { u.match(w, p) }
+          if Babel.debug then
+            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
+          &% number with the position), and keep actual captures
+          &% (from (...)), if any, in matches.
           local first = table.remove(matches, 1)
-          local last =  table.remove(matches, #matches)
+          local last  = table.remove(matches, #matches)
+          &% Non re-fetched substrings may contain \31, which separates
+          &% subsubstrings.
+          if string.find(w:sub(first, last-1), Babel.us_char) then break end
 
-          &% Fix offsets, from bytes to unicode.
+          local save_last = last &% with A()BC()D, points to D
+
+          &% Fix offsets, from bytes to unicode. Explained above.
           first = u.len(w:sub(1, first-1)) + 1
-          last  = u.len(w:sub(1, last-1))
+          last  = u.len(w:sub(1, last-1)) &% now last points to C
 
-          local new  &% used when inserting and removing nodes
-          local changed = 0
+          if Babel.debug then
+            print(p)
+            print('', 'sc', 'first', 'last', 'last_m', 'w')
+          end
 
-          &% This loop traverses the replace list and takes the
-          &% corresponding actions
-          for q = first, last do
-            local crep = r[q-first+1]
-            local char_node = wn[q]
+          &% This loop traverses the matched substring and takes the
+          &% corresponding action stored in the replacement list.
+          &% sc = the position in substr nodes / string
+          &% rc = the replacement table index
+          local sc = first-1
+          local rc = 0
+          while rc < last-first+1 do &% for each replacement
+            if Babel.debug then
+              print('.....')
+            end
+            sc = sc + 1
+            rc = rc + 1
+            local crep = r[rc]
+            local char_node = wn[sc]
             local char_base = char_node
+            local end_replacement = false
 
             if crep and crep.data then
               char_base = wn[crep.data+first-1]
             end
 
-            if crep == {} then
-              break
-            elseif crep == nil then
-              changed = changed + 1
+            if Babel.debug then
+              print('*', sc, first, last, last_match, w)
+            end
+
+            if crep and next(crep) == nil then &% {}
+              last_match = save_last
+
+            elseif crep == nil then &% remove
               node.remove(head, char_node)
+              table.remove(wn, sc)
+              w = u.sub(w, 1, sc-1) .. u.sub(w, sc+1)
+              last_match = utf8.offset(w, sc)
+              sc = sc - 1  &% Nothing has been inserted
+
+            elseif mode == 1 and crep and (crep.pre or crep.no or crep.post) then
+              local d = node.new(7, 0)   &% (disc, discretionary)
+              d.pre     = Babel.str_to_nodes(crep.pre, matches, char_base)
+              d.post    = Babel.str_to_nodes(crep.post, matches, char_base)
+              d.replace = Babel.str_to_nodes(crep.no, matches, char_base)
+              d.attr = char_base.attr
+              if crep.pre == nil then  &% TeXbook p96
+                d.penalty = crep.penalty or tex.hyphenpenalty
+              else
+                d.penalty = crep.penalty or tex.exhyphenpenalty
+              end
+              head, new = node.insert_before(head, char_node, d)
+              end_replacement = true
+
+            elseif crep and crep.penalty then
+              local d = node.new(14, 0)   &% (penalty, userpenalty)
+              d.attr = char_base.attr
+              d.penalty = crep.penalty
+              head, new = node.insert_before(head, char_node, d)
+              end_replacement = true
+
             elseif crep and crep.string then
-              changed = changed + 1
               local str = crep.string(matches)
-              if str == '' then
-                if q == 1 then
+              if str == '' then  &% Gather with nil
+                refetch = true
+                if sc == 1 then
                   word_head = char_node.next
                 end
                 head, new = node.remove(head, char_node)
               elseif char_node.id == 29 and u.len(str) == 1 then
                 char_node.char = string.utfvalue(str)
+                w = u.sub(w, 1, sc-1) .. str .. u.sub(w, sc+1)
+                last_match = utf8.offset(w, sc+1)
               else
+                refetch = true
                 local n
                 for s in string.utfvalues(str) do
                   if char_node.id == 7 then
-                    log('Automatic hyphens cannot be replaced, just removed.')
+                    &% TODO. Remove this limitation.
+                    texio.write_nl('Automatic hyphens cannot be replaced, just removed.')
                   else
                     n = node.copy(char_base)
                   end
                   n.char = s
-                  if q == 1 then
+                  if sc == 1 then
                     head, new = node.insert_before(head, char_node, n)
                     word_head = new
                   else
                     node.insert_before(head, char_node, n)
                   end
                 end
-
                 node.remove(head, char_node)
               end  &% string length
-            end  &% if char and char.string
-          end  &% for char in match
-          if changed > 20 then
-            texio.write('Too many changes. Ignoring the rest.')
-          elseif changed > 0 then
-            &% For one-to-one can we modifiy directly the
-            &% values without re-fetching? Very likely.
-            w, wn, nw = Babel.fetch_subtext(word_head)
+            end  &% if char and char.string (ie replacement cases)
+
+            &% Shared by disc and penalty.
+            if end_replacement then
+              if sc == 1 then
+                word_head = new
+              end
+              if crep.insert then
+                last_match = save_last
+              else
+                node.remove(head, char_node)
+                w = u.sub(w, 1, sc-1) .. Babel.us_char .. u.sub(w, sc+1)
+                last_match = utf8.offset(w, sc)
+              end
+            end
+          end  &% for each replacement
+
+          if Babel.debug then
+            print('/', sc, first, last, last_match, w)
+          end
+
+          &% TODO. refetch will be eventually unnecesary.
+          if refetch then
+            w, wn, nw, lang = Babel.fetch_subtext[mode](word_head)
           end
 
         end  &% for match
       end  &% for patterns
+
+      ::next::
       word_head = nw
-    end  &% for words
+    end  &% for substring
     return head
   end
-  &%%% end of preliminary code for \babelprehyphenation
-
-  &% The following functions belong to the next macro
 
   &% This table stores capture maps, numbered consecutively
   Babel.capture_maps = {}
 
+  &% The following functions belong to the next macro
   function Babel.capture_func(key, cap)
     local ret = "[[" .. cap:gsub('{([0-9])}', "]]..m[%1]..[[") .. "]]"
     ret = ret:gsub('{([0-9])|([^|]+)|(.-)}', Babel.capture_func_map)
@@ -1262,6 +1280,7 @@ end
         {\bbl@add@list\babeltempb{nil}}&%
         {\directlua{
            local rep = [[##1]]
+           rep = rep:gsub('^%s*(insert)%s*,', 'insert = true, ')
            rep = rep:gsub(    '(no)%s*=%s*([^%s,]*)', Babel.capture_func)
            rep = rep:gsub(   '(pre)%s*=%s*([^%s,]*)', Babel.capture_func)
            rep = rep:gsub(  '(post)%s*=%s*([^%s,]*)', Babel.capture_func)
@@ -1269,7 +1288,7 @@ end
            tex.print([[\string\babeltempa{{]] .. rep .. [[}}]])
          }}}&%
     \directlua{
-      local lbkr = Babel.linebreaking.post_replacements
+      local lbkr = Babel.linebreaking.replacements[1]
       local u = unicode.utf8
       &% Convert pattern:
       local patt = string.gsub([==[#2]==], '%s', '')
@@ -1278,7 +1297,6 @@ end
       end
       patt = string.gsub(patt, '%(%)%^', '^()')
       patt = string.gsub(patt, '%$%(%)', '()$')
-      texio.write('***************' .. patt)
       patt = u.gsub(patt, '{(.)}',
                 function (n)
                   return '%' .. (tonumber(n) and (tonumber(n)+1) or n)
@@ -1298,17 +1316,20 @@ end
         {\bbl@add@list\babeltempb{nil}}&%
         {\directlua{
            local rep = [[##1]]
+           rep = rep:gsub('^%s*(insert)%s*,', 'insert = true, ')
            rep = rep:gsub('(string)%s*=%s*([^%s,]*)', Babel.capture_func)
            tex.print([[\string\babeltempa{{]] .. rep .. [[}}]])
          }}}&%
     \directlua{
-      local lbkr = Babel.linebreaking.pre_replacements
+      local lbkr = Babel.linebreaking.replacements[0]
       local u = unicode.utf8
       &% Convert pattern:
       local patt = string.gsub([==[#2]==], '%s', '')
       if not u.find(patt, '()', nil, true) then
         patt = '()' .. patt .. '()'
       end
+      &% patt = string.gsub(patt, '%(%)%^', '^()')
+      &% patt = string.gsub(patt, '([^%%])%$%(%)', '%1()$')
       patt = u.gsub(patt, '{(.)}',
                 function (n)
                   return '%' .. (tonumber(n) and (tonumber(n)+1) or n)
diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf
index 5f60b05e125..8884be460cb 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/10/27 3.51 Nil language]
+\ProvidesLanguage{nil}[2020/12/16 3.52 Nil language]
 \LdfInit{nil}{datenil}
 \ifx\l@nil\@undefined
   \newlanguage\l@nil