From 360bb1fa7cd8819d299282939ff51582ea3eb825 Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Wed, 13 Nov 2024 09:04:56 +0100
Subject: [PATCH] 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.
---
 lib/chkconfig.ltx        |  3 ++-
 lib/doc/LaTeXConfig.lyx  | 18 ++++++++++++++++++
 lib/latexfonts           |  7 +++++++
 src/tex2lyx/Preamble.cpp |  6 ++++--
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index bf0d410fd5..42b25d294a 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
@@ -544,7 +545,7 @@
 \TestPackage{tgschola}
 \TestPackage{tgtermes}
 \TestFont[ugmr8r]{ugm}
-\TestFont[uopr8r]{urwclassico}
+\TestFont[xuopr8r]{urwclassico}
 \TestPackage{tipa}
 \TestPackage{tipx}
 \TestPackage{tone}
diff --git a/lib/doc/LaTeXConfig.lyx b/lib/doc/LaTeXConfig.lyx
index 27cc57a73f..6de69cdc11 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 84994fddac..7f1f4ad936 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -1345,9 +1345,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";