From 191e0ab40b0bc070312603532904889c52a7b17c Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 17 Dec 2023 03:00:48 +0000 Subject: CTAN sync 202312170300 --- macros/unicodetex/latex/fontsetup-nonfree/README | 2 +- .../doc/fontsetup-nonfree-doc.pdf | Bin 300630 -> 289785 bytes .../doc/fontsetup-nonfree-doc.tex | 4 +- .../latex/fontsetup-nonfree/fspcambria.sty | 9 ---- .../latex/fontsetup-nonfree/fsplucidaot.sty | 28 ----------- .../latex/fontsetup-nonfree/fspminion.sty | 46 ----------------- .../latex/fontsetup-nonfree/fspmsgaramondot.sty | 55 --------------------- .../latex/fontsetup-nonfree/fsppalatinoot.sty | 35 ------------- .../latex/fontsetup-nonfree/tex/fspcambria.tex | 7 +++ .../latex/fontsetup-nonfree/tex/fsplucidaot.tex | 26 ++++++++++ .../latex/fontsetup-nonfree/tex/fspminion.tex | 35 +++++++++++++ .../fontsetup-nonfree/tex/fspmsgaramondot.tex | 44 +++++++++++++++++ .../latex/fontsetup-nonfree/tex/fsppalatinoot.tex | 24 +++++++++ 13 files changed, 139 insertions(+), 176 deletions(-) delete mode 100644 macros/unicodetex/latex/fontsetup-nonfree/fspcambria.sty delete mode 100644 macros/unicodetex/latex/fontsetup-nonfree/fsplucidaot.sty delete mode 100644 macros/unicodetex/latex/fontsetup-nonfree/fspminion.sty delete mode 100644 macros/unicodetex/latex/fontsetup-nonfree/fspmsgaramondot.sty delete mode 100644 macros/unicodetex/latex/fontsetup-nonfree/fsppalatinoot.sty create mode 100644 macros/unicodetex/latex/fontsetup-nonfree/tex/fspcambria.tex create mode 100644 macros/unicodetex/latex/fontsetup-nonfree/tex/fsplucidaot.tex create mode 100644 macros/unicodetex/latex/fontsetup-nonfree/tex/fspminion.tex create mode 100644 macros/unicodetex/latex/fontsetup-nonfree/tex/fspmsgaramondot.tex create mode 100644 macros/unicodetex/latex/fontsetup-nonfree/tex/fsppalatinoot.tex (limited to 'macros/unicodetex/latex/fontsetup-nonfree') diff --git a/macros/unicodetex/latex/fontsetup-nonfree/README b/macros/unicodetex/latex/fontsetup-nonfree/README index 5a68a22041..e31a68081f 100644 --- a/macros/unicodetex/latex/fontsetup-nonfree/README +++ b/macros/unicodetex/latex/fontsetup-nonfree/README @@ -1,5 +1,5 @@ The fontsetup-nonfree package - (Version 1.02, GPL3) + (Version 2.0, GPL3) This package accompanies fontsetup, and inludes support for nonfree fonts. diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.pdf b/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.pdf index 071b87711f..89828d7b0f 100644 Binary files a/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.pdf and b/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.pdf differ diff --git a/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.tex b/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.tex index 5711b01afc..8ba3e055a9 100644 --- a/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.tex +++ b/macros/unicodetex/latex/fontsetup-nonfree/doc/fontsetup-nonfree-doc.tex @@ -9,8 +9,8 @@ \textit{by}\\[1ex] {\large Antonis Tsolomitis}\\ University of the Aegean\\ Department of Mathematics\\[1ex] - \textsc{3} May \textsc{2021}\\[1ex] - Version 1.02, \textsc{gpl3} + \textsc{14} December \textsc{2023}\\[1ex] + Version 2.0, \textsc{gpl3} \end{center} This package is part of the fontsetup package but for license issues it has been diff --git a/macros/unicodetex/latex/fontsetup-nonfree/fspcambria.sty b/macros/unicodetex/latex/fontsetup-nonfree/fspcambria.sty deleted file mode 100644 index b2947bb3d6..0000000000 --- a/macros/unicodetex/latex/fontsetup-nonfree/fspcambria.sty +++ /dev/null @@ -1,9 +0,0 @@ -%% -%% Load Cambria fonts (C) A. Tsolomitis -%% -\RequirePackage{fontspec} -\setmainfont[Contextuals=AlternateOff,BoldFont=Cambria-Bold,ItalicFont=Cambria-Italic,BoldItalicFont=Cambria-BoldItalic]{Cambria} -\RequirePackage{unicode-math} -\setmathfont{Cambria Math} - -\endinput diff --git a/macros/unicodetex/latex/fontsetup-nonfree/fsplucidaot.sty b/macros/unicodetex/latex/fontsetup-nonfree/fsplucidaot.sty deleted file mode 100644 index 2287f48685..0000000000 --- a/macros/unicodetex/latex/fontsetup-nonfree/fsplucidaot.sty +++ /dev/null @@ -1,28 +0,0 @@ -\RequirePackage{fontspec} -\setmainfont[% main font - UprightFont=LucidaBrightOT, - ItalicFont=LucidaBrightOT-Italic, - BoldFont=LucidaBrightOT-Demi, - BoldItalicFont=LucidaBrightOT-DemiItalic, - SmallCapsFeatures={Numbers=OldStyle}, - ]{LucidaBrightOT.otf} -\setsansfont[% - UprightFont=LucidaSansOT, - ItalicFont=LucidaSansOT-Italic, - BoldFont=LucidaSansOT-Demi, - BoldItalicFont=LucidaSansOT-DemiItalic, - SmallCapsFeatures={Numbers=OldStyle}, -]{LucidaSansOT.otf} -% -\setmonofont[% - UprightFont=LucidaSansTypewriterOT, - ItalicFont=LucidaSansTypewriterOT-Oblique, - BoldFont=LucidaSansTypewriterOT-Bold, - BoldItalicFont=LucidaSansTypewriterOT-BoldOblique, - SmallCapsFeatures={Numbers=OldStyle}, - ]{LucidaSansTypewriterOT.otf} -% support for OpenType math fonts: -\RequirePackage{unicode-math} -\setmathfont{LucidaBrightMathOT.otf} -\setmathfont[version=bold]{LucidaBrightMathOT-Demi.otf} - diff --git a/macros/unicodetex/latex/fontsetup-nonfree/fspminion.sty b/macros/unicodetex/latex/fontsetup-nonfree/fspminion.sty deleted file mode 100644 index 292f3dd7a2..0000000000 --- a/macros/unicodetex/latex/fontsetup-nonfree/fspminion.sty +++ /dev/null @@ -1,46 +0,0 @@ - - - -\RequirePackage{fontspec} -\defaultfontfeatures{Ligatures=TeX} -\setmainfont[SmallCapsFeatures={Numbers=OldStyle},% - NFSSFamily=MinionPro,% - ItalicFont=MinionPro-It,% - BoldFont=MinionPro-Bold,% - BoldItalicFont=MinionPro-BoldIt,% -]{MinionPro-Regular} -\setsansfont[SmallCapsFeatures={Numbers=OldStyle},% - NFSSFamily=MyriadPro,% - ItalicFont=MyriadPro-It,% - BoldFont=MyriadPro-Bold,% - BoldItalicFont=MyriadPro-BoldIt,% -]{MyriadPro-Regular} -\newfontfamily{\greekfont}[SmallCapsFont=fspmnscel,% - ItalicFont=MinionPro-It,% - BoldFont=MinionPro-Bold,% - BoldItalicFont=MinionPro-BoldIt,% -]{MinionPro-Regular} - -\newfontfamily{\defaultfont}[SmallCapsFeatures={Numbers=OldStyle},% - NFSSFamily=MinionPro,% - ItalicFont=MinionPro-It,% - BoldFont=MinionPro-Bold,% - BoldItalicFont=MinionPro-BoldIt,% -]{MinionPro-Regular} -\RequirePackage{iftex} -\ifxetex -\RequirePackage[Latin, Greek]{ucharclasses} -\setDefaultTransitions{\defaultfont}{} -\setTransitionsForLatin{\defaultfont}{} -\setTransitionsForGreek{\greekfont}{} -\else -\relax -\fi - - -\RequirePackage{unicode-math} -\setmathfont{STIXTwoMath-Regular.otf} -\setmathfont[range=\mathup/{num,latin,Latin,greek,Greek}]{MinionPro-Regular} -\setmathfont[range=\mathbfup/{num,latin,Latin,greek,Greek}]{MinionPro-Bold} -\setmathfont[range=\mathit/{num,latin,Latin,greek,Greek}]{MinionPro-It} -\setmathfont[range=\mathbfit/{num,latin,Latin,greek,Greek}]{MinionPro-BoldIt} diff --git a/macros/unicodetex/latex/fontsetup-nonfree/fspmsgaramondot.sty b/macros/unicodetex/latex/fontsetup-nonfree/fspmsgaramondot.sty deleted file mode 100644 index 5f50b8bf02..0000000000 --- a/macros/unicodetex/latex/fontsetup-nonfree/fspmsgaramondot.sty +++ /dev/null @@ -1,55 +0,0 @@ -%\RequirePackage[no-math]{fontspec} -\RequirePackage{fontspec} -\defaultfontfeatures{Ligatures=TeX} -%\RequirePackage[garamond]{mathdesign} - -\setmainfont[% - NFSSFamily=Garamond,% - ItalicFont=Garamond-Italic,% - BoldFont=Garamond-Bold,% - BoldItalicFont=Garamond-Bold,% - SlantedFont=Garamond,% - BoldSlantedFont=Garamond-Bold,% - SlantedFeatures={FakeSlant=0.25},% - BoldSlantedFeatures={FakeSlant=0.25},% -]{Garamond} -\newfontfamily{\greekfont}[% - ItalicFont=Garamond-Italic,% - BoldFont=Garamond-Bold,% - BoldItalicFont=Garamond-Bold,% - SlantedFont=Garamond,% - BoldSlantedFont=Garamond-Bold,% - SlantedFeatures={FakeSlant=0.25},% - BoldSlantedFeatures={FakeSlant=0.25},% -]{Garamond} -\newfontfamily{\defaultfont}[% - NFSSFamily=Garamond,% - ItalicFont=Garamond-Italic,% - BoldFont=Garamond-Bold,% - BoldItalicFont=Garamond-Bold,% - SlantedFont=Garamond,% - BoldSlantedFont=Garamond-Bold,% - SlantedFeatures={FakeSlant=0.25},% - BoldSlantedFeatures={FakeSlant=0.25},% -]{Garamond} - - -\RequirePackage{iftex} -\ifxetex -\RequirePackage[Latin, Greek]{ucharclasses} -\setDefaultTransitions{\defaultfont}{} -\setTransitionsForLatin{\defaultfont}{} -\setTransitionsForGreek{\greekfont}{} -\else -\relax -\fi - -\RequirePackage{unicode-math} -\setmathfont{Garamond-Math.otf} -\setmathfont[range=\mathup/{num,latin,Latin,greek,Greek}]{Garamond} -\setmathfont[range=\mathbfup/{num,latin,Latin,greek,Greek}]{Garamond-Bold} -\setmathfont[range=\mathit/{num,latin,Latin,greek,Greek}]{Garamond-Italic} -\setmathfont[range=\mathbfit/{num,latin,Latin,greek,Greek}]{Garamond-Bold} - - -\endinput diff --git a/macros/unicodetex/latex/fontsetup-nonfree/fsppalatinoot.sty b/macros/unicodetex/latex/fontsetup-nonfree/fsppalatinoot.sty deleted file mode 100644 index 48528a8880..0000000000 --- a/macros/unicodetex/latex/fontsetup-nonfree/fsppalatinoot.sty +++ /dev/null @@ -1,35 +0,0 @@ -\RequirePackage{fontspec} -\defaultfontfeatures{Ligatures=TeX} -\setmainfont[SmallCapsFeatures={Numbers=OldStyle},% - NFSSFamily=Palatino Linotype,% - ItalicFont=PalatinoLinotype-Italic,% - BoldFont=PalatinoLinotype-Bold,% - BoldItalicFont=PalatinoLinotype-BoldItalic,% -]{PalatinoLinotype-Roman} -\newfontfamily{\greekfont}[SmallCapsFont=fsplpscel, - ItalicFont=PalatinoLinotype-Italic,% - BoldFont=PalatinoLinotype-Bold,% - BoldItalicFont=PalatinoLinotype-BoldItalic,% -]{PalatinoLinotype-Roman} -\newfontfamily{\defaultfont}[SmallCapsFeatures={Numbers=OldStyle},% - NFSSFamily=Palatino Linotype,% - ItalicFont=PalatinoLinotype-Italic,% - BoldFont=PalatinoLinotype-Bold,% - BoldItalicFont=PalatinoLinotype-BoldItalic,% -]{PalatinoLinotype-Roman} - -\RequirePackage{iftex} -\ifxetex -\RequirePackage[Latin, Greek]{ucharclasses} -\setDefaultTransitions{\defaultfont}{} -\setTransitionsForLatin{\defaultfont}{} -\setTransitionsForGreek{\greekfont}{} -\else -\relax -\fi - -\RequirePackage{unicode-math} -\setmathfont{texgyrepagella-math.otf} - - -\endinput diff --git a/macros/unicodetex/latex/fontsetup-nonfree/tex/fspcambria.tex b/macros/unicodetex/latex/fontsetup-nonfree/tex/fspcambria.tex new file mode 100644 index 0000000000..8d1d55720f --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/tex/fspcambria.tex @@ -0,0 +1,7 @@ +%% +%% Load Cambria fonts (C) A. Tsolomitis +%% +\setmainfont[Contextuals=AlternateOff,BoldFont=Cambria-Bold,ItalicFont=Cambria-Italic,BoldItalicFont=Cambria-BoldItalic]{Cambria} +\setmathfont{Cambria Math} + +\endinput diff --git a/macros/unicodetex/latex/fontsetup-nonfree/tex/fsplucidaot.tex b/macros/unicodetex/latex/fontsetup-nonfree/tex/fsplucidaot.tex new file mode 100644 index 0000000000..b0707c7984 --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/tex/fsplucidaot.tex @@ -0,0 +1,26 @@ +\setmainfont[% main font + UprightFont=LucidaBrightOT, + ItalicFont=LucidaBrightOT-Italic, + BoldFont=LucidaBrightOT-Demi, + BoldItalicFont=LucidaBrightOT-DemiItalic, + SmallCapsFeatures={Numbers=OldStyle}, + ]{LucidaBrightOT.otf} +\setsansfont[% + UprightFont=LucidaSansOT, + ItalicFont=LucidaSansOT-Italic, + BoldFont=LucidaSansOT-Demi, + BoldItalicFont=LucidaSansOT-DemiItalic, + SmallCapsFeatures={Numbers=OldStyle}, +]{LucidaSansOT.otf} +% +\setmonofont[% + UprightFont=LucidaSansTypewriterOT, + ItalicFont=LucidaSansTypewriterOT-Oblique, + BoldFont=LucidaSansTypewriterOT-Bold, + BoldItalicFont=LucidaSansTypewriterOT-BoldOblique, + SmallCapsFeatures={Numbers=OldStyle}, + ]{LucidaSansTypewriterOT.otf} +% support for OpenType math fonts: +\setmathfont{LucidaBrightMathOT.otf} +\setmathfont[version=bold]{LucidaBrightMathOT-Demi.otf} + diff --git a/macros/unicodetex/latex/fontsetup-nonfree/tex/fspminion.tex b/macros/unicodetex/latex/fontsetup-nonfree/tex/fspminion.tex new file mode 100644 index 0000000000..1821bf3a7b --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/tex/fspminion.tex @@ -0,0 +1,35 @@ + + + +\defaultfontfeatures{Ligatures=TeX} +\setmainfont[SmallCapsFeatures={Numbers=OldStyle},% + NFSSFamily=MinionPro,% + ItalicFont=MinionPro-It,% + BoldFont=MinionPro-Bold,% + BoldItalicFont=MinionPro-BoldIt,% +]{MinionPro-Regular} +\setsansfont[SmallCapsFeatures={Numbers=OldStyle},% + NFSSFamily=MyriadPro,% + ItalicFont=MyriadPro-It,% + BoldFont=MyriadPro-Bold,% + BoldItalicFont=MyriadPro-BoldIt,% +]{MyriadPro-Regular} +\newfontfamily{\greekfont}[SmallCapsFont=fspmnscel,% + ItalicFont=MinionPro-It,% + BoldFont=MinionPro-Bold,% + BoldItalicFont=MinionPro-BoldIt,% +]{MinionPro-Regular} + +\newfontfamily{\defaultfont}[SmallCapsFeatures={Numbers=OldStyle},% + NFSSFamily=MinionPro,% + ItalicFont=MinionPro-It,% + BoldFont=MinionPro-Bold,% + BoldItalicFont=MinionPro-BoldIt,% +]{MinionPro-Regular} + + +\setmathfont{STIXTwoMath-Regular.otf} +\setmathfont[range=\mathup/{num,latin,Latin,greek,Greek}]{MinionPro-Regular} +\setmathfont[range=\mathbfup/{num,latin,Latin,greek,Greek}]{MinionPro-Bold} +\setmathfont[range=\mathit/{num,latin,Latin,greek,Greek}]{MinionPro-It} +\setmathfont[range=\mathbfit/{num,latin,Latin,greek,Greek}]{MinionPro-BoldIt} diff --git a/macros/unicodetex/latex/fontsetup-nonfree/tex/fspmsgaramondot.tex b/macros/unicodetex/latex/fontsetup-nonfree/tex/fspmsgaramondot.tex new file mode 100644 index 0000000000..1479678ed4 --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/tex/fspmsgaramondot.tex @@ -0,0 +1,44 @@ +%\RequirePackage[no-math]{fontspec} +\defaultfontfeatures{Ligatures=TeX} +%\RequirePackage[garamond]{mathdesign} + +\setmainfont[% + NFSSFamily=Garamond,% + ItalicFont=Garamond-Italic,% + BoldFont=Garamond-Bold,% + BoldItalicFont=Garamond-Bold,% + SlantedFont=Garamond,% + BoldSlantedFont=Garamond-Bold,% + SlantedFeatures={FakeSlant=0.25},% + BoldSlantedFeatures={FakeSlant=0.25},% +]{Garamond} +\newfontfamily{\greekfont}[% + ItalicFont=Garamond-Italic,% + BoldFont=Garamond-Bold,% + BoldItalicFont=Garamond-Bold,% + SlantedFont=Garamond,% + BoldSlantedFont=Garamond-Bold,% + SlantedFeatures={FakeSlant=0.25},% + BoldSlantedFeatures={FakeSlant=0.25},% +]{Garamond} +\newfontfamily{\defaultfont}[% + NFSSFamily=Garamond,% + ItalicFont=Garamond-Italic,% + BoldFont=Garamond-Bold,% + BoldItalicFont=Garamond-Bold,% + SlantedFont=Garamond,% + BoldSlantedFont=Garamond-Bold,% + SlantedFeatures={FakeSlant=0.25},% + BoldSlantedFeatures={FakeSlant=0.25},% +]{Garamond} + + + +\setmathfont{Garamond-Math.otf} +\setmathfont[range=\mathup/{num,latin,Latin,greek,Greek}]{Garamond} +\setmathfont[range=\mathbfup/{num,latin,Latin,greek,Greek}]{Garamond-Bold} +\setmathfont[range=\mathit/{num,latin,Latin,greek,Greek}]{Garamond-Italic} +\setmathfont[range=\mathbfit/{num,latin,Latin,greek,Greek}]{Garamond-Bold} + + +\endinput diff --git a/macros/unicodetex/latex/fontsetup-nonfree/tex/fsppalatinoot.tex b/macros/unicodetex/latex/fontsetup-nonfree/tex/fsppalatinoot.tex new file mode 100644 index 0000000000..6f3b4e0781 --- /dev/null +++ b/macros/unicodetex/latex/fontsetup-nonfree/tex/fsppalatinoot.tex @@ -0,0 +1,24 @@ +\defaultfontfeatures{Ligatures=TeX} +\setmainfont[SmallCapsFeatures={Numbers=OldStyle},% + NFSSFamily=Palatino Linotype,% + ItalicFont=PalatinoLinotype-Italic,% + BoldFont=PalatinoLinotype-Bold,% + BoldItalicFont=PalatinoLinotype-BoldItalic,% +]{PalatinoLinotype-Roman} +\newfontfamily{\greekfont}[SmallCapsFont=fsplpscel, + ItalicFont=PalatinoLinotype-Italic,% + BoldFont=PalatinoLinotype-Bold,% + BoldItalicFont=PalatinoLinotype-BoldItalic,% +]{PalatinoLinotype-Roman} +\newfontfamily{\defaultfont}[SmallCapsFeatures={Numbers=OldStyle},% + NFSSFamily=Palatino Linotype,% + ItalicFont=PalatinoLinotype-Italic,% + BoldFont=PalatinoLinotype-Bold,% + BoldItalicFont=PalatinoLinotype-BoldItalic,% +]{PalatinoLinotype-Roman} + + +\setmathfont{texgyrepagella-math.otf} + + +\endinput -- cgit v1.2.3