mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Add sans serif font series "Chivo"
This commit is contained in:
parent
70dab67113
commit
e9c0d48d58
@ -476,6 +476,7 @@
|
||||
%\TestFont[glic1000]{cbgreek}% for Greek % suported by LyX but too large to force downloading
|
||||
\TestPackage{cantarell}
|
||||
\TestPackage{ccfonts}
|
||||
\TestPackage{Chivo}
|
||||
\TestFont[ccr10]{concrete} % required by ccfonts
|
||||
\TestFont[eorm10]{ecc} % required by ccfonts
|
||||
\TestPackage[ot1ccr.fd]{concmath} % required by ccfonts
|
||||
|
@ -1,5 +1,5 @@
|
||||
#LyX 2.4 created this file. For more info see https://www.lyx.org/
|
||||
\lyxformat 582
|
||||
\lyxformat 583
|
||||
\begin_document
|
||||
\begin_header
|
||||
\save_transient_properties true
|
||||
@ -445,6 +445,39 @@ Notes: Cantarell is a contemporary humanist sans serif, and is used by the
|
||||
|
||||
\end_layout
|
||||
|
||||
\begin_layout Subsection
|
||||
|
||||
\change_inserted -1174727462 1563362850
|
||||
Chivo
|
||||
\end_layout
|
||||
|
||||
\begin_layout Description
|
||||
|
||||
\change_inserted -1174727462 1563363590
|
||||
Found:
|
||||
\begin_inset Info
|
||||
type "package"
|
||||
arg "Chivo"
|
||||
\end_inset
|
||||
|
||||
|
||||
\end_layout
|
||||
|
||||
\begin_layout Description
|
||||
|
||||
\change_inserted -1174727462 1563363604
|
||||
CTAN: fonts/Chivo
|
||||
\end_layout
|
||||
|
||||
\begin_layout Description
|
||||
|
||||
\change_inserted -1174727462 1563363027
|
||||
Notes: Chivo is a set of fourteen fonts provided by Héctor Gatti & [Omnibus-Type
|
||||
](http://www.omnibus-type.com/fonts/chivo.php) Team under the Open Font License
|
||||
[(OFL)](http://scripts.sil.org/OFL), version 1.1.
|
||||
The fonts are copyright (c) 2011-2019, Omnibus-Type.
|
||||
\end_layout
|
||||
|
||||
\begin_layout Subsection
|
||||
CM bright
|
||||
\end_layout
|
||||
|
@ -653,6 +653,50 @@ Font cantarell
|
||||
ScaleOption scale=$$val
|
||||
EndFont
|
||||
|
||||
Font ChivoThin
|
||||
GuiName "Chivo (Thin)"
|
||||
Family sf
|
||||
OsfOption oldstyle
|
||||
Package Chivo
|
||||
PackageOption "thin"
|
||||
MoreOptions 1
|
||||
FontEncoding OT1,LY1,T1,TS1
|
||||
ScaleOption scale=$$val
|
||||
EndFont
|
||||
|
||||
Font ChivoLight
|
||||
GuiName "Chivo (Light)"
|
||||
Family sf
|
||||
OsfOption oldstyle
|
||||
Package Chivo
|
||||
PackageOption "light"
|
||||
MoreOptions 1
|
||||
FontEncoding OT1,LY1,T1,TS1
|
||||
ScaleOption scale=$$val
|
||||
EndFont
|
||||
|
||||
Font Chivo
|
||||
GuiName "Chivo"
|
||||
Family sf
|
||||
OsfOption oldstyle
|
||||
Package Chivo
|
||||
PackageOption "regular"
|
||||
MoreOptions 1
|
||||
FontEncoding OT1,LY1,T1,TS1
|
||||
ScaleOption scale=$$val
|
||||
EndFont
|
||||
|
||||
Font ChivoMedium
|
||||
GuiName "Chivo (Medium)"
|
||||
Family sf
|
||||
OsfOption oldstyle
|
||||
Package Chivo
|
||||
PackageOption "medium"
|
||||
MoreOptions 1
|
||||
FontEncoding OT1,LY1,T1,TS1
|
||||
ScaleOption scale=$$val
|
||||
EndFont
|
||||
|
||||
Font cmbr
|
||||
GuiName "CM Bright"
|
||||
Family sf
|
||||
|
@ -388,6 +388,7 @@ bool LaTeXFont::readFont(Lexer & lex)
|
||||
{ "ot1font", LF_OT1_FONT },
|
||||
{ "package", LF_PACKAGE },
|
||||
{ "packageoption", LF_PACKAGEOPTION },
|
||||
{ "packageoptions", LF_PACKAGEOPTION },
|
||||
{ "preamble", LF_PREAMBLE },
|
||||
{ "provides", LF_PROVIDES },
|
||||
{ "requires", LF_REQUIRES },
|
||||
|
@ -148,7 +148,7 @@ const char * const known_roman_font_packages[] = { "ae", "beraserif", "bookman",
|
||||
"tgpagella", "tgschola", "tgtermes", "utopia", "xcharter", 0 };
|
||||
|
||||
const char * const known_sans_font_packages[] = { "avant", "berasans", "biolinum",
|
||||
"biolinum-type1", "cantarell", "cmbr", "cmss", "DejaVuSans", "DejaVuSansCondensed", "FiraSans", "helvet", "iwona",
|
||||
"biolinum-type1", "cantarell", "Chivo", "cmbr", "cmss", "DejaVuSans", "DejaVuSansCondensed", "FiraSans", "helvet", "iwona",
|
||||
"iwonac", "iwonal", "iwonalc", "kurier", "kurierc", "kurierl", "kurierlc", "lmss", "noto", "noto-sans", "PTSans",
|
||||
"tgadventor", "tgheros", "uop", 0 };
|
||||
|
||||
@ -1135,6 +1135,38 @@ void Preamble::handle_package(Parser &p, string const & name,
|
||||
options.clear();
|
||||
}
|
||||
|
||||
if (name == "Chivo") {
|
||||
h_font_roman[0] = "Chivo";
|
||||
for (auto const & opt : allopts) {
|
||||
if (opt == "thin") {
|
||||
h_font_roman[0] = "ChivoThin";
|
||||
continue;
|
||||
}
|
||||
if (opt == "light") {
|
||||
h_font_roman[0] = "ChivoLight";
|
||||
continue;
|
||||
}
|
||||
if (opt == "regular") {
|
||||
h_font_roman[0] = "Chivo";
|
||||
continue;
|
||||
}
|
||||
if (opt == "medium") {
|
||||
h_font_roman[0] = "ChivoMedium";
|
||||
continue;
|
||||
}
|
||||
if (prefixIs(opt, "oldstyle")) {
|
||||
h_font_sans_osf = "true";
|
||||
continue;
|
||||
}
|
||||
if (!xopts.empty())
|
||||
xopts += ", ";
|
||||
xopts += opt;
|
||||
}
|
||||
if (!xopts.empty())
|
||||
h_font_sans_opts = xopts;
|
||||
options.clear();
|
||||
}
|
||||
|
||||
if (name == "PTSans") {
|
||||
h_font_sans[0] = "PTSans-TLF";
|
||||
}
|
||||
|
@ -32,8 +32,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 582 // Kornel: Add cantarell sans serif font
|
||||
#define LYX_FORMAT_TEX2LYX 582
|
||||
#define LYX_FORMAT_LYX 583 // Kornel: Add Chivo sans serif font
|
||||
#define LYX_FORMAT_TEX2LYX 583
|
||||
|
||||
#if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
|
||||
#ifndef _MSC_VER
|
||||
|
Loading…
Reference in New Issue
Block a user