Add support for the Fira family of fonts

This is a beautiful and feature rich sans and monospaced font family
designed by Erik Spiekermann and reminiscent to his famous (and
commercial) FF Meta.

diff --git a/development/FORMAT b/development/FORMAT
index 106085c73c836f9cbd70510a51ec13c6cb8650ca..8d1872b2276143fdd58daba45e96312090311157 100644 (file)
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -8,7 +8,8 @@ changes happened in particular if possible. A good example would be
 -----------------------
 
 2019-07-15  Kornel Benko <kornel@lyx.org>
-       * format incremented to 582: Support for the Cantarell font.
+        Jürgen Spitzmüller <spitz@lyx.org>
+       * format incremented to 582: Support for the Cantarell and Fira fonts.
 
 2019-07-14 Jürgen Spitzmüller <spitz@lyx.org>
        * Format incremented to 581: split osf options to rm, sf, and tt

diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index b7643703a6ea97ccedac0cb73d670015bcb9e10b..a8e8247871274b4ef253e5ad5f918b37cf93a11a 100644 (file)
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -489,6 +489,8 @@
 \TestPackage{eulervm}
 \TestPackage{feyn}
 \TestPackage{fourier}
+\TestPackage{FiraMono}
+\TestPackage{FiraSans}
 \TestPackage{garamondx}
 \TestPackage{plex-serif}
 \TestPackage{plex-sans}

diff --git a/lib/doc/LaTeXConfig.lyx b/lib/doc/LaTeXConfig.lyx
index 1b83dec3ee6bcf51c141df8f21bbdb6e65ce731e..41241f5b9ff56af4d31419918d64f1be71137bac 100644 (file)
--- a/lib/doc/LaTeXConfig.lyx
+++ b/lib/doc/LaTeXConfig.lyx
@@ -668,6 +668,90 @@ feyn
 Diagram
 \family default
 ).
+\change_inserted -712698321 1563189952
+
+\end_layout
+
+\begin_layout Subsection
+
+\change_inserted -712698321 1563189961
+FiraMono
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1563189953
+Found: 
+\begin_inset Info
+type  "package"
+arg   "FiraMono"
+\end_inset
+
+
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1563190006
+CTAN: 
+\family sans
+fonts/fira/
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1563190069
+Notes: The package 
+\family sans
+FiraMono
+\family default
+ provides support for the monospaced 
+\emph on
+FiraMono
+\emph default
+ font.
+\end_layout
+
+\begin_layout Subsection
+
+\change_inserted -712698321 1563190072
+FiraSans
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1563190069
+Found: 
+\begin_inset Info
+type  "package"
+arg   "FiraSans"
+\end_inset
+
+
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1563190069
+CTAN: 
+\family sans
+fonts/fira/
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1563190093
+Notes: The package 
+\family sans
+FiraSans
+\family default
+ provides support for the 
+\emph on
+FiraSans
+\emph default
+ family of fonts.
+\change_unchanged
+
 \end_layout
 
 \begin_layout Subsection

diff --git a/lib/latexfonts b/lib/latexfonts
index a95613d5804cf66b47a0c62a3ddfa9afed556bec..1d7903f2f171dc7755ca10575fff5c9e006da998 100644 (file)
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -681,6 +681,77 @@ Font DejaVuSansCondensed
        ScaleOption      scaled=$$val
 EndFont
 
