Compare commits

..

2 Commits

Author SHA1 Message Date
Juergen Spitzmueller
1138b3875b Implement support for classico font package (#13124)
This is only an alternative to the classico font we already support
(uop), hence no file format change.

(cherry picked from commit 360bb1fa7c
amendment from 51f4fc7f67 is included)
2024-11-13 17:14:54 +01:00
Juergen Spitzmueller
2a60f32780 Fixup logic in LaTeXFonts::getUsedFont()
Allow for unavailable switchdefault fonts fall back to AltFonts

Prerequisite to implement #13124

(cherry picked from commit 833c372931)
2024-11-13 17:11:43 +01:00
6 changed files with 34 additions and 3 deletions

View File

@ -484,6 +484,7 @@
\TestPackage{cantarell} \TestPackage{cantarell}
\TestPackage{ccfonts} \TestPackage{ccfonts}
\TestPackage{Chivo} \TestPackage{Chivo}
\TestPackage{classico}
\TestFont[ccr10]{concrete} % required by ccfonts \TestFont[ccr10]{concrete} % required by ccfonts
\TestFont[eorm10]{ecc} % required by ccfonts \TestFont[eorm10]{ecc} % required by ccfonts
\TestPackage[ot1ccr.fd]{concmath} % required by ccfonts \TestPackage[ot1ccr.fd]{concmath} % required by ccfonts

View File

@ -2443,6 +2443,24 @@ Notes:
Live the font needs to be installed via the 'getnonfreefonts-sys' utility. Live the font needs to be installed via the 'getnonfreefonts-sys' utility.
\end_layout \end_layout
\begin_deeper
\begin_layout Standard
Alternatively,
you can also use the
\family sans
classico
\family default
package (installed:
\begin_inset Info
type "package"
arg "classico"
\end_inset
).
\end_layout
\end_deeper
\begin_layout Subsection \begin_layout Subsection
URW Garamond URW Garamond
\end_layout \end_layout

View File

@ -1064,6 +1064,13 @@ Font uop
Family sf Family sf
SwitchDefault 1 SwitchDefault 1
Requires urwclassico Requires urwclassico
AltFonts classico
EndFont
AltFont classico
GuiName "URW Classico (Optima)"
Family sf
Package classico
EndFont EndFont
# #

View File

@ -199,7 +199,8 @@ docstring const LaTeXFont::getUsedFont(bool ot1, bool complete, bool nomath, boo
&& altfonts_.empty()) { && altfonts_.empty()) {
return name_; return name_;
} }
else if (!altfonts_.empty()) { // if we haven't somethin up to here, try fallback fonts
if (!altfonts_.empty()) {
for (auto const & name : altfonts_) { for (auto const & name : altfonts_) {
LaTeXFont altf = altFont(name); LaTeXFont altf = altFont(name);
if (altf.available(ot1, nomath)) if (altf.available(ot1, nomath))

View File

@ -1341,9 +1341,11 @@ void Preamble::handle_package(Parser &p, string const & name,
options.clear(); options.clear();
} }
if (name == "PTSans") { if (name == "PTSans")
h_font_sans[0] = "PTSans-TLF"; h_font_sans[0] = "PTSans-TLF";
}
if (name == "classico")
h_font_sans[0] = "uop";
if (name == "FiraSans") { if (name == "FiraSans") {
h_font_sans_osf = "true"; h_font_sans_osf = "true";

View File

@ -15,6 +15,8 @@ What's new
* DOCUMENT INPUT/OUTPUT * DOCUMENT INPUT/OUTPUT
- The "URW Classico (Optima)" TeX fonts are now also supported via
the classico LaTeX package (bug 13124).
* MISCELLANEOUS * MISCELLANEOUS