Am Sonntag, 14. Juli 2019, 11:56:17 CEST schrieb Jürgen Spitzmüller: > Am Freitag, den 05.07.2019, 13:45 +0200 schrieb Kornel Benko: > > commit 6ca8238cb8a034b18d0cf7f9d6d05a4e3bc41909 > > Author: Kornel Benko <kor...@lyx.org> > > Date: Fri Jul 5 13:55:01 2019 +0200 > > > > Enable old style figures for noto fonts > > [...] > > > +Font cantarellMS > > + GuiName "Cantarell Monospace" > > + Family tt > > + OsfOption oldstyle > > + OsfDefault 0 > > + Package cantarell > > + PackageOption "defaultsans,tabular" > > + FontEncoding T2A,T1,OT1 > > + ScaleOption scale=$$val > > +EndFont > > + > > Kornel, I suppose the cantarellMS part slipped in by accident. I > removed this entry now. If you re-add it, please add a file format > change, lyx2lyx routine, tex2lyx etc.
Accident, yes. The complete change would have been the attached, but I have
some difficulties.
1.) OsfOption is only active if the serif font also has this option. But
cantarell has only sans and monospace versions.
2.) Using our dialog for cantarell fonts results in calling
\usepackage[...]{cantarel}
twice, that is once for sans and once for monospace. This leads to
error if the provided options differ.
Therefore no commit intended.
> This needs to be done in a new format after all these font
> enhancements, though.
>
> Jürgen
Kornel
diff --git a/lib/latexfonts b/lib/latexfonts index e017977..3d3ab27 100644 --- a/lib/latexfonts +++ b/lib/latexfonts @@ -639,10 +639,41 @@ AltFont biolinum-2012 OsfOption lining OsfDefault 1 Package biolinum-type1 EndFont +Font cantarellSS + GuiName "Cantarell Sans Serif" + Family sf + OsfOption oldstyle + Package cantarell + PackageOption "defaultsans,tabular" + FontEncoding T2A,T1,OT1 + ScaleOption scale=$$val + AltFonts cantarellSS1,cantarellSS2 +EndFont + +AltFont cantarellSS1 + GuiName "Cantarell Sans Serif" + Family sf + OsfOption oldstyle + OsfDefault 0 + Package cantarell + ScaleOption scale=$$val + FontEncoding T2A,T1,OT1 +EndFont + +AltFont cantarellSS2 + GuiName "Cantarell Sans Serif" + Family sf + OsfOption lining + OsfDefault 1 + Package cantarell + ScaleOption scale=$$val + FontEncoding T2A,T1,OT1 +EndFont + Font cmbr GuiName "CM Bright" Family sf SwitchDefault 1 Requires cmbright @@ -901,10 +932,21 @@ Font beramono ScaleOption scaled=$$val Package beramono Requires bera EndFont +Font cantarellMS + GuiName "Cantarell Monospace" + Family tt + OsfOption oldstyle + OsfDefault 0 + Package cantarell + PackageOption "defaultsans,tabular" + FontEncoding T2A,T1,OT1 + ScaleOption scale=$$val +EndFont + Font cmtl GuiName "CM Typewriter Light" Family tt SwitchDefault 1 Requires cmbright
signature.asc
Description: This is a digitally signed message part.
