[latex3-commits] [latex3/babel] main: Fix spacing: !? with french, small with japanese. (cd3acaa)

Fri Nov 29 11:13:58 CET 2024

Repository : https://github.com/latex3/babel
On branch  : main
Link       : https://github.com/latex3/babel/commit/cd3acaa700ae84277aa2a7eabb890ba3aacaa570

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

commit cd3acaa700ae84277aa2a7eabb890ba3aacaa570
Author: Javier <email at localhost>
Date:   Fri Nov 29 11:13:58 2024 +0100

    Fix spacing: !? with french, small with japanese.


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

cd3acaa700ae84277aa2a7eabb890ba3aacaa570
 locale/fr/babel-fr-BE.ini       |  8 ++++----
 locale/fr/babel-fr.ini          |  8 ++++----
 locale/ja/babel-ja.ini          | 10 ++++++----
 testfiles-lua/bbl-calendars.tlg |  4 ++--
 testfiles/tlb3438.tlg           |  5 ++---
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/locale/fr/babel-fr-BE.ini b/locale/fr/babel-fr-BE.ini
index 0ccd73e..94254e5 100644
--- a/locale/fr/babel-fr-BE.ini
+++ b/locale/fr/babel-fr-BE.ini
@@ -9,8 +9,8 @@
 
 [identification]
 charset = utf8
-version = 1.1
-date = 2024-11-05
+version = 1.2
+date = 2024-11-29
 name.local = français
 name.english = French
 name.babel = french-belgium french-be
@@ -188,11 +188,11 @@ superscriptingExponent = ×
 date.day = 1\textsuperscript{er} 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
 
 [transforms.prehyphenation]
-punctuation.space.1.0 = { [^|{(}{[}{007B}] () [;!{?}] () }
+punctuation.space.1.0 = { [^|{(}{[}{007B}!{?}] () [;!{?}] () }
 punctuation.space.1.1 =   { insert, penalty = 10000 }
 punctuation.space.1.2 =   { insert, spacefactor= {high.natural|.5} {high.plus|0} {high.minus|0}, data = 1 }
 punctuation.space.1.3 =   {}
-punctuation.space.2.0 = { [^{(}{[}{007B}] () | [;!{?}] () }
+punctuation.space.2.0 = { [^{(}{[}{007B}!{?}] () | [;!{?}] () }
 punctuation.space.2.1 =   { insert, penalty = 10000 }
 punctuation.space.2.2 =   { spacefactor= {high.natural|.5} {high.plus|0} {high.minus|0}, data = 2 }
 punctuation.space.2.3 =   {}
diff --git a/locale/fr/babel-fr.ini b/locale/fr/babel-fr.ini
index b0aee1a..b3611e8 100644
--- a/locale/fr/babel-fr.ini
+++ b/locale/fr/babel-fr.ini
@@ -9,8 +9,8 @@
 
 [identification]
 charset = utf8
-version = 1.1
-date = 2024-11-05
+version = 1.2
+date = 2024-11-29
 name.local = français
 name.english = French
 name.babel = french
@@ -187,11 +187,11 @@ superscriptingExponent = ×
 date.day = 1\textsuperscript{er} 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
 
 [transforms.prehyphenation]
-punctuation.space.1.0 = { [^|{(}{[}{007B}] () [;!{?}] () }
+punctuation.space.1.0 = { [^|{(}{[}{007B}!{?}] () [;!{?}] () }
 punctuation.space.1.1 =   { insert, penalty = 10000 }
 punctuation.space.1.2 =   { insert, spacefactor= {high.natural|.5} {high.plus|0} {high.minus|0}, data = 1 }
 punctuation.space.1.3 =   {}
-punctuation.space.2.0 = { [^{(}{[}{007B}] () | [;!{?}] () }
+punctuation.space.2.0 = { [^{(}{[}{007B}!{?}] () | [;!{?}] () }
 punctuation.space.2.1 =   { insert, penalty = 10000 }
 punctuation.space.2.2 =   { spacefactor= {high.natural|.5} {high.plus|0} {high.minus|0}, data = 2 }
 punctuation.space.2.3 =   {}
diff --git a/locale/ja/babel-ja.ini b/locale/ja/babel-ja.ini
index eab6583..812f767 100644
--- a/locale/ja/babel-ja.ini
+++ b/locale/ja/babel-ja.ini
@@ -10,8 +10,8 @@
 
 [identification]
 charset = utf8
-version = 1.12
-date = 2024-08-27
+version = 1.13
+date = 2024-11-29
 name.local = 日本語
 name.english = Japanese
 name.babel = japanese
@@ -200,8 +200,10 @@ fullwidth.upper.alpha = Ａ Ｂ Ｃ Ｄ Ｅ Ｆ Ｇ Ｈ Ｉ Ｊ Ｋ Ｌ Ｍ Ｎ
 
 [transforms.prehyphenation]
 linebreak.strict.1.0 = { [々ぁぃぅぇぉっゃゅょゎ゛-ゞァィゥェォッャュョヮヵヶゕゖㇰ-ㇿ・-ヾ･-ｩｪ-ｰﾞ] }
-linebreak.strict.1.1 =   { insert, penalty = 10000, step = 1 }
-linebreak.strict.1.2 =   {}
+linebreak.strict.1.1 =   { insert, penalty = {small.penalty|10000}, step = 1 }
+; Don’t rely on internal names. Definitive names to be decided.
+linebreak.strict.1.2 =   { insert, space = {small.natural|intraspace.b} {small.plus|intraspace.p} {small.minus|intraspace.m} }
+linebreak.strict.1.3 =   {}
 ; 
 spacing.basic.1.0 = { [、。，．・：;!?）］｝〉》」』】〕〗〙〛”〞] ()[（［｛〈《「『【〔〖〘〚“〝]()  }
 spacing.basic.1.1 =   { insert, kern = -.5 }
diff --git a/testfiles-lua/bbl-calendars.tlg b/testfiles-lua/bbl-calendars.tlg
index 97b94e7..66e5904 100644
--- a/testfiles-lua/bbl-calendars.tlg
+++ b/testfiles-lua/bbl-calendars.tlg
@@ -21,8 +21,8 @@
 \localedate {\year }{\month }{\day } = 62.98pt, 8.9pt, 2.41pt 
 \today  = 62.98pt, 8.9pt, 2.41pt
 == persian ==
-\today  = 52.29pt, 7.01pt, 2.47pt 
-\localedate [convert]{\year }{\month }{\day } = 52.29pt, 7.01pt, 2.47pt
+\today  = 52.09pt, 7.01pt, 2.47pt 
+\localedate [convert]{\year }{\month }{\day } = 52.09pt, 7.01pt, 2.47pt
 == arabic-sa ==
 \today  = 55.85002pt, 6.76pt, 3.0pt
 == arabic-eg ==
diff --git a/testfiles/tlb3438.tlg b/testfiles/tlb3438.tlg
index 17f81a5..0b2ee79 100644
--- a/testfiles/tlb3438.tlg
+++ b/testfiles/tlb3438.tlg
@@ -5,10 +5,9 @@ Author: Robin Fairbairns <[e-mail hidden]>
 Main Class: article
 Package: babel
     Options: english
-(../babel-french.tex
-Package babel Info: Importing basic data for french
+(../babel-french.tex)
+Package babel Info: Importing data for french
 (babel)             from babel-fr.ini. Reported on input line ....
-)
 > \box...=
 \hbox(9.47221+0.0)x36.38898
 .\OT1/cmr/m/n/10 H



