The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit 1d84423e76c68a626fbb9acbeed245f1859d40f3
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Tue Sep 25 11:07:33 2012 +0200
A font a day keeps the doctor away: Support for the Biolinum LaTeX font
diff --git a/development/FORMAT b/development/FORMAT
index 80d6ab3..7fa84f9 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -12,6 +12,16 @@ adjustments are made to tex2lyx and bugs are fixed in
lyx2lyx.
-----------------------
+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
+ - [lf], [lining] > \font_osf false
+ - [osf], [oldstyle], no option > \font_osf true
+ - \usepackage{libertine-legacy} or
+ \usepackage{libertine} > \font_sans biolinum
+ - [nf], no option > \font_osf false
+ - [osf] > \font_osf true
+
2012-09-24 Jürgen Spitzmüller <sp...@lyx.org>
* Format incremented to 443: basic support for unicode-math:
Empty file format change (in case it turns out we need to
@@ -26,8 +36,13 @@ adjustments are made to tex2lyx and bugs are fixed in
lyx2lyx.
2012-09-23 Jürgen Spitzmüller <sp...@lyx.org>
* Format incremented to 441:
- rename fonts: mdbch > md-charter, mdput > md-utopia, mdugm >
md-garamond
- - add support for the mathdesign fonts without loading mathfonts
- (via \renewcommand{\rmfamily}{mdbch|mdput|mdugm}
+ - add support for the mathdesign fonts without loading mathfonts:
+ \renewcommand{\rmfamily}{mdbch} > \font_roman md-charter
+ \font_math default
+ \renewcommand{mdput} > \font_roman md-utopia
+ \font_math default
+ \renewcommand{mdugm} > \font_roman md-garamond
+ \font_math default
2012-09-22 Jürgen Spitzmüller <sp...@lyx.org>
* Format incremented to 440:
@@ -36,12 +51,34 @@ adjustments are made to tex2lyx and bugs are fixed in
lyx2lyx.
supported values are:
* "auto": automatically adapt math font (the status quo ante).
* "default": use class default, i.e. prevent TeX font packages
- from changing the math font, if possible.
- * "eulervm": use the eulervm package.
+ from changing the math font, if possible:
+ \renewcommand{\rmdefault}{lmr} > \font_roman lmodern
+ \font_math default
+ \usepackage[onlytext,lf]{MinionPro} > \font_roman minionpro
+ \font_math default
+ \usepackage[onlytext]{MinionPro} > \font_roman minionpro
+ \font_osf true
+ \font_math default
+ \renewcommand{\rmdefault}{ppl} > \font_roman palatino
+ \font_math default
+ \renewcommand{\rmdefault}{pplj} > \font_roman palatino
+ \font_osf true
+ \font_math default
+ \renewcommand{\rmdefault}{ptm} > \font_roman times
+ \font_math default
+ \renewcommand{\rmdefault}{futs} > \font_roman utopia
+ \font_math default
+ \renewcommand{\rmdefault}{futj} > \font_roman utopia
+ \font_osf true
+ \font_math default
+ * "eulervm": use the eulervm package (\usepackage{eulervm}.
2012-09-19 Jürgen Spitzmüller <sp...@lyx.org>
* Format incremented to 439
Support for the MinionPro LaTeX font.
+ - \usepackage{MinionPro} > \font_roman minionpro
+ - [osf], [oldstyle], no option > \font_osf true
+ - [lf], [lining] > \font_osf false
2012-08-23 Jürgen Spitzmüller <sp...@lyx.org>
* Format incremented to 438
@@ -75,18 +112,37 @@ adjustments are made to tex2lyx and bugs are fixed in
lyx2lyx.
2012-08-19 Jürgen Spitzmüller <sp...@lyx.org>
* Format incremented to 437
Support for the TeX Gyre LaTeX fonts.
+ - \usepackage{tgadventor} > \font_sans tgadventor
+ - \usepackage{tgbonum} > \font_roman tgbonum
+ - \usepackage{tgchorus} > \font_roman tgchorus
+ - \usepackage{tgcursor} > \font_typewriter tgcursor
+ - \usepackage{tgheros} > \font_sans tgheros
+ - \usepackage{tgpagella} > \font_roman tgpagella
+ - \usepackage{tgschola} > \font_roman tgschola
+ - \usepackage{tgtermes} > \font_roman tgtermes
2012-08-18 Jürgen Spitzmüller <sp...@lyx.org>
* Format incremented to 436
Support for the mathdesign LaTeX fonts.
+ - \usepackage[mdbch]{mathdesign} > \font_roman md-charter
+ - \usepackage[mdput]{mathdesign} > \font_roman md-utopia
+ - \usepackage[mdugm]{mathdesign} > \font_roman md-garamond
2012-08-17 Jürgen Spitzmüller <sp...@lyx.org>
* Format incremented to 435
Support for the txtt LaTeX font.
+ - \renewcommand{\ttdefault}{txtt} > \font_typewriter txtt
2012-08-17 Jürgen Spitzmüller <sp...@lyx.org>
* Format incremented to 434
Support for the libertine LaTeX font.
+ - \usepackage{libertine-type1} > \font_roman libertine
+ - [lf], [lining] > \font_osf false
+ - [osf], [oldstyle], no option > \font_osf true
+ - \usepackage{libertine-legacy} or
+ \usepackage{libertine} > \font_roman libertine
+ - [nf], no option > \font_osf false
+ - [osf] > \font_osf true
2012-06-22 Uwe Stöhr <uwesto...@web.de>
* Format incremented to 433
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index 41ddde2..3af74b9 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -377,6 +377,7 @@
% Other font packages
\TestPackage{ae}
\TestPackage{bera}
+\TestPackage{biolinum-type1}
\TestPackage{ccfonts}
\TestPackage{cmbright}
\TestPackage{eco}
diff --git a/lib/doc/LaTeXConfig.lyx b/lib/doc/LaTeXConfig.lyx
index 4406af3..499f580 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 442
+\lyxformat 444
\begin_document
\begin_header
\textclass article
@@ -302,6 +302,69 @@ typewriter font).
\end_layout
\begin_layout Subsection
+Biolinum
+\end_layout
+
+\begin_layout Description
+Found:
+\begin_inset Info
+type "package"
+arg "biolinum-type1"
+\end_inset
+
+
+\end_layout
+
+\begin_layout Description
+CTAN:
+\family typewriter
+fonts/biolinum-type1/
+\end_layout
+
+\begin_layout Description
+Notes: The
+\family sans
+biolinum-type1
+\family default
+ package provides support for the
+\emph on
+Biolinum
+\emph default
+ sans serif family of fonts, which has been designed as a companion to the
+
+\emph on
+Libertine
+\emph default
+ roman font.
+
+\emph on
+Biolinum
+\emph default
+ supports Old Style Figures, which will be automatically activated if those
+ figures are available and requested for the roman font.
+ An older version of the font is provided by the package
+\family sans
+libertine-legacy
+\family default
+ (found:
+\begin_inset Info
+type "package"
+arg "libertine"
+\end_inset
+
+).
+ If you only have this package, you will need to set the roman font to
+\emph on
+Libertine
+\emph default
+ and the Sans Serif font to
+\emph on
+Standard
+\emph default
+ in order to get Biolinum.
+\end_layout
+
+\begin_layout Subsection
CM bright
\end_layout
@@ -704,7 +767,7 @@ libertine-type1
Libertine
\emph default
roman family of fonts.
- And older version of the package,
+ An older version of the package,
\family sans
libertine-legacy
\family default
diff --git a/lib/latexfonts b/lib/latexfonts
index a0658cf..ca484fd 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -392,6 +392,14 @@ Font berasans
Requires bera
EndFont
+Font biolinum
+ GuiName "Biolinum"
+ Family sf
+ OsfOption lining
+ OsfDefault 1
+ Package biolinum-type1
+EndFont
+
Font cmbr
GuiName "CM Bright"
Family sf
diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index fb836ab..a1512d8 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -837,8 +837,9 @@ def revert_libertine(document):
osf = True
preamble = "\\usepackage"
if osf:
- preamble += "[osf]"
document.header[j] = "\\font_osf false"
+ else:
+ preamble += "[lining]"
preamble += "{libertine-type1}"
add_to_preamble(document, [preamble])
document.header[i] = "\\font_roman default"
@@ -1100,6 +1101,24 @@ def revert_newtxmath(document):
document.header[i] = "\\font_math auto"
+def revert_biolinum(document):
+ " Revert native biolinum font definition to LaTeX "
+
+ if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1:
+ i = find_token(document.header, "\\font_sans biolinum", 0)
+ if i != -1:
+ osf = False
+ j = find_token(document.header, "\\font_osf true", 0)
+ if j != -1:
+ osf = True
+ preamble = "\\usepackage"
+ if not osf:
+ preamble += "[lf]"
+ preamble += "{biolinum-type1}"
+ add_to_preamble(document, [preamble])
+ document.header[i] = "\\font_sans default"
+
+
##
# Conversion hub
#
@@ -1135,10 +1154,12 @@ convert = [
[440, []],
[441, [convert_mdnomath]],
[442, []],
- [443, []]
+ [443, []],
+ [444, []]
]
revert = [
+ [443, [revert_biolinum]],
[442, []],
[441, [revert_newtxmath]],
[440, [revert_mdnomath]],
diff --git a/src/version.h b/src/version.h
index 99f411a..72fda8f 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 443 // spitz: basic support for unicode-math
-#define LYX_FORMAT_TEX2LYX 443 // spitz: basic support for unicode-math
+#define LYX_FORMAT_LYX 444 // spitz: support for the Biolinum LaTeX font
+#define LYX_FORMAT_TEX2LYX 444 // spitz: support for the Biolinum LaTeX font
#if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
#ifndef _MSC_VER
-----------------------------------------------------------------------
Summary of changes:
development/FORMAT | 64 ++++++++++++++++++++++++++++++++++++++++++---
lib/chkconfig.ltx | 1 +
lib/doc/LaTeXConfig.lyx | 67 +++++++++++++++++++++++++++++++++++++++++++++-
lib/latexfonts | 8 +++++
lib/lyx2lyx/lyx_2_1.py | 25 ++++++++++++++++-
src/version.h | 4 +-
6 files changed, 159 insertions(+), 10 deletions(-)
hooks/post-receive
--
The LyX Source Repository
