lib/chkconfig.ltx

@@ -484,7 +484,6 @@
 \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

lib/doc/LaTeXConfig.lyx

@@ -2443,24 +2443,6 @@ 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

lib/latexfonts

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

src/LaTeXFonts.cpp

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

src/tex2lyx/Preamble.cpp

@@ -1341,11 +1341,9 @@ 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";

status.24x

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