#include "language.h"
#include "LaTeXFeatures.h"
#include "LColor.h"
+#include "lyxfont.h"
#include "lyxlex.h"
#include "lyxrc.h"
#include "lyxtextclasslist.h"
// true in the returned pair, then `second' is the textclass
// number; if it is false, second is 0. In both cases, second
// is what we want.
- textclass(textclasslist.NumberOfClass("article").second),
+ textclass(textclasslist.numberOfClass("article").second),
pimpl_(new Impl)
{
paragraph_separation = PARSEP_INDENT;
secnumdepth = 3;
tocdepth = 3;
language = default_language;
- fonts = "default";
+ fontsRoman = "default";
+ fontsSans = "default";
+ fontsTypewriter = "default";
+ fontsDefaultFamily = "default";
+ fontsSC = false;
+ fontsOSF = false;
+ fontsSansScale = 100;
+ fontsTypewriterScale = 100;
inputenc = "auto";
graphicsDriver = "default";
sides = LyXTextClass::OneSide;
lex.next();
string const classname = lex.getString();
pair<bool, lyx::textclass_type> pp =
- textclasslist.NumberOfClass(classname);
+ textclasslist.numberOfClass(classname);
if (pp.first) {
textclass = pp.second;
} else {
- textclass = 0;
- return classname;
+ // if text class does not exist, try to load it from filepath
+ pp = textclasslist.addTextClass(classname, filepath);
+ if (pp.first) {
+ textclass = pp.second;
+ } else {
+ textclass = 0;
+ return classname;
+ }
}
+ // FIXME: isTeXClassAvailable will try to load the layout file, but will
+ // fail because of the lack of path info. Warnings will be given although
+ // the layout file will be correctly loaded later.
if (!getLyXTextClass().isTeXClassAvailable()) {
string const msg =
bformat(_("The document uses a missing "
"TeX class \"%1$s\".\n"), classname);
Alert::warning(_("Document class not available"),
- msg + _("LyX will not be able to produce output."));
+ msg + _("LyX will not be able to produce output."));
}
} else if (token == "\\begin_preamble") {
readPreamble(lex);
lex >> inputenc;
} else if (token == "\\graphics") {
readGraphicsDriver(lex);
- } else if (token == "\\fontscheme") {
- lex >> fonts;
+ } else if (token == "\\font_roman") {
+ lex >> fontsRoman;
+ } else if (token == "\\font_sans") {
+ lex >> fontsSans;
+ } else if (token == "\\font_typewriter") {
+ lex >> fontsTypewriter;
+ } else if (token == "\\font_default_family") {
+ lex >> fontsDefaultFamily;
+ } else if (token == "\\font_sc") {
+ lex >> fontsSC;
+ } else if (token == "\\font_osf") {
+ lex >> fontsOSF;
+ } else if (token == "\\font_sf_scale") {
+ lex >> fontsSansScale;
+ } else if (token == "\\font_tt_scale") {
+ lex >> fontsTypewriterScale;
} else if (token == "\\paragraph_separation") {
string parsep;
lex >> parsep;
if (language != ignore_language)
os << "\\language " << language->lang() << '\n';
os << "\\inputencoding " << inputenc
- << "\n\\fontscheme " << fonts
+ << "\n\\font_roman " << fontsRoman
+ << "\n\\font_sans " << fontsSans
+ << "\n\\font_typewriter " << fontsTypewriter
+ << "\n\\font_default_family " << fontsDefaultFamily
+ << "\n\\font_sc " << convert<string>(fontsSC)
+ << "\n\\font_osf " << convert<string>(fontsOSF)
+ << "\n\\font_sf_scale " << fontsSansScale
+ << "\n\\font_tt_scale " << fontsTypewriterScale
<< "\n\\graphics " << graphicsDriver << '\n';
if (!float_placement.empty()) {
for (; it != end; ++it) {
os << "\\branch " << it->getBranch()
<< "\n\\selected " << it->getSelected()
- << "\n\\color " << it->getColor()
+ << "\n\\color " << lyx::X11hexname(it->getColor())
<< "\n\\end_branch"
<< "\n";
}
// end of \documentclass defs
// font selection must be done before loading fontenc.sty
- // The ae package is not needed when using OT1 font encoding.
- if (fonts != "default" &&
- (fonts != "ae" || lyxrc.fontenc != "default")) {
- os << "\\usepackage{" << fonts << "}\n";
+ string const fonts =
+ loadFonts(features, fontsRoman, fontsSans,
+ fontsTypewriter, fontsSC, fontsOSF,
+ fontsSansScale, fontsTypewriterScale);
+ if (!fonts.empty()) {
+ os << fonts;
texrow.newline();
- if (fonts == "ae") {
- os << "\\usepackage{aecompl}\n";
- texrow.newline();
- }
}
+ if (fontsDefaultFamily != "default")
+ os << "\\renewcommand{\\familydefault}{\\"
+ << fontsDefaultFamily << "}\n";
// this one is not per buffer
if (lyxrc.fontenc != "default") {
os << "\\usepackage[" << lyxrc.fontenc
if (inputenc == "auto") {
string const doc_encoding =
- language->encoding()->LatexName();
+ language->encoding()->latexName();
// Create a list with all the input encodings used
// in the document
texrow.newline();
}
- if (secnumdepth != tclass.secnumdepth()) {
- os << "\\setcounter{secnumdepth}{"
- << secnumdepth
- << "}\n";
- texrow.newline();
- }
- if (tocdepth != tclass.tocdepth()) {
- os << "\\setcounter{tocdepth}{"
- << tocdepth
- << "}\n";
- texrow.newline();
+ // Only if class has a ToC hierarchy
+ if (tclass.hasTocLevels()) {
+ if (secnumdepth != tclass.secnumdepth()) {
+ os << "\\setcounter{secnumdepth}{"
+ << secnumdepth
+ << "}\n";
+ texrow.newline();
+ }
+ if (tocdepth != tclass.tocdepth()) {
+ os << "\\setcounter{tocdepth}{"
+ << tocdepth
+ << "}\n";
+ texrow.newline();
+ }
}
if (paragraph_separation) {
if (user_defined_bullet(i) != ITEMIZE_DEFAULTS[i]) {
if (bullets_def.empty())
bullets_def="\\AtBeginDocument{\n";
- bullets_def += " \\renewcommand{\\labelitemi";
+ bullets_def += " \\def\\labelitemi";
switch (i) {
// `i' is one less than the item to modify
case 0:
bullets_def += 'v';
break;
}
- bullets_def += "}{" +
+ bullets_def += '{' +
user_defined_bullet(i).getText()
+ "}\n";
}
columns = tclass.columns();
pagestyle = tclass.pagestyle();
options = tclass.options();
- secnumdepth = tclass.secnumdepth();
- tocdepth = tclass.tocdepth();
+ // Only if class has a ToC hierarchy
+ if (tclass.hasTocLevels()) {
+ secnumdepth = tclass.secnumdepth();
+ tocdepth = tclass.tocdepth();
+ }
}
{
LyXFont f = getLyXTextClass().defaultfont();
f.setLanguage(language);
+ if (fontsDefaultFamily == "rmdefault")
+ f.setFamily(LyXFont::ROMAN_FAMILY);
+ else if (fontsDefaultFamily == "sfdefault")
+ f.setFamily(LyXFont::SANS_FAMILY);
+ else if (fontsDefaultFamily == "ttdefault")
+ f.setFamily(LyXFont::TYPEWRITER_FAMILY);
return f;
}
tmp = string("\\usepackage[") + lang_opts + "]{babel}";
return tmp;
}
+
+
+string const BufferParams::loadFonts(LaTeXFeatures & features, string const & rm,
+ string const & sf, string const & tt,
+ bool const & sc, bool const & osf,
+ int const & sfscale, int const & ttscale) const
+{
+ /* The LaTeX font world is in a flux. In the PSNFSS font interface,
+ several packages have been replaced by others, that might not
+ be installed on every system. We have to take care for that
+ (see psnfss.pdf). We try to support all psnfss fonts as well
+ as the fonts that have become de facto standard in the LaTeX
+ world (e.g. Latin Modern). We do not support obsolete fonts
+ (like PSLatex). In general, it should be possible to mix any
+ rm font with any sf or tt font, respectively. (JSpitzm)
+ TODO:
+ -- separate math fonts.
+ */
+
+ if (rm == "default" && sf == "default" && tt == "default")
+ //nothing to do
+ return string();
+
+ ostringstream os;
+
+ // ROMAN FONTS
+ // Computer Modern (must be explicitely selectable -- there might be classes
+ // that define a different default font!
+ if (rm == "cmr") {
+ os << "\\renewcommand{\\rmdefault}{cmr}\n";
+ // osf for Computer Modern needs eco.sty
+ if (osf)
+ os << "\\usepackage{eco}\n";
+ }
+ // Latin Modern Roman
+ else if (rm == "lmodern")
+ os << "\\usepackage{lmodern}\n";
+ // AE
+ else if (rm == "ae") {
+ // not needed when using OT1 font encoding.
+ if (lyxrc.fontenc != "default")
+ os << "\\usepackage{ae,aecompl}\n";
+ }
+ // Times
+ else if (rm == "times") {
+ // try to load the best available package
+ if (features.isAvailable("mathptmx"))
+ os << "\\usepackage{mathptmx}\n";
+ else if (features.isAvailable("mathptm"))
+ os << "\\usepackage{mathptm}\n";
+ else
+ os << "\\usepackage{times}\n";
+ }
+ // Palatino
+ else if (rm == "palatino") {
+ // try to load the best available package
+ if (features.isAvailable("mathpazo")) {
+ os << "\\usepackage";
+ if (osf || sc) {
+ os << '[';
+ if (!osf)
+ os << "sc";
+ else
+ // "osf" includes "sc"!
+ os << "osf";
+ os << ']';
+ }
+ os << "{mathpazo}\n";
+ }
+ else if (features.isAvailable("mathpple"))
+ os << "\\usepackage{mathpple}\n";
+ else
+ os << "\\usepackage{palatino}\n";
+ }
+ // Utopia
+ else if (rm == "utopia") {
+ // fourier supersedes utopia.sty, but does
+ // not work with OT1 encoding.
+ if (features.isAvailable("fourier")
+ && lyxrc.fontenc != "default") {
+ os << "\\usepackage";
+ if (osf || sc) {
+ os << '[';
+ if (sc)
+ os << "expert";
+ if (osf && sc)
+ os << ',';
+ if (osf)
+ os << "oldstyle";
+ os << ']';
+ }
+ os << "{fourier}\n";
+ }
+ else
+ os << "\\usepackage{utopia}\n";
+ }
+ // Bera (complete fontset)
+ else if (rm == "bera" && sf == "default" && tt == "default")
+ os << "\\usepackage{bera}\n";
+ // everything else
+ else if (rm != "default")
+ os << "\\usepackage" << "{" << rm << "}\n";
+
+ // SANS SERIF
+ // Helvetica, Bera Sans
+ if (sf == "helvet" || sf == "berasans") {
+ if (sfscale != 100)
+ os << "\\usepackage[scaled=" << float(sfscale) / 100
+ << "]{" << sf << "}\n";
+ else
+ os << "\\usepackage{" << sf << "}\n";
+ }
+ // Avant Garde
+ else if (sf == "avant")
+ os << "\\usepackage{" << sf << "}\n";
+ // Computer Modern, Latin Modern, CM Bright
+ else if (sf != "default")
+ os << "\\renewcommand{\\sfdefault}{" << sf << "}\n";
+
+ // monospaced/typewriter
+ // Courier, LuxiMono
+ if (tt == "luximono" || tt == "beramono") {
+ if (ttscale != 100)
+ os << "\\usepackage[scaled=" << float(ttscale) / 100
+ << "]{" << tt << "}\n";
+ else
+ os << "\\usepackage{" << tt << "}\n";
+ }
+ // Courier
+ else if (tt == "courier" )
+ os << "\\usepackage{" << tt << "}\n";
+ // Computer Modern, Latin Modern, CM Bright
+ else if (tt != "default")
+ os << "\\renewcommand{\\ttdefault}{" << tt << "}\n";
+
+ return os.str();
+}
projects / lyx.git / blobdiff