[LyX/2.4.x] Implement support for classico font package (#13124)
Juergen Spitzmueller
spitz at lyx.org
Wed Nov 13 16:16:13 UTC 2024
commit 1138b3875b3404c177acae19935d4132797fc41a
Author: Juergen Spitzmueller <spitz at lyx.org>
Date: Wed Nov 13 09:04:56 2024 +0100
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 360bb1fa7cd8819d299282939ff51582ea3eb825
amendment from 51f4fc7f67a6c is included)
---
lib/chkconfig.ltx | 1 +
lib/doc/LaTeXConfig.lyx | 18 ++++++++++++++++++
lib/latexfonts | 7 +++++++
src/tex2lyx/Preamble.cpp | 6 ++++--
status.24x | 2 ++
5 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index bf0d410fd5..9a1c2bdf83 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -484,6 +484,7 @@
\TestPackage{cantarell}
\TestPackage{ccfonts}
\TestPackage{Chivo}
+\TestPackage{classico}
\TestFont[ccr10]{concrete} % required by ccfonts
\TestFont[eorm10]{ecc} % required by ccfonts
\TestPackage[ot1ccr.fd]{concmath} % required by ccfonts
diff --git a/lib/doc/LaTeXConfig.lyx b/lib/doc/LaTeXConfig.lyx
index 040615d854..94192d20cd 100644
--- a/lib/doc/LaTeXConfig.lyx
+++ b/lib/doc/LaTeXConfig.lyx
@@ -2443,6 +2443,24 @@ Notes:
Live the font needs to be installed via the 'getnonfreefonts-sys' utility.
\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
URW Garamond
\end_layout
diff --git a/lib/latexfonts b/lib/latexfonts
index 3120233fd8..28e60d3d31 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -1064,6 +1064,13 @@ Font uop
Family sf
SwitchDefault 1
Requires urwclassico
+ AltFonts classico
+EndFont
+
+AltFont classico
+ GuiName "URW Classico (Optima)"
+ Family sf
+ Package classico
EndFont
#
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 3226b0f0a5..cebed46320 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -1341,9 +1341,11 @@ void Preamble::handle_package(Parser &p, string const & name,
options.clear();
}
- if (name == "PTSans") {
+ if (name == "PTSans")
h_font_sans[0] = "PTSans-TLF";
- }
+
+ if (name == "classico")
+ h_font_sans[0] = "uop";
if (name == "FiraSans") {
h_font_sans_osf = "true";
diff --git a/status.24x b/status.24x
index 8b6662bfc0..e6b0d55375 100644
--- a/status.24x
+++ b/status.24x
@@ -15,6 +15,8 @@ What's new
* DOCUMENT INPUT/OUTPUT
+- The "URW Classico (Optima)" TeX fonts are now also supported via
+ the classico LaTeX package (bug 13124).
* MISCELLANEOUS
More information about the lyx-cvs
mailing list