diff --git a/base/textcomp-adds.tex b/base/textcomp-adds.tex index 56bf32360..e627691e6 100644 --- a/base/textcomp-adds.tex +++ b/base/textcomp-adds.tex @@ -158,7 +158,6 @@ \DeclareTextSymbolDefault{\textascendercompwordmark}{TS1} -\DeclareTextSymbolDefault{\textbardbl}{TS1} %------------------ sub-enc 1 (drop things that don't work in lmr) @@ -172,7 +171,6 @@ \DeclareTextCommandDefault{\t} {\CheckEncodingSubset\UseTextAccent{TS1}{\UseTextAccent{OML}}1\t} - %------------------ sub-enc 2 (majority of new OTF fonts via autoinst) \DeclareTextCommandDefault{\capitalacute} {\tc@check@accent2\capitalacute} @@ -289,7 +287,7 @@ \DeclareTextCommandDefault{\textwon} {\tc@check@symbol4\textwon} -%------------------ sub-enc 5 () +%------------------ sub-enc 5 (most older PS fonts (they produce tofu if a symbol is missing) \DeclareTextCommandDefault{\textflorin} {\tc@check@symbol5\textflorin} \DeclareTextCommandDefault{\textnumero} {\tc@check@symbol5\textnumero} @@ -298,30 +296,37 @@ -%------------------ sub-enc 4 () - - -\DeclareTextCommandDefault{\textfractionsolidus}{\tc@check@symbol3\textfractionsolidus} -\DeclareTextCommandDefault{\textblank} {\tc@check@symbol4\textblank} -\DeclareTextCommandDefault{\textinterrobangdown}{\tc@check@symbol4\textinterrobangdown} -\DeclareTextCommandDefault{\textinterrobang} {\tc@check@symbol4\textinterrobang} +%------------------ sub-enc 6 +\DeclareTextCommandDefault{\textfractionsolidus}{\tc@check@symbol6\textfractionsolidus} +\DeclareTextCommandDefault{\textohm} {\tc@check@symbol6\textohm} +\DeclareTextCommandDefault{\textmu} {\tc@check@symbol6\textmu} +\DeclareTextCommandDefault{\textminus} {\tc@check@symbol6\textminus} -%------------------ sub-enc 5 (older PS fonts) -\DeclareTextCommandDefault{\textohm} {\tc@check@symbol5\textohm} -\DeclareTextCommandDefault{\textmu} {\tc@check@symbol5\textmu} +%------------------ sub-enc 7 (faked euro plus others) -%------------------ sub-enc 6 (conservative guess) +\DeclareTextCommandDefault{\textblank} {\tc@check@symbol{7}\textblank} +\DeclareTextCommandDefault{\textinterrobangdown}{\tc@check@symbol{7}\textinterrobangdown} +\DeclareTextCommandDefault{\textinterrobang} {\tc@check@symbol{7}\textinterrobang} \DeclareTextCommandDefault{\texteuro} - {\CheckEncodingSubset\UseTextSymbol{TS1}\tc@fake@euro6\texteuro} %FMi fix + {\CheckEncodingSubset\UseTextSymbol{TS1}\tc@fake@euro{7}\texteuro} -\DeclareTextCommandDefault{\textminus} {\tc@check@symbol6\textminus} % FIX +%------------------ sub-enc 9 (really most stuff missing in cochineal and AlgolRevived) + +\DeclareTextCommandDefault{\textasteriskcentered}{\tc@check@symbol{8}\textasteriskcentered} +\DeclareTextCommandDefault{\textcelsius}{\tc@check@symbol{8}\textcelsius} +\DeclareTextCommandDefault{\textonesuperior}{\tc@check@symbol{8}\textonesuperior} +\DeclareTextCommandDefault{\textthreequartersemdash}{\tc@check@symbol{8}\textthreequartersemdash} +\DeclareTextCommandDefault{\textthreesuperior}{\tc@check@symbol{8}\textthreesuperior} +\DeclareTextCommandDefault{\texttwelveudash}{\tc@check@symbol{8}\texttwelveudash} +\DeclareTextCommandDefault{\texttwosuperior}{\tc@check@symbol{8}\texttwosuperior} +\DeclareTextCommandDefault{\textbardbl}{\tc@check@symbol{8}\textbardbl} %------------------ always available or so we hope @@ -337,7 +342,7 @@ % these are the std itemize and footnote symbols originally taken from OMS -\DeclareTextSymbolDefault{\textasteriskcentered}{TS1} +%% \DeclareTextSymbolDefault{\textasteriskcentered}{TS1} % subst in sub-enc 9 below \DeclareTextSymbolDefault{\textbullet}{TS1} %0 \DeclareTextSymbolDefault{\textdaggerdbl}{TS1} \DeclareTextSymbolDefault{\textdagger}{TS1} @@ -357,16 +362,17 @@ \DeclareTextAccentDefault{\capitalcedilla}{TS1} \DeclareTextAccentDefault{\capitalogonek}{TS1} -\DeclareTextSymbolDefault{\textbrokenbar}{TS1} %0 -\DeclareTextSymbolDefault{\textcelsius}{TS1} -\DeclareTextSymbolDefault{\textcent}{TS1} %0 -\DeclareTextSymbolDefault{\textcopyright}{TS1} %0 +%%\DeclareTextSymbolDefault{\textbardbl}{TS1} % subst in sub-enc 9 below +\DeclareTextSymbolDefault{\textbrokenbar}{TS1} +%%\DeclareTextSymbolDefault{\textcelsius}{TS1} % subst in sub-enc 9 below +\DeclareTextSymbolDefault{\textcent}{TS1} +\DeclareTextSymbolDefault{\textcopyright}{TS1} \DeclareTextSymbolDefault{\textdegree}{TS1} \DeclareTextSymbolDefault{\textdiv}{TS1} \DeclareTextSymbolDefault{\textlnot}{TS1} \DeclareTextSymbolDefault{\textonehalf}{TS1} \DeclareTextSymbolDefault{\textonequarter}{TS1} -\DeclareTextSymbolDefault{\textonesuperior}{TS1} +%%\DeclareTextSymbolDefault{\textonesuperior}{TS1} % subst in sub-enc 9 below \DeclareTextSymbolDefault{\textordfeminine}{TS1} \DeclareTextSymbolDefault{\textordmasculine}{TS1} \DeclareTextSymbolDefault{\textpm}{TS1} @@ -374,13 +380,13 @@ \DeclareTextSymbolDefault{\textquotestraightbase}{TS1} \DeclareTextSymbolDefault{\textquotestraightdblbase}{TS1} \DeclareTextSymbolDefault{\textregistered}{TS1} -\DeclareTextSymbolDefault{\textthreequartersemdash}{TS1} +%%\DeclareTextSymbolDefault{\textthreequartersemdash}{TS1} % subst in sub-enc 9 below \DeclareTextSymbolDefault{\textthreequarters}{TS1} -\DeclareTextSymbolDefault{\textthreesuperior}{TS1} +%%\DeclareTextSymbolDefault{\textthreesuperior}{TS1} % subst in sub-enc 9 below \DeclareTextSymbolDefault{\texttimes}{TS1} \DeclareTextSymbolDefault{\texttrademark}{TS1} -\DeclareTextSymbolDefault{\texttwelveudash}{TS1} -\DeclareTextSymbolDefault{\texttwosuperior}{TS1} +%%\DeclareTextSymbolDefault{\texttwelveudash}{TS1} % subst in sub-enc 9 below +%%\DeclareTextSymbolDefault{\texttwosuperior}{TS1} % subst in sub-enc 9 below \DeclareTextSymbolDefault{\textyen}{TS1} @@ -475,7 +481,7 @@ % we declare the subsets of a good number of fonts in the kernel ... % the default: -\DeclareEncodingSubset{TS1}{?}{4} %FMI not sure 0/1 instead? +\DeclareEncodingSubset{TS1}{?}{1} %FMI not sure 0/1 instead? \DeclareEncodingSubset{TS1}{cmr} {0} \DeclareEncodingSubset{TS1}{cmss} {0} @@ -490,12 +496,6 @@ \DeclareEncodingSubset{TS1}{txr} {0} \DeclareEncodingSubset{TS1}{txss} {0} \DeclareEncodingSubset{TS1}{txtt} {0} -\DeclareEncodingSubset{TS1}{lmr} {0} -\DeclareEncodingSubset{TS1}{lmdh} {0} -\DeclareEncodingSubset{TS1}{lmss} {0} -\DeclareEncodingSubset{TS1}{lmssq} {0} -\DeclareEncodingSubset{TS1}{lmvtt} {0} -\DeclareEncodingSubset{TS1}{lmtt} {0} \DeclareEncodingSubset{TS1}{qhv} {0} \DeclareEncodingSubset{TS1}{qag} {0} \DeclareEncodingSubset{TS1}{qbk} {0} @@ -506,72 +506,66 @@ \DeclareEncodingSubset{TS1}{qzc} {0} \DeclareEncodingSubset{TS1}{qhvc} {0} -\DeclareEncodingSubset{TS1}{ppl} {8} -\DeclareEncodingSubset{TS1}{dayrom} {8} -\DeclareEncodingSubset{TS1}{dayroms} {8} -\DeclareEncodingSubset{TS1}{hlh} {8} -\DeclareEncodingSubset{TS1}{hls} {8} -\DeclareEncodingSubset{TS1}{hlst} {8} -\DeclareEncodingSubset{TS1}{pplx} {8} -\DeclareEncodingSubset{TS1}{pplj} {8} - -\DeclareEncodingSubset{TS1}{ptmx} {9} -\DeclareEncodingSubset{TS1}{ptmj} {9} -\DeclareEncodingSubset{TS1}{ptm} {9} -\DeclareEncodingSubset{TS1}{pcr} {9} -\DeclareEncodingSubset{TS1}{phv} {9} -\DeclareEncodingSubset{TS1}{pag} {9} -\DeclareEncodingSubset{TS1}{ul8} {9} -\DeclareEncodingSubset{TS1}{futs} {9} -\DeclareEncodingSubset{TS1}{futx} {9} -\DeclareEncodingSubset{TS1}{futj} {9} -\DeclareEncodingSubset{TS1}{ul9} {9} % (LuxiSans, one day) -\DeclareEncodingSubset{TS1}{pbk} {9} -\DeclareEncodingSubset{TS1}{pnc} {9} -\DeclareEncodingSubset{TS1}{pzc} {9} -\DeclareEncodingSubset{TS1}{bch} {9} - -\DeclareEncodingSubset{TS1}{put} {10} -\DeclareEncodingSubset{TS1}{uag} {10} -\DeclareEncodingSubset{TS1}{ugq} {10} -\DeclareEncodingSubset{TS1}{augie} {10} -\DeclareEncodingSubset{TS1}{hlct} {10} -\DeclareEncodingSubset{TS1}{hlx} {10} -\DeclareEncodingSubset{TS1}{hlce} {10} -\DeclareEncodingSubset{TS1}{hlcn} {10} -\DeclareEncodingSubset{TS1}{hlcw} {10} -\DeclareEncodingSubset{TS1}{hlcf} {10} - - - -%? \DeclareEncodingSubset{TS1}{fbb-LF} % centoldstyle +\DeclareEncodingSubset{TS1}{lmr} {1} +\DeclareEncodingSubset{TS1}{lmdh} {1} +\DeclareEncodingSubset{TS1}{lmss} {1} +\DeclareEncodingSubset{TS1}{lmssq} {1} +\DeclareEncodingSubset{TS1}{lmvtt} {1} +\DeclareEncodingSubset{TS1}{lmtt} {1} % missing TM, SM, pertenthousand for some reason + +%\DeclareEncodingSubset{TS1}{hls} {?} +%\DeclareEncodingSubset{TS1}{hlst} {?} +%\DeclareEncodingSubset{TS1}{hlct} {?} +%\DeclareEncodingSubset{TS1}{hlx} {?} +%\DeclareEncodingSubset{TS1}{hlce} {?} +%\DeclareEncodingSubset{TS1}{hlcn} {?} +%\DeclareEncodingSubset{TS1}{hlcw} {?} +%\DeclareEncodingSubset{TS1}{hlcf} {?} + +\DeclareEncodingSubset{TS1}{hlh} {2} +\DeclareEncodingSubset{TS1}{ptmx} {2} +\DeclareEncodingSubset{TS1}{ptmj} {2} +\DeclareEncodingSubset{TS1}{ul8} {2} + +\DeclareEncodingSubset{TS1}{ppl} {5} % tofu for blank interrobang/down +\DeclareEncodingSubset{TS1}{dayrom} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{dayroms} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{pplx} {5} % tofu for blank +\DeclareEncodingSubset{TS1}{pplj} {5} % tofu for blank +\DeclareEncodingSubset{TS1}{ptm} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{pcr} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{phv} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{pag} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{futs} {5} % tofu for blank, ohm +\DeclareEncodingSubset{TS1}{futx} {5} % probably (currently broken distrib) +\DeclareEncodingSubset{TS1}{futj} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{ul9} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{pbk} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{pnc} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{pzc} {5} % tofu for blank, interrobang/down, ohm +\DeclareEncodingSubset{TS1}{bch} {5} % tofu for blank, ohm + +\DeclareEncodingSubset{TS1}{put} {7} +\DeclareEncodingSubset{TS1}{uag} {7} % probably (currently broken distrib) +\DeclareEncodingSubset{TS1}{ugq} {7} +\DeclareEncodingSubset{TS1}{augie} {7} % really only missing euro + + + \DeclareEncodingSubset{TS1}{lato-LF} {0} \DeclareEncodingSubset{TS1}{opensans-LF} {0} \DeclareEncodingSubset{TS1}{tli} {0} \DeclareEncodingSubset{TS1}{cantarell-LF}{0} +\DeclareEncodingSubset{TS1}{fbb-LF} {0} % missing centoldstyle \DeclareEncodingSubset{TS1}{Alegreya-LF} {2} \DeclareEncodingSubset{TS1}{AlegreyaSans-LF} {2} -\DeclareEncodingSubset{TS1}{Cinzel-LF} {2} -\DeclareEncodingSubset{TS1}{CinzelDecorative-LF} {2} -\DeclareEncodingSubset{TS1}{CormorantGaramond-LF} {2} \DeclareEncodingSubset{TS1}{DejaVuSans-TLF} {2} \DeclareEncodingSubset{TS1}{DejaVuSansCondensed-TLF} {2} \DeclareEncodingSubset{TS1}{DejaVuSansMono-TLF} {2} \DeclareEncodingSubset{TS1}{EBGaramond-LF} {2} -\DeclareEncodingSubset{TS1}{Heuristica-TLF} {2} -\DeclareEncodingSubset{TS1}{IMFELLEnglish-TLF} {2} -\DeclareEncodingSubset{TS1}{LibreBaskerville-TLF} {2} -\DeclareEncodingSubset{TS1}{LibreCaslon-LF} {2} -\DeclareEncodingSubset{TS1}{Marcellus-LF} {2} -\DeclareEncodingSubset{TS1}{NotoSans-LF} {2} -\DeclareEncodingSubset{TS1}{NotoSansMono-TLF} {2} -\DeclareEncodingSubset{TS1}{NotoSerif-LF} {2} -\DeclareEncodingSubset{TS1}{Quattrocento-TLF} {2} -\DeclareEncodingSubset{TS1}{QuattrocentoSans-TLF} {2} \DeclareEncodingSubset{TS1}{Tempora-TLF} {2} -\DeclareEncodingSubset{TS1}{XCharter-TLF} {2} \DeclareEncodingSubset{TS1}{FiraSans-LF} {3} @@ -625,6 +619,8 @@ \DeclareEncodingSubset{TS1}{Baskervaldx-LF} {5} \DeclareEncodingSubset{TS1}{BaskervilleF-LF} {5} \DeclareEncodingSubset{TS1}{Bitter-TLF} {5} +\DeclareEncodingSubset{TS1}{Cinzel-LF} {5} +\DeclareEncodingSubset{TS1}{CinzelDecorative-LF} {5} \DeclareEncodingSubset{TS1}{Crimson-TLF} {5} \DeclareEncodingSubset{TS1}{DejaVuSerif-TLF} {5} \DeclareEncodingSubset{TS1}{DejaVuSerifCondensed-TLF} {5} @@ -646,11 +642,26 @@ \DeclareEncodingSubset{TS1}{TheanoOldStyle-TLF} {5} +\DeclareEncodingSubset{TS1}{CormorantGaramond-LF} {6} +\DeclareEncodingSubset{TS1}{Heuristica-TLF} {6} +\DeclareEncodingSubset{TS1}{IMFELLEnglish-TLF} {6} +\DeclareEncodingSubset{TS1}{LibreBaskerville-TLF} {6} +\DeclareEncodingSubset{TS1}{LibreCaslon-LF} {6} +\DeclareEncodingSubset{TS1}{Marcellus-LF} {6} +\DeclareEncodingSubset{TS1}{NotoSans-LF} {6} +\DeclareEncodingSubset{TS1}{NotoSansMono-TLF} {6} +\DeclareEncodingSubset{TS1}{NotoSerif-LF} {6} +\DeclareEncodingSubset{TS1}{Quattrocento-TLF} {6} +\DeclareEncodingSubset{TS1}{QuattrocentoSans-TLF} {6} +\DeclareEncodingSubset{TS1}{XCharter-TLF} {6} +\DeclareEncodingSubset{TS1}{erewhon-LF} {6} + -% Fix those -\DeclareEncodingSubset{TS1}{erewhon-LF} {5} -\DeclareEncodingSubset{TS1}{AlgolRevived-TLF} {7} \DeclareEncodingSubset{TS1}{Cochineal-LF} {8} +\DeclareEncodingSubset{TS1}{AlgolRevived-TLF} {8} + + +% Fix those