The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit db1c1389e3caff69477a597d2e499a8115058150
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Sun Oct 21 18:55:24 2012 +0200
Add support for the URW Classico (Optima) LaTeX font
Patch by Liviu Andronic
diff --git a/development/FORMAT b/development/FORMAT
index 33f9ce4..2cb24d3 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -12,6 +12,11 @@ adjustments are made to tex2lyx and bugs are fixed in
lyx2lyx.
-----------------------
+2012-10-20 Liviu Andronic <landronim...@gmail.com>
+ * Format incremented to 445: support for the URW Classico font,
+ an Optima clone.
+ - \renewcommand{\sffamily}{uop} > \font_sans uop
+
2012-09-25 Jürgen Spitzmüller <sp...@lyx.org>
* Format incremented to 444: Support for the Biolinum LaTeX font.
- \usepackage{biolinum-type1} > \font_sans biolinum
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index 141aba9..90d63b4 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -415,6 +415,7 @@
\TestPackage{tgpagella}
\TestPackage{tgschola}
\TestPackage{tgtermes}
+\TestFont[uopr8a]{urwclassico}
\TestPackage{tipa}
\TestPackage{tipx}
\TestPackage{tone}
diff --git a/lib/doc/LaTeXConfig.lyx b/lib/doc/LaTeXConfig.lyx
index c5ae0a3..cbe1652 100644
--- a/lib/doc/LaTeXConfig.lyx
+++ b/lib/doc/LaTeXConfig.lyx
@@ -1,5 +1,5 @@
#LyX 2.1 created this file. For more info see http://www.lyx.org/
-\lyxformat 444
+\lyxformat 445
\begin_document
\begin_header
\textclass article
@@ -1807,6 +1807,35 @@ TXTT
) is currently natively supported.
\end_layout
+\begin_layout Subsection
+URW Classico (Optima)
+\end_layout
+
+\begin_layout Description
+Found:
+\begin_inset Info
+type "package"
+arg "urwclassico"
+\end_inset
+
+
+\end_layout
+
+\begin_layout Description
+CTAN:
+\family sans
+/fonts/urw/classico/
+\end_layout
+
+\begin_layout Description
+Notes: URW Classico is a clone of the Optima typeface, a very well-known
+ sans serif face designed by Hermann Zapf.
+ The fonts are available for non-commercial use under the Aladdin Free Public
+ License.
+ Under TeX Live the font needs to be installed via the 'getnonfreefonts-sys'
+ utility.
+\end_layout
+
\begin_layout Section
Standard LaTeX document classes
\end_layout
diff --git a/lib/latexfonts b/lib/latexfonts
index ca484fd..9f86ed6 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -440,6 +440,13 @@ Font tgheros
Package tgheros
EndFont
+Font uop
+ GuiName "URW Classico (Optima)"
+ Family sf
+ SwitchDefault 1
+ Requires urwclassico
+EndFont
+
#
# MONOSPACED FONTS
diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index a1512d8..a4da821 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -1119,6 +1119,17 @@ def revert_biolinum(document):
document.header[i] = "\\font_sans default"
+def revert_uop(document):
+ " Revert native URW Classico (Optima) font definition to LaTeX "
+
+ if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1:
+ i = find_token(document.header, "\\font_sans uop", 0)
+ if i != -1:
+ preamble = "\\renewcommand{\\sfdefault}{uop}"
+ add_to_preamble(document, [preamble])
+ document.header[i] = "\\font_sans default"
+
+
##
# Conversion hub
#
@@ -1155,10 +1166,12 @@ convert = [
[441, [convert_mdnomath]],
[442, []],
[443, []],
- [444, []]
+ [444, []],
+ [445, []]
]
revert = [
+ [444, [revert_uop]],
[443, [revert_biolinum]],
[442, []],
[441, [revert_newtxmath]],
diff --git a/src/version.h b/src/version.h
index 72fda8f..dbea853 100644
--- a/src/version.h
+++ b/src/version.h
@@ -30,8 +30,8 @@ extern char const * const lyx_version_info;
// Do not remove the comment below, so we get merge conflict in
// independent branches. Instead add your own.
-#define LYX_FORMAT_LYX 444 // spitz: support for the Biolinum LaTeX font
-#define LYX_FORMAT_TEX2LYX 444 // spitz: support for the Biolinum LaTeX font
+#define LYX_FORMAT_LYX 445 // landroni: support for the URW Classico LaTeX font
+#define LYX_FORMAT_TEX2LYX 445 // landroni: support for the URW Classico LaTeX
font
#if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
#ifndef _MSC_VER
-----------------------------------------------------------------------
Summary of changes:
development/FORMAT | 5 +++++
lib/chkconfig.ltx | 1 +
lib/doc/LaTeXConfig.lyx | 31 ++++++++++++++++++++++++++++++-
lib/latexfonts | 7 +++++++
lib/lyx2lyx/lyx_2_1.py | 15 ++++++++++++++-
src/version.h | 4 ++--
6 files changed, 59 insertions(+), 4 deletions(-)
hooks/post-receive
--
The LyX Source Repository
