The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit be0bed91e25c54a423f61d8e71a85e9538d98b8f
Merge: 63c59a3 2ecc895
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Thu Aug 16 18:04:28 2012 +0200
Merge branch 'master' of git.lyx.org:lyx
commit 63c59a352fe57b4d6bab0d6185fb86026a96fbf0
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Thu Aug 16 18:04:02 2012 +0200
Sort
diff --git a/lib/latexfonts b/lib/latexfonts
index cf59405..72743c9 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -51,47 +51,41 @@
##########################################################################
#
-# Roman fonts
+# ROMAN FONTS
#
-Font cmr
- GuiName "Computer Modern Roman"
+Font ae
+ GuiName "AE (Almost European)"
Family rm
- SwitchDefault 1
- OsfPackage eco
+ Package "ae,aecompl"
+ OT1Package none
+ Requires ae
EndFont
-Font lmodern
- GuiName "Latin Modern Roman"
+Font beraserif
+ GuiName "Bera Serif"
Family rm
- Package lmodern
+ Package beraserif
+ CompletePackage bera
+ Requires bera
EndFont
-Font ae
- GuiName "AE (Almost European)"
+Font bookman
+ GuiName "Bookman"
Family rm
- Package "ae,aecompl"
- OT1Package none
- Requires ae
+ Package bookman
EndFont
-Font times
- GuiName "Times Roman"
+Font ccfonts
+ GuiName "Concrete Roman"
Family rm
- Package mathptmx
- AltPackages "mathptm,times"
- Requires psnfss
+ Package ccfonts
EndFont
-Font palatino
- GuiName "Palatino"
+Font chancery
+ GuiName "Zapf Chancery"
Family rm
- OsfOption osf
- ScOption sc
- OsfScOption osf
- Package mathpazo
- AltPackages "mathpple,palatino"
- Requires psnfss
+ Package chancery
EndFont
Font charter
@@ -100,16 +94,42 @@ Font charter
Package charter
EndFont
+Font cmr
+ GuiName "Computer Modern Roman"
+ Family rm
+ SwitchDefault 1
+ OsfPackage eco
+EndFont
+
+Font lmodern
+ GuiName "Latin Modern Roman"
+ Family rm
+ Package lmodern
+EndFont
+
Font newcent
GuiName "New Century Schoolbook"
Family rm
Package newcent
EndFont
-Font bookman
- GuiName "Bookman"
+Font palatino
+ GuiName "Palatino"
Family rm
- Package bookman
+ OsfOption osf
+ ScOption sc
+ OsfScOption osf
+ Package mathpazo
+ AltPackages "mathpple,palatino"
+ Requires psnfss
+EndFont
+
+Font times
+ GuiName "Times Roman"
+ Family rm
+ Package mathptmx
+ AltPackages "mathptm,times"
+ Requires psnfss
EndFont
# fourier supersedes utopia.sty, but does
@@ -124,44 +144,36 @@ Font utopia
OT1Package utopia
EndFont
-Font beraserif
- GuiName "Bera Serif"
- Family rm
- Package beraserif
- CompletePackage bera
- Requires bera
-EndFont
-
-Font ccfonts
- GuiName "Concrete Roman"
- Family rm
- Package ccfonts
-EndFont
-
-Font chancery
- GuiName "Zapf Chancery"
- Family rm
- Package chancery
-EndFont
-
#
-# SansSerif fonts
+# SANS SERIF FONTS
#
+Font avant
+ GuiName "Avant Garde"
+ Family sf
+ Package avant
+EndFont
-Font cmss
- GuiName "Computer Modern Sans"
+Font berasans
+ GuiName "Bera Sans"
Family sf
- SwitchDefault 1
+ ScaleOption scaled=$$val
+ Package berasans
+ Requires bera
EndFont
+Font cmbr
+ GuiName "CM Bright"
+ Family sf
+ SwitchDefault 1
+ Requires cmbright
+EndFont
-Font lmss
- GuiName "Latin Modern Sans"
+Font cmss
+ GuiName "Computer Modern Sans"
Family sf
SwitchDefault 1
- Requires lmodern
EndFont
Font helvet
@@ -172,45 +184,39 @@ Font helvet
Requires psnfss
EndFont
-Font avant
- GuiName "Avant Garde"
+Font lmss
+ GuiName "Latin Modern Sans"
Family sf
- Package avant
+ SwitchDefault 1
+ Requires lmodern
EndFont
-Font berasans
- GuiName "Bera Sans"
- Family sf
+
+#
+# MONOSPACED FONTS
+#
+
+Font beramono
+ GuiName "Bera Mono"
+ Family tt
ScaleOption scaled=$$val
- Package berasans
+ Package beramono
Requires bera
EndFont
-Font cmbr
- GuiName "CM Bright"
- Family sf
+Font cmtl
+ GuiName "CM Typewriter Light"
+ Family tt
SwitchDefault 1
Requires cmbright
EndFont
-
-#
-# Monospaced fonts
-#
-
Font cmtt
GuiName "Computer Modern Typewriter"
Family tt
SwitchDefault 1
EndFont
-Font lmtt
- GuiName "Latin Modern Typewriter"
- Family tt
- SwitchDefault 1
- Requires lmodern
-EndFont
-
Font courier
GuiName "Courier"
Family tt
@@ -218,12 +224,11 @@ Font courier
Requires psnfss
EndFont
-Font beramono
- GuiName "Bera Mono"
+Font lmtt
+ GuiName "Latin Modern Typewriter"
Family tt
- ScaleOption scaled=$$val
- Package beramono
- Requires bera
+ SwitchDefault 1
+ Requires lmodern
EndFont
Font luximono
@@ -232,11 +237,3 @@ Font luximono
ScaleOption scaled=$$val
Package luximono
EndFont
-
-Font cmtl
- GuiName "CM Typewriter Light"
- Family tt
- SwitchDefault 1
- Requires cmbright
-EndFont
-
-----------------------------------------------------------------------
Summary of changes:
lib/latexfonts | 179 +++++++++++++++++++++++++++----------------------------
1 files changed, 88 insertions(+), 91 deletions(-)
hooks/post-receive
--
The LyX Source Repository
