[latex3-commits] [git/LaTeX3-latex3-babel] master: Preliminary support for frenchspacing with ini's. Option ini -> provide. (8cb5c3f)
Javier
email at dante.de
Fri Sep 25 18:03:39 CEST 2020
Repository : https://github.com/latex3/babel
On branch : master
Link : https://github.com/latex3/babel/commit/8cb5c3f80bb2decd1dcf01ff5e67e0e9f77654a0
>---------------------------------------------------------------
commit 8cb5c3f80bb2decd1dcf01ff5e67e0e9f77654a0
Author: Javier <email at localhost>
Date: Fri Sep 25 18:03:39 2020 +0200
Preliminary support for frenchspacing with ini's. Option ini -> provide.
>---------------------------------------------------------------
8cb5c3f80bb2decd1dcf01ff5e67e0e9f77654a0
README.md | 4 ++--
babel.dtx | 50 ++++++++++++++++++++++++++++++++++++++++++--------
babel.ins | 2 +-
babel.pdf | Bin 806523 -> 808697 bytes
bbcompat.dtx | 2 +-
5 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
index 3a323ce..5550254 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Babel 3.48.2139
+## Babel 3.48.2141
This package manages culturally-determined typographical (and other)
rules, and hyphenation patterns for a wide range of languages. Many
@@ -42,11 +42,11 @@ Bugs related to specific languages are best reported to their
respective authors.
### Latest changes
-
```
3.49 2020-09-22
- Allow standard LaTeX syntax to recognize locales based on ini
files in the most common cases.
+ - [[frenchspacing in ini files.]]
- Fixes:
- layout.lists=off didn't work (#94)
diff --git a/babel.dtx b/babel.dtx
index ae0346e..c975c96 100644
--- a/babel.dtx
+++ b/babel.dtx
@@ -31,7 +31,7 @@
%
% \iffalse
%<*filedriver>
-\ProvidesFile{babel.dtx}[2020/09/23 v3.48.2139 The Babel package]
+\ProvidesFile{babel.dtx}[2020/09/25 v3.48.2141 The Babel package]
\documentclass{ltxdoc}
\GetFileInfo{babel.dtx}
\usepackage{fontspec}
@@ -4744,8 +4744,8 @@ help from Bernd Raichle, for which I am grateful.
% \section{Tools}
%
% \begin{macrocode}
-%<<version=3.48.2139>>
-%<<date=2020/09/23>>
+%<<version=3.48.2141>>
+%<<date=2020/09/25>>
% \end{macrocode}
%
% \textbf{Do not use the following macros in \texttt{ldf} files. They
@@ -5279,7 +5279,7 @@ help from Bernd Raichle, for which I am grateful.
\ifx\@empty#2%
\edef\bbl at tempc{\ifx\bbl at tempc\@empty\else\bbl at tempc,\fi#1}%
\else
- \in@{,ini,}{,#1,}%
+ \in@{,provide,}{,#1,}%
\ifin@
\edef\bbl at tempc{%
\ifx\bbl at tempc\@empty\else\bbl at tempc,\fi#1.\bbl at tempb#2}%
@@ -5318,9 +5318,9 @@ help from Bernd Raichle, for which I am grateful.
\newif\ifbbl at single
\DeclareOption{selectors=off}{\bbl at singletrue}
\chardef\bbl at iniflag\z@
-\DeclareOption{ini=*}{\chardef\bbl at iniflag\@ne} % main -> +1
-\DeclareOption{ini.+=*}{\chardef\bbl at iniflag\tw@} % add = 2
-\DeclareOption{ini.*=*}{\chardef\bbl at iniflag\thr@@} % add + main
+\DeclareOption{provide=*}{\chardef\bbl at iniflag\@ne} % main -> +1
+\DeclareOption{provide+=*}{\chardef\bbl at iniflag\tw@} % add = 2
+\DeclareOption{provide*=*}{\chardef\bbl at iniflag\thr@@} % add + main
<@More package options@>
% \end{macrocode}
%
@@ -7358,10 +7358,37 @@ help from Bernd Raichle, for which I am grateful.
\fi
\fi
\bbl at esphack
+ % (non)french spacing (1/2) save current values
+ \def\bbl at elt##1##2##3{\sfcode`##1=\the\sfcode`##1\relax}%
+ \edef\bbl at fs@presave{\bbl at fs@chars}%
+ %\show\bbl at fs@presave
% switch extras
\bbl at usehooks{beforeextras}{}%
\csname extras#1\endcsname\relax
\bbl at usehooks{afterextras}{}%
+ % (non)french spacing (2/2) set new values
+ \bbl at ifunset{bbl at frspc@#1}{}%
+ {\edef\bbl at tempa{\bbl at cl{frspc}}%
+ \edef\bbl at tempa{\expandafter\@car\bbl at tempa\@nil}%
+ \if u\bbl at tempa % do nothing
+ \else\if n\bbl at tempa % non french
+ \bbl at fs@presave % ignore settings in extras
+ \def\bbl at elt##1##2##3{%
+ \ifnum\sfcode`##1=##2\relax
+ \babel at savevariable{\sfcode`##1}%
+ \sfcode`##1=##3\relax
+ \fi}%
+ \bbl at fs@chars
+ \else\if y\bbl at tempa % french
+ \bbl at fs@presave % ignore settings in extras
+ \def\bbl at elt##1##2##3{%
+ \ifnum\sfcode`##1=##3\relax
+ \babel at savevariable{\sfcode`##1}%
+ \sfcode`##1=##2\relax
+ \fi}%
+ \bbl at fs@chars
+ \fi\fi\fi
+ }%
% > babel-ensure
% > babel-sh-<short>
% > babel-bidi
@@ -9279,6 +9306,12 @@ help from Bernd Raichle, for which I am grateful.
\let\bbl at nonfrenchspacing\nonfrenchspacing
\fi}
\let\bbl at nonfrenchspacing\nonfrenchspacing
+%
+\let\bbl at elt\relax
+\edef\bbl at fs@chars{%
+ \bbl at elt{\string.}\@m{3000}\bbl at elt{\string?}\@m{3000}%
+ \bbl at elt{\string!}\@m{3000}\bbl at elt{\string:}\@m{2000}%
+ \bbl at elt{\string;}\@m{1500}\bbl at elt{\string,}\@m{1250}}
% \end{macrocode}
%
% \end{macro}
@@ -11090,7 +11123,8 @@ help from Bernd Raichle, for which I am grateful.
\bbl at exportkey{hyotl}{typography.hyphenate.other.locale}{}%
\bbl at exportkey{hyots}{typography.hyphenate.other.script}{}%
\bbl at exportkey{intsp}{typography.intraspace}{}%
- \bbl at exportkey{jstfy}{typography.justify}{w}%
+ \bbl at exportkey{jstfy}{typography.justify}{w}% TODO. Unused?
+ \bbl at exportkey{frspc}{typography.frenchspacing}{u}% unset
\bbl at exportkey{chrng}{characters.ranges}{}%
\bbl at exportkey{dgnat}{numbers.digits.native}{}%
\bbl at exportkey{rqtex}{identification.require.babel}{}%
diff --git a/babel.ins b/babel.ins
index bb62a40..94a4720 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{2020/09/23}
+\def\filedate{2020/09/25}
\def\batchfile{babel.ins}
\input docstrip.tex
diff --git a/babel.pdf b/babel.pdf
index 4ecce21..023bd60 100644
Binary files a/babel.pdf and b/babel.pdf differ
diff --git a/bbcompat.dtx b/bbcompat.dtx
index 61b7e52..91a0f6b 100644
--- a/bbcompat.dtx
+++ b/bbcompat.dtx
@@ -30,7 +30,7 @@
%
% \iffalse
%<*dtx>
-\ProvidesFile{bbcompat.dtx}[2020/09/23 v3.48.2139]
+\ProvidesFile{bbcompat.dtx}[2020/09/25 v3.48.2141]
%</dtx>
%
%% File 'bbcompat.dtx'
More information about the latex3-commits
mailing list.