+Font FiraSans
+       GuiName         "Fira Sans"
+       Family          sf
+       ScaleOption     scaled=$$val
+       Package         FiraSans
+       OsfDefault      1
+       OsfOption       lf
+       MoreOptions     1
+       FontEncoding    OT1,T1,TS1,LY1,LGR
+EndFont
+
+Font FiraSansBook
+       GuiName         "Fira Sans (Book)"
+       Family          sf
+       ScaleOption     scaled=$$val
+       Package         FiraSans
+        PackageOption   book
+       OsfDefault      1
+       OsfOption       lf
+       MoreOptions     1
+       FontEncoding    OT1,T1,TS1,LY1,LGR
+EndFont
+
+Font FiraSansLight
+       GuiName         "Fira Sans (Light)"
+       Family          sf
+       ScaleOption     scaled=$$val
+       Package         FiraSans
+       PackageOption   light
+       OsfDefault      1
+       OsfOption       lf
+       MoreOptions     1
+       FontEncoding    OT1,T1,TS1,LY1,LGR
+EndFont
+
+Font FiraSansExtralight
+       GuiName         "Fira Sans (Extralight)"
+       Family          sf
+       ScaleOption     scaled=$$val
+       Package         FiraSans
+       PackageOption   extralight
+       OsfDefault      1
+       OsfOption       lf
+       MoreOptions     1
+       FontEncoding    OT1,T1,TS1,LY1,LGR
+EndFont
+
+Font FiraSansUltralight
+       GuiName         "Fira Sans (Ultralight)"
+       Family          sf
+       ScaleOption     scaled=$$val
+       Package         FiraSans
+       PackageOption   ultralight
+       OsfDefault      1
+       OsfOption       lf
+       MoreOptions     1
+       FontEncoding    OT1,T1,TS1,LY1,LGR
+EndFont
+
+Font FiraSansThin
+       GuiName         "Fira Sans (Thin)"
+       Family          sf
+       ScaleOption     scaled=$$val
+       Package         FiraSans
+       PackageOption   thin
+       OsfDefault      1
+       OsfOption       lf
+       MoreOptions     1
+       FontEncoding    OT1,T1,TS1,LY1,LGR
+EndFont
+
 Font IBMPlexSans
        GuiName          "IBM Plex Sans"
        Family           sf
@@ -943,6 +1014,17 @@ Font DejaVuSansMono
        ScaleOption      scaled=$$val
 EndFont
 
+Font FiraMono
+       GuiName         "Fira Mono"
+       Family          tt
+       ScaleOption     scaled=$$val
+       Package         FiraMono
+       OsfDefault      1
+       OsfOption       lf
+       MoreOptions     1
+       FontEncoding    OT1,T1,TS1,LY1,LGR
+EndFont
+
 Font IBMPlexMono
        GuiName          "IBM Plex Mono"
        Family           tt

diff --git a/lib/lyx2lyx/lyx_2_4.py b/lib/lyx2lyx/lyx_2_4.py
index d5b718e0adbcb2bd5d8537f95909aa6415430cdd..479f700dc87fac3c662c6b2d6c62c38c66ec47b4 100644 (file)
--- a/lib/lyx2lyx/lyx_2_4.py
+++ b/lib/lyx2lyx/lyx_2_4.py
@@ -72,7 +72,8 @@ class fontinfo:
         self.package = None
         self.options = []
         self.pkgkey = None      # key into pkg2fontmap
-        self.osfopt = None    # None, string
+        self.osfopt = None      # None, string
+        self.osfdef = "false"   # "false" or "true"
 
     def addkey(self):
         self.pkgkey = createkey(self.package, self.options)
@@ -83,7 +84,7 @@ class fontmapping:
         self.pkg2fontmap = dict()
         self.pkginmap = dict()  # defines, if a map for package exists
 
-    def expandFontMapping(self, font_list, font_type, scale_type, pkg, scaleopt = None, osfopt = None):
+    def expandFontMapping(self, font_list, font_type, scale_type, pkg, scaleopt = None, osfopt = None, osfdef = "false"):
         " Expand fontinfo mapping"
         #
         # fontlist:    list of fontnames, each element
@@ -95,6 +96,7 @@ class fontmapping:
         # scaleopt:    one of None, 'scale', 'scaled', or some other string
         #              to be used in scale option (e.g. scaled=0.7)
         # osfopt:      None or some other string to be used in osf option
+        # osfdef:      "true" if osf is default
         for fl in font_list:
             fe = fontinfo()
             fe.fonttype = font_type
@@ -105,6 +107,7 @@ class fontmapping:
             fe.options = flt[1:]
             fe.scaleopt = scaleopt
             fe.osfopt = osfopt
+            fe.osfdef = osfdef
             if pkg == None:
                 fe.package = font_name
             else:
