[latex3-commits] [git/LaTeX3-latex3-latex2e] luatex-softhyphen: Merge branch 'develop' into luatex-softhyphen (e68fd0e3)
Frank Mittelbach
frank.mittelbach at latex-project.org
Mon May 25 18:30:29 CEST 2020
Repository : https://github.com/latex3/latex2e
On branch : luatex-softhyphen
Link : https://github.com/latex3/latex2e/commit/e68fd0e34b2a21eaae36e9545292fff970b802fa
>---------------------------------------------------------------
commit e68fd0e34b2a21eaae36e9545292fff970b802fa
Merge: f894b2ae 54fbc3ae
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Mon May 25 18:30:29 2020 +0200
Merge branch 'develop' into luatex-softhyphen
# Conflicts:
# base/changes.txt
# base/doc/ltnews32.tex
# base/ltdefns.dtx
fixed guards in release control
fixed test files
adjusted documentation
>---------------------------------------------------------------
e68fd0e34b2a21eaae36e9545292fff970b802fa
base/changes.txt | 12 +
base/doc/ltnews32.tex | 84 +-
base/doc/usrguide.tex | 8 +-
base/ltdefns.dtx | 27 +-
base/ltfssaxes.dtx | 13 +-
base/ltfssini.dtx | 159 +-
base/testfiles/github-0335.lvt | 17 +
base/testfiles/github-0335.tlg | 5 +
base/testfiles/github-0336.lvt | 41 +
.../{github-0022b.tlg => github-0336.tlg} | 18 +-
base/testfiles/github-robust-0123.luatex.tlg | 12 +-
base/testfiles/github-robust-0123.tlg | 12 +-
base/testfiles/github-robust-0123.xetex.tlg | 12 +-
.../tlb-latexrelease-rollback-003-often.luatex.tlg | 10 +
.../tlb-latexrelease-rollback-003-often.tlg | 10 +
.../tlb-latexrelease-rollback-003-often.xetex.tlg | 10 +
base/testfiles/tlb-rollback-004-often.luatex.tlg | 6 +-
base/testfiles/tlb-rollback-004-often.tlg | 5 +
base/testfiles/tlb-rollback-004-often.xetex.tlg | 5 +
base/testfiles/tlcs01b.luatex.tlg | 4 +-
base/testfiles/tlcs01b.tlg | 4 +-
base/testfiles/tlcs01r.tlg | 4 +-
base/testfiles/tlxs01b.tlg | 4 +-
base/testfiles/tlxs01r.tlg | 4 +-
required/tools/changes.txt | 6 +
required/tools/testfiles/github-0223.lvt | 59 +
required/tools/testfiles/github-0223.tlg | 12 +
required/tools/xr.dtx | 13 +-
texmf/tex/latex/l3kernel/expl3-code.tex | 245 ++-
texmf/tex/latex/l3kernel/expl3-generic.tex | 2 +-
texmf/tex/latex/l3kernel/expl3.ltx | 2 +-
texmf/tex/latex/l3kernel/expl3.sty | 2 +-
.../tex/latex/l3packages/xparse/xparse-generic.tex | 2283 ++++++++++++++++++++
.../xparse/xparse.ltx} | 25 +-
texmf/tex/latex/l3packages/xparse/xparse.sty | 172 ++
35 files changed, 3152 insertions(+), 155 deletions(-)
diff --cc base/changes.txt
index 3c0c4825,f14ff1dd..6c37210a
--- a/base/changes.txt
+++ b/base/changes.txt
@@@ -6,11 -6,18 +6,23 @@@ completeness or accuracy and it contain
are not part of the distribution.
================================================================================
+ 2020-05-19 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * ltfssini.dtx (section{Custom series settings for main document families}):
+ Added \IfFontSeriesContextTF so that it is possible to reliably
+ detect the current font series context (gh/335)
+
+ 2020-05-15 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * ltdefns.dtx (subsection{Initex initialisations}):
+ Allow \par in the argument of \typeout and turn it into an empty line
+ if expanded, if not it remains \par (gh/335)
+
+2020-05-11 Marcel Krüger <Marcel.Krueger at latex-project.org>
+
+ * ltdefns.dtx:
+ Use primitive \- with LuaTeX
+
2020-05-07 Ulrike Fischer <Ulrike.Fischer at latex-project.org>
* ltxref.dtx:
diff --cc base/doc/ltnews32.tex
index a566eebf,df908d7d..65e7787e
--- a/base/doc/ltnews32.tex
+++ b/base/doc/ltnews32.tex
@@@ -409,29 -456,17 +456,41 @@@ having to patch \cs{refstepcounter}
\githubissue{300}
+\subsection{Add support for Unicode soft hyphens}
+
+For a long time, the UTF-8 option for \pkg{inputenc} made the Unicode
+soft hyphen character (U+00AD) an alias for the \LaTeX\ soft hyphen
+\cs{-}. The Unicode engines \XeTeX{} and \LuaTeX{} behaved
+different though: They either ignored U+00AD or interpreted it as an
+unconditional hyphen. This inconsistency is fixed now and \LaTeX{}
+always treats \texttt{U+00AD} as \cs{-}.
+%
+\githubissue{323}
+
+
+
+\subsection{Native Lua\TeX\ behaviour for \cs{-}}
+
+\LaTeX\ changes \cs{-} to add a discretionary hyphen even if \cs{hyphenchar}
+is set to $-1$. This change is not necessary under Lua\TeX\ because in there
+\cs{-} is not affected by \cs{hyphenchar} in the first place. Therefore this
+behaviour has been changed to ensure that Lua\TeX's (language specific)
+hyphenation characters are respected by \cs{-}.
++%
++\githubissue{323}
++
+ \subsection{Allow \cs{par} commands inside \cs{typeout}}
+
+ \cs{typeout} used to choke when seeing an empty line or a \cs{par}
+ command in its argument. However, sometimes it is used to display
+ arbitrary user input or code (wrapped, for example, in
+ \cs{unexpanded}) which may contain explicit \cs{par} commands. This is
+ now allowed.
+ %
+ \githubissue{335}
+
\section{Changes to packages in the \pkg{graphics} category}
\subsection{Generate a warning if existing color definition is changed}
@@@ -476,7 -511,13 +535,13 @@@ in such documents
%
\githubissue{297}
-\subsection{\pkg{xr}:Support for spaces in filenames}
++\subsection{\pkg{xr}: Support for spaces in filenames}
+ The commannd \cs{externaldocument}, provided by \pkg{xr}, now also
+ supports filenames with spaces, just like \cs{include} and
+ \cs{includeonly}.
+ %
+ \githubissue{223}
\section{Changes to packages in the \pkg{amsmath} category}
@@@ -539,7 -580,9 +604,6 @@@ For further details take a look at the
documentation~\cite{32:babel}.
-
-
--
\begin{thebibliography}{9}
\fontsize{9.3}{11.3}\selectfont
diff --cc base/ltdefns.dtx
index 8a6f424a,c7557cd5..d10479a5
--- a/base/ltdefns.dtx
+++ b/base/ltdefns.dtx
@@@ -1602,40 -1616,24 +1618,41 @@@
% \end{macrocode}
%
% \begin{macrocode}
+%</2ekernel>
- %<latexrelease>\IncludeInRelease{2020/05/11}{\-}{Use primitive \- in Lua\LaTeX}%
++%<latexrelease>\IncludeInRelease{2020/10/01}{\-}{Use primitive \- in Lua\LaTeX}%
%<*2ekernel|latexrelease>
-\DeclareRobustCommand{\-}{%
- \discretionary{%
- \char \ifnum\hyphenchar\font<\z@
- \defaulthyphenchar
- \else
- \hyphenchar\font
- \fi
- }{}{}%
-}
-\let\@dischyph=\-
+\ifx\directlua\@undefined
+ \DeclareRobustCommand{\-}{%
+ \discretionary{%
+ \char \ifnum\hyphenchar\font<\z@
+ \defaulthyphenchar
+ \else
+ \hyphenchar\font
+ \fi
+ }{}{}%
+ }
- %<latexrelease>\else \let\-\@@disc
++\else
++ \let\-\@@disc
+\fi
%</2ekernel|latexrelease>
%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2017/04/15}{\-}{Use \hyphenchar in \-}%
+%<latexrelease>\DeclareRobustCommand{\-}{%
+%<latexrelease> \discretionary{%
+%<latexrelease> \char \ifnum\hyphenchar\font<\z@
+%<latexrelease> \defaulthyphenchar
+%<latexrelease> \else
+%<latexrelease> \hyphenchar\font
+%<latexrelease> \fi
+%<latexrelease> }{}{}%
+%<latexrelease>}
+%<latexrelease>\EndIncludeInRelease
%<latexrelease>\IncludeInRelease{0000/00/00}{\-}{Use \hyphenchar in \-}%
%<latexrelease>\def\-{\discretionary{-}{}{}}
-%<latexrelease>\let\@dischyph=\-
%<latexrelease>\EndIncludeInRelease
+%<*2ekernel|latexrelease>
+\let\@dischyph=\-
+%</2ekernel|latexrelease>
%<*2ekernel>
% \end{macrocode}
% \end{macro}
diff --cc base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index 76dd481d,0c6114aa..fc3fec0b
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@@ -16,6 -18,6 +18,7 @@@ Applying: [....-..-..] \MakeRobust on
Applying: [....-..-..] Undo robustness on input line ....
Skipping: [....-..-..] Leave commands undefined in \@ifundefined on input line ....
Applying: [....-..-..] Leave commands undefined in \@ifundefined on input line ....
++Skipping: [....-..-..] Use primitive \- in Lua\LaTeX on input line ....
Skipping: [....-..-..] Use \hyphenchar in \- on input line ....
Applying: [....-..-..] Use \hyphenchar in \- on input line ....
Skipping: [....-..-..] Make various commands robust on input line ....
@@@ -331,6 -337,6 +338,7 @@@ Already applied: [....-..-..] \MakeRobu
Applying: [....-..-..] Undo robustness on input line ....
Applying: [....-..-..] Leave commands undefined in \@ifundefined on input line ....
Already applied: [....-..-..] Leave commands undefined in \@ifundefined on input line ....
++Skipping: [....-..-..] Use primitive \- in Lua\LaTeX on input line ....
Applying: [....-..-..] Use \hyphenchar in \- on input line ....
LaTeX Info: Redefining \- on input line ....
Already applied: [....-..-..] Use \hyphenchar in \- on input line ....
diff --cc base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index 274dccb7,5fb3a504..051fa843
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@@ -14,6 -16,6 +16,7 @@@ Applying: [....-..-..] \MakeRobust on
Applying: [....-..-..] Undo robustness on input line ....
Skipping: [....-..-..] Leave commands undefined in \@ifundefined on input line ....
Applying: [....-..-..] Leave commands undefined in \@ifundefined on input line ....
++Skipping: [....-..-..] Use primitive \- in Lua\LaTeX on input line ....
Skipping: [....-..-..] Use \hyphenchar in \- on input line ....
Applying: [....-..-..] Use \hyphenchar in \- on input line ....
Skipping: [....-..-..] Make various commands robust on input line ....
@@@ -323,6 -329,6 +330,7 @@@ Already applied: [....-..-..] \MakeRobu
Applying: [....-..-..] Undo robustness on input line ....
Applying: [....-..-..] Leave commands undefined in \@ifundefined on input line ....
Already applied: [....-..-..] Leave commands undefined in \@ifundefined on input line ....
++Skipping: [....-..-..] Use primitive \- in Lua\LaTeX on input line ....
Applying: [....-..-..] Use \hyphenchar in \- on input line ....
LaTeX Info: Redefining \- on input line ....
Already applied: [....-..-..] Use \hyphenchar in \- on input line ....
diff --cc base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
index 3a474b4e,312c4028..7d00f714
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@@ -14,6 -16,6 +16,7 @@@ Applying: [....-..-..] \MakeRobust on
Applying: [....-..-..] Undo robustness on input line ....
Skipping: [....-..-..] Leave commands undefined in \@ifundefined on input line ....
Applying: [....-..-..] Leave commands undefined in \@ifundefined on input line ....
++Skipping: [....-..-..] Use primitive \- in Lua\LaTeX on input line ....
Skipping: [....-..-..] Use \hyphenchar in \- on input line ....
Applying: [....-..-..] Use \hyphenchar in \- on input line ....
Skipping: [....-..-..] Make various commands robust on input line ....
@@@ -332,6 -338,6 +339,7 @@@ Already applied: [....-..-..] \MakeRobu
Applying: [....-..-..] Undo robustness on input line ....
Applying: [....-..-..] Leave commands undefined in \@ifundefined on input line ....
Already applied: [....-..-..] Leave commands undefined in \@ifundefined on input line ....
++Skipping: [....-..-..] Use primitive \- in Lua\LaTeX on input line ....
Applying: [....-..-..] Use \hyphenchar in \- on input line ....
LaTeX Info: Redefining \- on input line ....
Already applied: [....-..-..] Use \hyphenchar in \- on input line ....
diff --cc base/testfiles/tlb-rollback-004-often.luatex.tlg
index 8840e86b,efdf9902..cf204b50
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@@ -13,8 -15,8 +15,8 @@@ Already applied: [....-..-..] \MakeRobu
Applying: [....-..-..] Undo robustness on input line ....
Applying: [....-..-..] Leave commands undefined in \@ifundefined on input line ....
Already applied: [....-..-..] Leave commands undefined in \@ifundefined on input line ....
++Skipping: [....-..-..] Use primitive \- in Lua\LaTeX on input line ....
Applying: [....-..-..] Use \hyphenchar in \- on input line ....
--LaTeX Info: Redefining \- on input line ....
Already applied: [....-..-..] Use \hyphenchar in \- on input line ....
Applying: [....-..-..] Make various commands robust on input line ....
LaTeX Info: The control sequence `\allowbreak' is already robust on input line ....
diff --cc base/testfiles/tlb-rollback-004-often.tlg
index 5f32c231,66e679db..89b69839
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@@ -11,6 -13,6 +13,7 @@@ Already applied: [....-..-..] \MakeRobu
Applying: [....-..-..] Undo robustness on input line ....
Applying: [....-..-..] Leave commands undefined in \@ifundefined on input line ....
Already applied: [....-..-..] Leave commands undefined in \@ifundefined on input line ....
++Skipping: [....-..-..] Use primitive \- in Lua\LaTeX on input line ....
Applying: [....-..-..] Use \hyphenchar in \- on input line ....
LaTeX Info: Redefining \- on input line ....
Already applied: [....-..-..] Use \hyphenchar in \- on input line ....
diff --cc base/testfiles/tlb-rollback-004-often.xetex.tlg
index 0fd10b12,328dd37b..ec43c985
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@@ -11,6 -13,6 +13,7 @@@ Already applied: [....-..-..] \MakeRobu
Applying: [....-..-..] Undo robustness on input line ....
Applying: [....-..-..] Leave commands undefined in \@ifundefined on input line ....
Already applied: [....-..-..] Leave commands undefined in \@ifundefined on input line ....
++Skipping: [....-..-..] Use primitive \- in Lua\LaTeX on input line ....
Applying: [....-..-..] Use \hyphenchar in \- on input line ....
LaTeX Info: Redefining \- on input line ....
Already applied: [....-..-..] Use \hyphenchar in \- on input line ....
More information about the latex3-commits
mailing list.