[latex3-commits] [git/LaTeX3-latex3-latex2e] textcomp: Merge branch 'nfssaxes' into textcomp (549e8b5a)
Frank Mittelbach
frank.mittelbach at latex-project.org
Fri Dec 20 15:28:38 CET 2019
Repository : https://github.com/latex3/latex2e
On branch : textcomp
Link : https://github.com/latex3/latex2e/commit/549e8b5aa5e3c079c7fe22451dbd8071ef2d45cb
>---------------------------------------------------------------
commit 549e8b5aa5e3c079c7fe22451dbd8071ef2d45cb
Merge: add46630 f36b92b2
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Fri Dec 20 15:28:38 2019 +0100
Merge branch 'nfssaxes' into textcomp
# Conflicts resolved:
# base/testfiles/tlb1214.tlg
# base/testfiles/tlb2133.luatex.tlg
# base/testfiles/tlb2133.xetex.tlg
>---------------------------------------------------------------
549e8b5aa5e3c079c7fe22451dbd8071ef2d45cb
base/00-TODO-nfssaxes.tex | 58 +
base/changes.txt | 36 +
base/cmfonts.fdd | 10 +-
{required/tools => base}/config-search.lua | 3 +-
base/doc.dtx | 7 +-
base/doc/ltnews31.tex | 215 +++-
base/doc/source2e.tex | 2 +
base/fontdef.dtx | 37 +-
base/format.ins | 1 +
base/ltfinal.dtx | 18 +
base/ltfntcmd.dtx | 31 +-
base/ltfssaxes.dtx | 1191 ++++++++++++++++++++
base/ltfssbas.dtx | 154 ++-
base/ltfssini.dtx | 781 ++++++++++++-
base/ltoutenc.dtx | 17 +-
base/ltvers.dtx | 2 +-
base/slides.dtx | 8 +-
base/testfiles-legacy/tlb-textcomp-005.tlg | 4 +-
base/testfiles-legacy/tlb-textcomp-006.lvt | 2 +
base/testfiles-legacy/tlb-textcomp-006.tlg | 2 +-
base/testfiles-search/tlb-nfssaxes-001.lvt | 74 ++
base/testfiles-search/tlb-nfssaxes-001.tlg | 56 +
base/testfiles-search/tlb-nfssaxes-002.lvt | 61 +
base/testfiles-search/tlb-nfssaxes-002.tlg | 35 +
base/testfiles-search/tlb-nfssaxes-003.lvt | 26 +
base/testfiles-search/tlb-nfssaxes-003.tlg | 6 +
base/testfiles-search/tlb-nfssaxes-004.lvt | 75 ++
base/testfiles-search/tlb-nfssaxes-004.tlg | 43 +
base/testfiles-search/tlb-nfssaxes-005.lvt | 92 ++
base/testfiles-search/tlb-nfssaxes-005.tlg | 107 ++
base/testfiles-search/tlb-nfssaxes-006.lvt | 47 +
base/testfiles-search/tlb-nfssaxes-006.tlg | 18 +
base/testfiles-search/tlb-nfssaxes-007.lvt | 25 +
base/testfiles-search/tlb-nfssaxes-007.tlg | 7 +
base/testfiles-search/tlb-nfssaxes-008.lvt | 32 +
base/testfiles-search/tlb-nfssaxes-008.tlg | 9 +
base/testfiles/github-robust-0123.luatex.tlg | 4 +-
base/testfiles/github-robust-0123.tlg | 4 +-
base/testfiles/github-robust-0123.xetex.tlg | 4 +-
base/testfiles/tl2e3.tlg | 11 +-
base/testfiles/tlb-latexrelease-003.luatex.tlg | 40 +-
base/testfiles/tlb-latexrelease-003.tlg | 40 +-
base/testfiles/tlb-latexrelease-003.xetex.tlg | 40 +-
base/testfiles/tlb0130.lvt | 2 +-
base/testfiles/tlb2133.luatex.tlg | 117 +-
base/testfiles/tlb2133.lvt | 25 +-
base/testfiles/tlb2133.tlg | 112 +-
base/testfiles/tlb2133.xetex.tlg | 112 +-
base/testfiles/tnfss3.tlg | 11 +-
.../amsmath/testfiles-TU/tlb-utex-004.luatex.tlg | 1 +
.../amsmath/testfiles-TU/tlb-utex-004.xetex.tlg | 1 +
.../amsmath/testfiles-TU/tlb-utex-005.luatex.tlg | 1 +
.../amsmath/testfiles-TU/tlb-utex-005.xetex.tlg | 1 +
support/texlive.sh | 1 +
54 files changed, 3624 insertions(+), 195 deletions(-)
diff --cc base/ltvers.dtx
index 4782d77f,775f602e..ced32296
--- a/base/ltvers.dtx
+++ b/base/ltvers.dtx
@@@ -125,7 -125,7 +125,7 @@@
% intended to help help us internally when we locally install a
% format out of some development branch.
% \begin{macrocode}
- \edef\development at branch@name{development \the\year-\the\month-\the\day}
-\edef\development at branch@name{nfssaxes \the\year-\the\month-\the\day}
++\edef\development at branch@name{textcomp \the\year-\the\month-\the\day}
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --cc base/testfiles-legacy/tlb-textcomp-005.tlg
index 181cc8ab,00000000..80ff3a6c
mode 100644,000000..100644
--- a/base/testfiles-legacy/tlb-textcomp-005.tlg
+++ b/base/testfiles-legacy/tlb-textcomp-005.tlg
@@@ -1,65 -1,0 +1,65 @@@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+needs path search - not done
+LaTeX Info: Symbol \textdollaroldstyle not provided by
+ font family Alegreya-LF in TS1 encoding.
+ Default family used instead on input line ....
+LaTeX Info: Symbol \textcentoldstyle not provided by
+ font family Alegreya-LF in TS1 encoding.
+ Default family used instead on input line ....
+LaTeX Font Info: Trying to load font information for OT1+AlegreyaSans-LF on input line ....
- LaTeX Font Info: No file OT1AlegreyaSans-LF.fd. on input line ....
++No file OT1AlegreyaSans-LF.fd.
+LaTeX Font Warning: Font shape `OT1/AlegreyaSans-LF/m/n' undefined
+(Font) using `OT1/cmr/m/n' instead on input line ....
+LaTeX Info: Symbol \textdollaroldstyle not provided by
+ font family AlegreyaSans-LF in TS1 encoding.
+ Default family used instead on input line ....
+LaTeX Font Info: Trying to load font information for TS1+cmss on input line ....
+LaTeX Info: Symbol \textcentoldstyle not provided by
+ font family AlegreyaSans-LF in TS1 encoding.
+ Default family used instead on input line ....
+LaTeX Font Info: Trying to load font information for OT1+AlgolRevived-TLF on input line ....
- LaTeX Font Info: No file OT1AlgolRevived-TLF.fd. on input line ....
++No file OT1AlgolRevived-TLF.fd.
+LaTeX Font Warning: Font shape `OT1/AlgolRevived-TLF/m/n' undefined
+(Font) using `OT1/cmr/m/n' instead on input line ....
+LaTeX Info: Symbol \textdollaroldstyle not provided by
+ font family AlgolRevived-TLF in TS1 encoding.
+ Default family used instead on input line ....
+LaTeX Font Info: Trying to load font information for TS1+cmtt on input line ....
+LaTeX Info: Symbol \textcentoldstyle not provided by
+ font family AlgolRevived-TLF in TS1 encoding.
+ Default family used instead on input line ....
+Completed box being shipped out [1]
+\vbox(633.0+0.0)x407.0
+.\glue 16.0
+.\vbox(617.0+0.0)x345.0, shifted 62.0
+..\vbox(12.0+0.0)x345.0, glue set 12.0fil
+...\glue 0.0 plus 1.0fil
+...\hbox(0.0+0.0)x345.0
+..\glue 25.0
+..\glue(\lineskip) 0.0
+..\vbox(550.0+0.0)x345.0, glue set 539.94232fil
+...\write-{}
+...\glue(\topskip) 2.50183
+...\hbox(7.49817+1.11084)x345.0, glue set 297.28577fil
+....\hbox(0.0+0.0)x15.0
+....\TS1/cmr/m/n/10 ^^8a
+....\TS1/cmr/m/n/10 ^^8b
+....\TS1/cmss/m/n/10 ^^8a
+....\TS1/cmss/m/n/10 ^^8b
+....\TS1/cmtt/m/n/10 ^^8a
+....\TS1/cmtt/m/n/10 ^^8b
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue -1.11084
+...\glue 0.0 plus 1.0fil
+...\glue 0.0
+...\glue 0.0 plus 0.0001fil
+..\glue(\baselineskip) 23.55556
+..\hbox(6.44444+0.0)x345.0, glue set 170.0fil
+...\glue 0.0 plus 1.0fil
+...\OT1/Alegreya-LF/m/n/10 1
+...\glue 0.0 plus 1.0fil
+(tlb-textcomp-005.aux)
+LaTeX Font Warning: Some font shapes were not available, defaults substituted.
diff --cc base/testfiles-legacy/tlb-textcomp-006.lvt
index ec24eca7,00000000..95398a5f
mode 100644,000000..100644
--- a/base/testfiles-legacy/tlb-textcomp-006.lvt
+++ b/base/testfiles-legacy/tlb-textcomp-006.lvt
@@@ -1,31 -1,0 +1,33 @@@
+% different defaults
+
+\documentclass{article}
+
+\input{test2e}
+
+\showoutput
+
+
+\renewcommand\rmdefault{lmr}
+\renewcommand\ttdefault{lmtt}
+\DeclareEncodingSubset{TS1}{lmr} {3} % pretend LM doesn't have oldstyle
+\DeclareEncodingSubset{TS1}{lmtt} {3} % pretend LM doesn't have oldstyle
+
++% in the test suite lmtt is not available, so there is some "no file found"
++
+
+\begin{document}
+
+\START
+
+\typeout{oldstyle in cmr cmss or cmtt from TS1}
+
+ LMR + cmr \oldstylenums{123,4} % here cmr gets substituted
+
+\sffamily CMSS + cmss \oldstylenums{567.8} % this should give cmss
+
+\ttfamily LMTT + cmtt \oldstylenums{0.99} % this should give cmtt
+
+\ttfamily LMTT + oms \legacyoldstylenums{12.34} % this should now comes from OMS
+
+\end{document}
+
diff --cc base/testfiles-legacy/tlb-textcomp-006.tlg
index 4f55ea53,00000000..386ecc65
mode 100644,000000..100644
--- a/base/testfiles-legacy/tlb-textcomp-006.tlg
+++ b/base/testfiles-legacy/tlb-textcomp-006.tlg
@@@ -1,131 -1,0 +1,131 @@@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+oldstyle in cmr cmss or cmtt from TS1
+LaTeX Info: Oldstyle digits unavailable for family lmr.
+ Default oldstyle digits used instead on input line ....
+LaTeX Font Info: Trying to load font information for TS1+cmss on input line ....
+LaTeX Font Info: Trying to load font information for OT1+lmtt on input line ....
- LaTeX Font Info: No file OT1lmtt.fd. on input line ....
++No file OT1lmtt.fd.
+LaTeX Font Warning: Font shape `OT1/lmtt/m/n' undefined
+(Font) using `OT1/cmr/m/n' instead on input line ....
+LaTeX Info: Oldstyle digits unavailable for family lmtt.
+ Default oldstyle digits used instead on input line ....
+LaTeX Font Info: Trying to load font information for TS1+cmtt on input line ....
+LaTeX Font Info: Trying to load font information for OML+lmr on input line ....
+LaTeX Font Info: No file OMLlmr.fd. on input line ....
+LaTeX Font Warning: Font shape `OML/lmr/m/it' undefined
+(Font) using `OML/cmm/m/it' instead on input line ....
+Completed box being shipped out [1]
+\vbox(633.0+0.0)x407.0
+.\glue 16.0
+.\vbox(617.0+0.0)x345.0, shifted 62.0
+..\vbox(12.0+0.0)x345.0, glue set 12.0fil
+...\glue 0.0 plus 1.0fil
+...\hbox(0.0+0.0)x345.0
+..\glue 25.0
+..\glue(\lineskip) 0.0
+..\vbox(550.0+0.0)x345.0, glue set 503.94617fil
+...\write-{}
+...\glue(\topskip) 3.11125
+...\hbox(6.88875+1.94397)x345.0, glue set 249.97766fil
+....\hbox(0.0+0.0)x15.0
+....\OT1/lmr/m/n/10 L
+....\OT1/lmr/m/n/10 M
+....\OT1/lmr/m/n/10 R
+....\glue 3.33333 plus 1.66498 minus 1.11221
+....\OT1/lmr/m/n/10 +
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/lmr/m/n/10 c
+....\OT1/lmr/m/n/10 m
+....\OT1/lmr/m/n/10 r
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\TS1/cmr/m/n/10 1
+....\TS1/cmr/m/n/10 2
+....\TS1/cmr/m/n/10 3
+....\TS1/cmr/m/n/10 ,
+....\TS1/cmr/m/n/10 4
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\baselineskip) 3.11159
+...\hbox(6.94444+1.94397)x345.0, glue set 243.14435fil
+....\hbox(0.0+0.0)x15.0
+....\OT1/cmss/m/n/10 C
+....\OT1/cmss/m/n/10 M
+....\OT1/cmss/m/n/10 S
+....\OT1/cmss/m/n/10 S
+....\glue 3.33333 plus 1.66498 minus 1.11221
+....\OT1/cmss/m/n/10 +
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmss/m/n/10 c
+....\OT1/cmss/m/n/10 m
+....\OT1/cmss/m/n/10 s
+....\OT1/cmss/m/n/10 s
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\TS1/cmss/m/n/10 5
+....\TS1/cmss/m/n/10 6
+....\TS1/cmss/m/n/10 7
+....\TS1/cmss/m/n/10 .
+....\TS1/cmss/m/n/10 8
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\baselineskip) 3.22272
+...\hbox(6.83331+2.22168)x345.0, glue set 241.08836fil
+....\hbox(0.0+0.0)x15.0
+....\OT1/lmtt/m/n/10 L
+....\OT1/lmtt/m/n/10 M
+....\OT1/lmtt/m/n/10 T
+....\OT1/lmtt/m/n/10 T
+....\glue 3.33333 plus 1.66498 minus 1.11221
+....\OT1/lmtt/m/n/10 +
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/lmtt/m/n/10 c
+....\OT1/lmtt/m/n/10 m
+....\kern-0.27779
+....\OT1/lmtt/m/n/10 t
+....\OT1/lmtt/m/n/10 t
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\TS1/cmtt/m/n/10 0
+....\TS1/cmtt/m/n/10 .
+....\TS1/cmtt/m/n/10 9
+....\TS1/cmtt/m/n/10 9
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\baselineskip) 2.945
+...\hbox(6.83331+1.94444)x345.0, glue set 240.08316fil
+....\hbox(0.0+0.0)x15.0
+....\OT1/lmtt/m/n/10 L
+....\OT1/lmtt/m/n/10 M
+....\OT1/lmtt/m/n/10 T
+....\OT1/lmtt/m/n/10 T
+....\glue 3.33333 plus 1.66498 minus 1.11221
+....\OT1/lmtt/m/n/10 +
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/lmtt/m/n/10 o
+....\OT1/lmtt/m/n/10 m
+....\OT1/lmtt/m/n/10 s
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OML/cmm/m/it/10 1
+....\OML/cmm/m/it/10 2
+....\OML/cmm/m/it/10 .
+....\OML/cmm/m/it/10 3
+....\OML/cmm/m/it/10 4
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue -1.94444
+...\glue 0.0 plus 1.0fil
+...\glue 0.0
+...\glue 0.0 plus 0.0001fil
+..\glue(\baselineskip) 23.70276
+..\hbox(6.29724+0.0)x345.0, glue set 170.0fil
+...\glue 0.0 plus 1.0fil
+...\OT1/lmr/m/n/10 1
+...\glue 0.0 plus 1.0fil
+(tlb-textcomp-006.aux)
+LaTeX Font Warning: Some font shapes were not available, defaults substituted.
More information about the latex3-commits
mailing list