@@ -176,6 +179,13 @@ def createFontMapping(fontlist):
         elif font == 'Cantarell':
             fm.expandFontMapping(['cantarell,defaultsans'],
                                   "sans", "sf", "cantarell", "scaled", "oldstyle")
+        elif font == 'Fira':
+            fm.expandFontMapping(['FiraSans', 'FiraSansBook,book',
+                                  'FiraSansThin,thin', 'FiraSansLight,light',
+                                  'FiraSansExtralight,extralight',
+                                  'FiraSansUltralight,ultralight'],
+                                  "sans", "sf", "FiraSans", "scaled", "lf", "true")
+            fm.expandFontMapping(['FiraMono'], "typewriter", "tt", "FiraMono", "scaled", "lf", "true")
     return fm
 
 def convert_fonts(document, fm, osfoption = "osf"):
@@ -243,7 +253,7 @@ def convert_fonts(document, fm, osfoption = "osf"):
         else:
             fontscale = "\\font_" + fontinfo.scaletype + "_scale"
             fontinfo.scaleval = oscale
-        if has_osf:
+        if (has_osf and fontinfo.osfdef == "false") or (not has_osf and fontinfo.osfdef == "true"):
             if fontinfo.osfopt == None:
                 options.extend(osfoption)
                 continue
@@ -347,14 +357,17 @@ def revert_fonts(document, fm, fontmap, OnlyWithXOpts = False, WithXOpts = False
                     # set correct scale option
                     fontmap[val].extend([fontinfo.scaleopt + "=" + format(float(xval1) / 100, '.2f')])
         if fontinfo.osfopt != None:
-            osf = find_token(document.header, "\\font_osf true")
+            oldval = "true"
+            if fontinfo.osfdef == "true":
+                oldval = "false"
+            osf = find_token(document.header, "\\font_osf " + oldval)
             if osf == -1 and ft != "\\font_math":
                 # Try with newer format
-                osftag = "\\font_roman_osf true"
+                osftag = "\\font_roman_osf " + oldval
                 if ft == "\\font_sans":
-                    osftag = "\\font_sans_osf true"
+                    osftag = "\\font_sans_osf " + oldval
                 elif ft == "\\font_typewriter":
-                    osftag = "\\font_typewriter_osf true"
+                    osftag = "\\font_typewriter_osf " + oldval
                 osf = find_token(document.header, osftag)
             if osf != -1:
                 fontmap[val].extend([fontinfo.osfopt])
@@ -2906,6 +2919,23 @@ def revert_CantarellFont(document):
             add_preamble_fonts(document, fontmap)
 
 
+def convert_FiraFont(document):
+    " Handle Fira font definition to LaTeX "
+
+    if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1:
+        fm = createFontMapping(['Fira'])
+        convert_fonts(document, fm, "lf")
+
+def revert_FiraFont(document):
+    " Revert native Fira font definition to LaTeX "
+
+    if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1:
+        fontmap = dict()
+        fm = createFontMapping(['Fira'])
+        if revert_fonts(document, fm, fontmap, False, True):
+            add_preamble_fonts(document, fontmap)
+
+
 ##
 # Conversion hub
 #
@@ -2949,10 +2979,10 @@ convert = [
            [579, []],
            [580, []],
            [581, [convert_osf]],
-           [582, [convert_AdobeFonts,convert_latexFonts,convert_notoFonts,convert_CantarellFont]],# old font re-converterted due to extra options
+           [582, [convert_AdobeFonts,convert_latexFonts,convert_notoFonts,convert_CantarellFont,convert_FiraFont]],# old font re-converterted due to extra options
           ]
 
-revert =  [[581, [revert_CantarellFont]],
+revert =  [[581, [revert_CantarellFont,revert_FiraFont]],
            [580, [revert_texfontopts,revert_osf]],
            [579, [revert_minionpro, revert_plainNotoFonts_xopts, revert_notoFonts_xopts, revert_IBMFonts_xopts, revert_AdobeFonts_xopts, revert_font_opts]], # keep revert_font_opts last!
            [578, [revert_babelfont]],