[latex3-commits] [git/LaTeX3-latex3-babel] master: Arabic justification: hboxes with fil+. (1c31281)

[Javier]

Repository : https://github.com/latex3/babel
On branch  : master
Link       : https://github.com/latex3/babel/commit/1c312815a3e532cf59fe160526a869c2c57e17ce

>---------------------------------------------------------------

commit 1c312815a3e532cf59fe160526a869c2c57e17ce
Author: Javier <email at localhost>
Date:   Fri Jun 4 19:21:32 2021 +0200

    Arabic justification: hboxes with fil+.


>---------------------------------------------------------------

1c312815a3e532cf59fe160526a869c2c57e17ce
 README.md              |   5 ++++-
 babel.dtx              |  22 ++++++++++++++--------
 babel.ins              |   2 +-
 babel.pdf              | Bin 843759 -> 844249 bytes
 bbcompat.dtx           |   2 +-
 samples/lua-arabic.pdf | Bin 85279 -> 85649 bytes
 samples/lua-arabic.tex |  15 ++++++++-------
 7 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index f901605..8287e9f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Babel 3.60
+## Babel 3.60.2393
 
 This package manages culturally-determined typographical (and other)
 rules, and hyphenation patterns for a wide range of languages. Many
@@ -46,6 +46,9 @@ respective authors.
 
 ### Summary of Latest changes
 ```
+3.61   2021-06-??
+       * Improved justification=kashida/elongated: hboxes.
+       
 3.60   2021-06-02
        * A major fix for a bug with the latest LaTeX releases: class
          options were messed up.
diff --git a/babel.dtx b/babel.dtx
index 257ecd3..f218d01 100644
--- a/babel.dtx
+++ b/babel.dtx
@@ -32,7 +32,7 @@
 %
 % \iffalse
 %<*filedriver>
-\ProvidesFile{babel.dtx}[2021/06/02 v3.60 The Babel package]
+\ProvidesFile{babel.dtx}[2021/06/04 v3.60.2393 The Babel package]
 \documentclass{ltxdoc}
 \GetFileInfo{babel.dtx}
 \usepackage{fontspec}
@@ -4968,8 +4968,8 @@ help from Bernd Raichle, for which I am grateful.
 % \section{Tools}
 %
 %    \begin{macrocode}
-%<<version=3.60>>
-%<<date=2021/06/02>>
+%<<version=3.60.2393>>
+%<<date=2021/06/04>>
 %    \end{macrocode}
 %
 % \textbf{Do not use the following macros in \texttt{ldf} files. They
@@ -9104,8 +9104,8 @@ help from Bernd Raichle, for which I am grateful.
      #1%
      \bbl at activate{#2}}%
     {\bbl at error
-       {Cannot declare a shorthand turned off (\string#2)}
-       {Sorry, but you cannot use shorthands which have been\\%
+       {I can't declare a shorthand turned off (\string#2)}
+       {Sorry, but you can't use shorthands which have been\\%
         turned off in the package options}}}
 %    \end{macrocode}
 %
@@ -13783,8 +13783,8 @@ help from Bernd Raichle, for which I am grateful.
     Babel.arabic.elong_map[\the\localeid]   = {}
     luatexbase.add_to_callback('post_linebreak_filter',
       Babel.arabic.justify, 'Babel.arabic.justify')
-%     luatexbase.add_to_callback('hpack_filter',
-%       Babel.arabic.justify_hbox, 'Babel.arabic.justify_hbox')
+    luatexbase.add_to_callback('hpack_filter',
+      Babel.arabic.justify_hbox, 'Babel.arabic.justify_hbox')
   }}% 
 % Save both node lists to make replacement. TODO. Save also widths to
 % make computations
@@ -13862,8 +13862,14 @@ function Babel.arabic.justify(head)
 end
 
 function Babel.arabic.justify_hbox(head, gc, size, pack)
+  local has_inf = false
   if Babel.arabic.justify_enabled and pack == 'exactly' then
-    Babel.arabic.justify_hlist(head, nil, gc, size, pack)
+    for n in node.traverse_id(12, head) do
+      if n.stretch_order > 0 then has_inf = true end
+    end
+    if not has_inf then
+      Babel.arabic.justify_hlist(head, nil, gc, size, pack)
+    end
   end
   return head
 end
diff --git a/babel.ins b/babel.ins
index 448f711..9597c68 100644
--- a/babel.ins
+++ b/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{2021/06/02}
+\def\filedate{2021/06/04}
 \def\batchfile{babel.ins}
 \input docstrip.tex
 
diff --git a/babel.pdf b/babel.pdf
index a184df4..4ba498c 100644
Binary files a/babel.pdf and b/babel.pdf differ
diff --git a/bbcompat.dtx b/bbcompat.dtx
index 601f524..41dbe38 100644
--- a/bbcompat.dtx
+++ b/bbcompat.dtx
@@ -30,7 +30,7 @@
 %
 % \iffalse
 %<*dtx>
-\ProvidesFile{bbcompat.dtx}[2021/06/02 v3.60]
+\ProvidesFile{bbcompat.dtx}[2021/06/04 v3.60.2393]
 %</dtx>
 %
 %% File 'bbcompat.dtx'
diff --git a/samples/lua-arabic.pdf b/samples/lua-arabic.pdf
index 3730ec7..6f38729 100644
Binary files a/samples/lua-arabic.pdf and b/samples/lua-arabic.pdf differ
diff --git a/samples/lua-arabic.tex b/samples/lua-arabic.tex
index fb3e9b2..840d19f 100644
--- a/samples/lua-arabic.tex
+++ b/samples/lua-arabic.tex
@@ -3,21 +3,22 @@
 
 % ===================
             
-\usepackage[english, arabic, provide=*,
+\usepackage[english,
             bidi=basic, 
             headfoot=arabic,  % an alternative is layout=sectioning
             layout=counters.tabular]{babel}        
+\babelprovide[import, main,
+  justification = kashida,
+  transforms = kashida.plain
+  ]{arabic}
 
-% == Alternative for kashida ==    
+% == Alternative without kashida ==    
 
-% \usepackage[english,
+% \usepackage[english, arabic, provide=*,
 %             bidi=basic, 
 %             headfoot=arabic,  % an alternative is layout=sectioning
 %             layout=counters.tabular]{babel}
-% \babelprovide[import, main,
-%   justification = kashida,
-%   transforms = kashida.plain
-%   ]{arabic}
+
 
 % =====================