#include "Color.h"
#include "ColorSet.h"
#include "Encoding.h"
+#include "HSpace.h"
#include "IndicesList.h"
#include "Language.h"
#include "LaTeXFeatures.h"
/** This is the amount of space used for paragraph_separation "skip",
* and for detached paragraphs in "indented" documents.
*/
+ HSpace indentation;
VSpace defskip;
PDFOptions pdfoptions;
LayoutFileIndex baseClass_;
use_geometry = false;
use_amsmath = package_auto;
use_esint = package_auto;
+ use_mhchem = package_auto;
cite_engine_ = ENGINE_BASIC;
use_bibtopic = false;
use_indices = false;
trackChanges = false;
outputChanges = false;
use_default_options = true;
+ maintain_unincluded_children = false;
secnumdepth = 3;
tocdepth = 3;
language = default_language;
+ fontenc = "global";
fontsRoman = "default";
fontsSans = "default";
fontsTypewriter = "default";
inputenc = "auto";
graphicsDriver = "default";
defaultOutputFormat = "default";
+ bibtex_command = "default";
+ index_command = "default";
sides = OneSide;
columns = 1;
listings_params = string();
pagestyle = "default";
- // white is equal to no background color
+ suppress_date = false;
+ // no color is the default (white)
backgroundcolor = lyx::rgbFromHexName("#ffffff");
- compressed = false;
+ isbackgroundcolor = false;
+ // no color is the default (black)
+ fontcolor = lyx::rgbFromHexName("#000000");
+ isfontcolor = false;
+ // light gray is the default font color for greyed-out notes
+ notefontcolor = lyx::rgbFromHexName("#cccccc");
+ compressed = lyxrc.save_compressed;
for (int iter = 0; iter < 4; ++iter) {
user_defined_bullet(iter) = ITEMIZE_DEFAULTS[iter];
temp_bullet(iter) = ITEMIZE_DEFAULTS[iter];
}
// default index
indiceslist().addDefault(B_("Index"));
+ html_be_strict = true;
+ html_math_output = MathML;
}
}
+HSpace const & BufferParams::getIndentation() const
+{
+ return pimpl_->indentation;
+}
+
+
+void BufferParams::setIndentation(HSpace const & indent)
+{
+ pimpl_->indentation = indent;
+}
+
+
VSpace const & BufferParams::getDefSkip() const
{
return pimpl_->defskip;
// We assume that a tex class exists for local or unknown layouts so this warning
// will only be given for system layouts.
if (!baseClass()->isTeXClassAvailable()) {
+ docstring desc =
+ translateIfPossible(from_utf8(baseClass()->description()));
docstring const msg =
- bformat(_("The layout file requested by this document,\n"
- "%1$s.layout,\n"
- "is not usable. This is probably because a LaTeX\n"
- "class or style file required by it is not\n"
- "available. See the Customization documentation\n"
- "for more information.\n"), from_utf8(classname));
+ bformat(_("The document class requested\n"
+ "\t%1$s\n"
+ "requires external files that are not available.\n"
+ "The document class can still be used, but LyX\n"
+ "will not be able to produce output until the\n"
+ "following prerequisites are installed:\n"
+ "\t%2$s\n"
+ "See section 3.1.2.2 of the User's Guide for\n"
+ "more information."),
+ desc, from_utf8(baseClass()->prerequisites()));
frontend::Alert::warning(_("Document class not available"),
- msg + _("LyX will not be able to produce output."));
- }
+ msg);
+ }
} else if (token == "\\begin_preamble") {
readPreamble(lex);
} else if (token == "\\begin_local_layout") {
readModules(lex);
} else if (token == "\\begin_removed_modules") {
readRemovedModules(lex);
+ } else if (token == "\\begin_includeonly") {
+ readIncludeonly(lex);
+ } else if (token == "\\maintain_unincluded_children") {
+ lex >> maintain_unincluded_children;
} else if (token == "\\options") {
lex.eatLine();
options = lex.getString();
} else if (token == "\\master") {
lex.eatLine();
master = lex.getString();
+ } else if (token == "\\suppress_date") {
+ lex >> suppress_date;
} else if (token == "\\language") {
readLanguage(lex);
} else if (token == "\\inputencoding") {
readGraphicsDriver(lex);
} else if (token == "\\default_output_format") {
lex >> defaultOutputFormat;
+ } else if (token == "\\bibtex_command") {
+ lex.eatLine();
+ bibtex_command = lex.getString();
+ } else if (token == "\\index_command") {
+ lex.eatLine();
+ index_command = lex.getString();
+ } else if (token == "\\fontencoding") {
+ lex.eatLine();
+ fontenc = lex.getString();
} else if (token == "\\font_roman") {
lex.eatLine();
fontsRoman = lex.getString();
string parsep;
lex >> parsep;
paragraph_separation = parseptranslator().find(parsep);
+ } else if (token == "\\paragraph_indentation") {
+ lex.next();
+ string indentation = lex.getString();
+ pimpl_->indentation = HSpace(indentation);
} else if (token == "\\defskip") {
lex.next();
string defskip = lex.getString();
int useesint;
lex >> useesint;
use_esint = packagetranslator().find(useesint);
+ } else if (token == "\\use_mhchem") {
+ int usemhchem;
+ lex >> usemhchem;
+ use_mhchem = packagetranslator().find(usemhchem);
} else if (token == "\\cite_engine") {
string engine;
lex >> engine;
if (branch_ptr)
branch_ptr->setSelected(lex.getInteger());
}
- // not yet operational
+ if (tok == "\\filename_suffix") {
+ lex.next();
+ if (branch_ptr)
+ branch_ptr->setFilenameSuffix(lex.getInteger());
+ }
if (tok == "\\color") {
lex.eatLine();
string color = lex.getString();
} else if (token == "\\index") {
lex.eatLine();
docstring index = lex.getDocString();
+ docstring shortcut;
indiceslist().add(index);
while (true) {
lex.next();
Index * index_ptr = indiceslist().find(index);
if (tok == "\\shortcut") {
lex.next();
+ shortcut = lex.getDocString();
if (index_ptr)
- index_ptr->setShortcut(lex.getDocString());
+ index_ptr->setShortcut(shortcut);
}
- // not yet operational
if (tok == "\\color") {
lex.eatLine();
string color = lex.getString();
if (color == "none")
color = lcolor.getX11Name(Color_background);
// FIXME UNICODE
- lcolor.setColor(to_utf8(index), color);
+ if (!shortcut.empty())
+ lcolor.setColor(to_utf8(shortcut), color);
}
}
} else if (token == "\\author") {
istringstream ss(lex.getString());
Author a;
ss >> a;
- author_map.push_back(pimpl_->authorlist.record(a));
+ author_map[a.buffer_id()] = pimpl_->authorlist.record(a);
} else if (token == "\\paperorientation") {
string orient;
lex >> orient;
} else if (token == "\\backgroundcolor") {
lex.eatLine();
backgroundcolor = lyx::rgbFromHexName(lex.getString());
+ isbackgroundcolor = true;
+ } else if (token == "\\fontcolor") {
+ lex.eatLine();
+ fontcolor = lyx::rgbFromHexName(lex.getString());
+ isfontcolor = true;
+ } else if (token == "\\notefontcolor") {
+ lex.eatLine();
+ string color = lex.getString();
+ notefontcolor = lyx::rgbFromHexName(color);
+ // set the font color within LyX
+ // FIXME: the color is correctly set but later overwritten by the default
+ lcolor.setColor(Color_greyedouttext, color);
} else if (token == "\\paperwidth") {
lex >> paperwidth;
} else if (token == "\\paperheight") {
toktmp << endl;
return toktmp;
}
+ } else if (token == "\\html_math_output") {
+ int temp;
+ lex >> temp;
+ html_math_output = static_cast<MathOutput>(temp);
+ } else if (token == "\\html_be_strict") {
+ lex >> html_be_strict;
} else {
lyxerr << "BufferParams::readToken(): Unknown token: " <<
token << endl;
os << *it << '\n';
os << "\\end_modules" << '\n';
}
-
+
+ // includeonly
+ if (!includedChildren_.empty()) {
+ os << "\\begin_includeonly" << '\n';
+ list<string>::const_iterator it = includedChildren_.begin();
+ list<string>::const_iterator en = includedChildren_.end();
+ for (; it != en; it++)
+ os << *it << '\n';
+ os << "\\end_includeonly" << '\n';
+ }
+ os << "\\maintain_unincluded_children "
+ << convert<string>(maintain_unincluded_children) << '\n';
+
// local layout information
if (!local_layout.empty()) {
// remove '\n' from the end
if (language != ignore_language)
os << "\\language " << language->lang() << '\n';
os << "\\inputencoding " << inputenc
+ << "\n\\fontencoding " << fontenc
<< "\n\\font_roman " << fontsRoman
<< "\n\\font_sans " << fontsSans
<< "\n\\font_typewriter " << fontsTypewriter
}
os << "\n\\graphics " << graphicsDriver << '\n';
os << "\\default_output_format " << defaultOutputFormat << '\n';
+ os << "\\bibtex_command " << bibtex_command << '\n';
+ os << "\\index_command " << index_command << '\n';
if (!float_placement.empty()) {
os << "\\float_placement " << float_placement << '\n';
<< "\n\\use_geometry " << convert<string>(use_geometry)
<< "\n\\use_amsmath " << use_amsmath
<< "\n\\use_esint " << use_esint
+ << "\n\\use_mhchem " << use_mhchem
<< "\n\\cite_engine " << citeenginetranslator().find(cite_engine_)
<< "\n\\use_bibtopic " << convert<string>(use_bibtopic)
<< "\n\\use_indices " << convert<string>(use_indices)
<< "\n\\paperorientation " << string_orientation[orientation]
- << "\n\\backgroundcolor " << lyx::X11hexname(backgroundcolor)
+ << "\n\\suppress_date " << convert<string>(suppress_date)
<< '\n';
+ if (isbackgroundcolor == true)
+ os << "\\backgroundcolor " << lyx::X11hexname(backgroundcolor) << '\n';
+ if (isfontcolor == true)
+ os << "\\fontcolor " << lyx::X11hexname(fontcolor) << '\n';
+ if (notefontcolor != lyx::rgbFromHexName("#cccccc"))
+ os << "\\notefontcolor " << lyx::X11hexname(notefontcolor) << '\n';
BranchList::const_iterator it = branchlist().begin();
BranchList::const_iterator end = branchlist().end();
for (; it != end; ++it) {
os << "\\branch " << to_utf8(it->branch())
<< "\n\\selected " << it->isSelected()
+ << "\n\\filename_suffix " << it->hasFilenameSuffix()
<< "\n\\color " << lyx::X11hexname(it->color())
<< "\n\\end_branch"
<< "\n";
os << "\\secnumdepth " << secnumdepth
<< "\n\\tocdepth " << tocdepth
<< "\n\\paragraph_separation "
- << string_paragraph_separation[paragraph_separation]
- << "\n\\defskip " << getDefSkip().asLyXCommand()
- << "\n\\quotes_language "
+ << string_paragraph_separation[paragraph_separation];
+ if (!paragraph_separation)
+ os << "\n\\paragraph_indentation " << getIndentation().asLyXCommand();
+ else
+ os << "\n\\defskip " << getDefSkip().asLyXCommand();
+ os << "\n\\quotes_language "
<< string_quotes_language[quotes_language]
<< "\n\\papercolumns " << columns
<< "\n\\papersides " << sides
}
}
- os << "\\tracking_changes " << convert<string>(trackChanges) << "\n";
- os << "\\output_changes " << convert<string>(outputChanges) << "\n";
+ os << "\\tracking_changes " << convert<string>(trackChanges) << "\n"
+ << "\\output_changes " << convert<string>(outputChanges) << "\n"
+ << "\\html_math_output " << html_math_output << "\n"
+ << "\\html_be_strict " << convert<string>(html_be_strict) << "\n";
- AuthorList::Authors::const_iterator a_it = pimpl_->authorlist.begin();
- AuthorList::Authors::const_iterator a_end = pimpl_->authorlist.end();
- for (; a_it != a_end; ++a_it) {
- if (a_it->second.used())
- os << "\\author " << a_it->second << "\n";
- else
- os << "\\author " << Author() << "\n";
- }
+ os << pimpl_->authorlist;
}
features.require("amsmath");
if (use_esint == package_on)
features.require("esint");
+ if (use_mhchem == package_on)
+ features.require("mhchem");
// Document-level line spacing
if (spacing().getSpace() != Spacing::Single && !spacing().isDefault())
features.require("hyperref");
// due to interferences with babel and hyperref, the color package has to
// be loaded after hyperref when hyperref is used with the colorlinks
- // option, see http://bugzilla.lyx.org/show_bug.cgi?id=5291
+ // option, see http://www.lyx.org/trac/ticket/5291
if (pdfoptions().colorlinks)
features.require("color");
}
bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
- TexRow & texrow) const
+ TexRow & texrow, FileName const & filepath) const
{
os << "\\documentclass";
// viet = string::npos when not found
// the same is for all other languages that are not directly supported by
// babel, but where LaTeX-packages add babel support.
- // this is currently the case for Latvian, Lithuanian, and Mongolian
+ // this is currently the case for Latvian, Lithuanian, Mongolian
+ // and Turkmen
size_t latvian = language_options.str().find("latvian");
size_t lithu = language_options.str().find("lithuanian");
size_t mongo = language_options.str().find("mongolian");
+ size_t turkmen = language_options.str().find("turkmen");
// if Japanese is used, babel must directly be loaded
// with language options, not in the class options, see
- // http://bugzilla.lyx.org/show_bug.cgi?id=4597#c4
+ // http://www.lyx.org/trac/ticket/4597#c4
size_t japan = language_options.str().find("japanese");
if (lyxrc.language_global_options && !language_options.str().empty()
&& viet == string::npos && japan == string::npos
&& latvian == string::npos && lithu == string::npos
- && mongo == string::npos)
+ && mongo == string::npos && turkmen == string::npos)
clsoptions << language_options.str() << ',';
}
<< from_ascii(fontsDefaultFamily) << "}\n";
// set font encoding
- // this one is not per buffer
// for arabic_arabi and farsi we also need to load the LAE and
// LFE encoding
- // XeteX works without fontenc
- if (lyxrc.fontenc != "default" && language->lang() != "japanese"
+ // XeTeX works without fontenc
+ if (font_encoding() != "default" && language->lang() != "japanese"
&& !useXetex) {
if (language->lang() == "arabic_arabi"
|| language->lang() == "farsi") {
- os << "\\usepackage[" << from_ascii(lyxrc.fontenc)
+ os << "\\usepackage[" << from_ascii(font_encoding())
<< ",LFE,LAE]{fontenc}\n";
texrow.newline();
} else {
- os << "\\usepackage[" << from_ascii(lyxrc.fontenc)
+ os << "\\usepackage[" << from_ascii(font_encoding())
<< "]{fontenc}\n";
texrow.newline();
}
// handle inputenc etc.
writeEncodingPreamble(os, features, texrow);
+ // includeonly
+ if (!features.runparams().includeall && !includedChildren_.empty()) {
+ os << "\\includeonly{";
+ list<string>::const_iterator it = includedChildren_.begin();
+ bool first = true;
+ for (; it != includedChildren_.end() ; ++it) {
+ string incfile = *it;
+ FileName inc = makeAbsPath(incfile, filepath.absFilename());
+ string mangled = DocFileName(changeExtension(inc.absFilename(), ".tex")).
+ mangledFilename();
+ if (!features.runparams().nice)
+ incfile = mangled;
+ // \includeonly doesn't want an extension
+ incfile = changeExtension(incfile, string());
+ incfile = support::latex_path(incfile);
+ if (!incfile.empty()) {
+ if (!first)
+ os << ",";
+ os << from_utf8(incfile);
+ }
+ first = false;
+ }
+ os << "}\n";
+ }
+
if (!listings_params.empty() || features.isRequired("listings")) {
os << "\\usepackage{listings}\n";
texrow.newline();
texrow.newline();
}
- // only output when the background color is not white
- if (backgroundcolor != lyx::rgbFromHexName("#ffffff")) {
+ // only output when the background color is not default
+ if (isbackgroundcolor == true) {
// only require color here, the background color will be defined
// in LaTeXFeatures.cpp to avoid interferences with the LaTeX
// package pdfpages
features.require("pagecolor");
}
+ // only output when the font color is not default
+ if (isfontcolor == true) {
+ // only require color here, the font color will be defined
+ // in LaTeXFeatures.cpp to avoid interferences with the LaTeX
+ // package pdfpages
+ features.require("color");
+ features.require("fontcolor");
+ }
+
// Only if class has a ToC hierarchy
if (tclass.hasTocLevels()) {
if (secnumdepth != tclass.secnumdepth()) {
}
if (paragraph_separation) {
+ // when skip separation
switch (getDefSkip().kind()) {
case VSpace::SMALLSKIP:
os << "\\setlength{\\parskip}{\\smallskipamount}\n";
break;
}
texrow.newline();
-
os << "\\setlength{\\parindent}{0pt}\n";
texrow.newline();
+ } else {
+ // when separation by indentation
+ // only output something when a width is given
+ if (getIndentation().asLyXCommand() != "default") {
+ os << "\\setlength{\\parindent}{"
+ << from_utf8(getIndentation().asLatexCommand())
+ << "}\n";
+ texrow.newline();
+ }
}
// Now insert the LyX specific LaTeX commands...
// due to interferences with babel and hyperref, the color package has to
// be loaded (when it is not already loaded) before babel when hyperref
// is used with the colorlinks option, see
- // http://bugzilla.lyx.org/show_bug.cgi?id=5291
+ // http://www.lyx.org/trac/ticket/5291
// we decided therefore to load color always before babel, see
// http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg144349.html
lyxpreamble += from_ascii(features.getColorOptions());
// before hyperref. Then hyperref has a chance to detect babel.
// * Has to be loaded before the "LyX specific LaTeX commands" to
// avoid errors with algorithm floats.
- // use hyperref explicitely when it is required
+ // use hyperref explicitly if it is required
if (features.isRequired("hyperref")) {
- odocstringstream oss;
- pdfoptions().writeLaTeX(oss, documentClass().provides("hyperref"));
- lyxpreamble += oss.str();
+ // pass what we have to stream here, since we need
+ // to access the stream itself in PDFOptions.
+ os << lyxpreamble;
+
+ int lines =
+ int(count(lyxpreamble.begin(), lyxpreamble.end(), '\n'));
+
+ OutputParams tmp_params = features.runparams();
+ lines += pdfoptions().writeLaTeX(tmp_params, os,
+ documentClass().provides("hyperref"));
+ texrow.newlines(lines);
+ // set back for the rest
+ lyxpreamble.clear();
}
-
- // Will be surrounded by \makeatletter and \makeatother when needed
+
+ // Will be surrounded by \makeatletter and \makeatother when not empty
docstring atlyxpreamble;
// Some macros LyX will need
- docstring tmppreamble(from_ascii(features.getMacros()));
+ docstring tmppreamble(features.getMacros());
if (!tmppreamble.empty())
atlyxpreamble += "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
"Textclass specific LaTeX commands.\n"
+ tmppreamble + '\n';
+ // suppress date if selected
+ // use \@ifundefined because we cannot be sure that every document class
+ // has a \date command
+ if (suppress_date)
+ atlyxpreamble += "\\@ifundefined{date}{}{\\date{}}\n";
+
/* the user-defined preamble */
- if (!preamble.empty())
+ if (!containsOnly(preamble, " \n\t"))
// FIXME UNICODE
atlyxpreamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
"User specified LaTeX commands.\n"
if (!bullets_def.empty())
atlyxpreamble += bullets_def + "}\n\n";
- if (atlyxpreamble.find(from_ascii("@")) != docstring::npos)
+ if (!atlyxpreamble.empty())
lyxpreamble += "\n\\makeatletter\n"
+ atlyxpreamble + "\\makeatother\n\n";
- else
- lyxpreamble += '\n' + atlyxpreamble;
// We try to load babel late, in case it interferes with other packages.
// Jurabib and Hyperref have to be called after babel, though.
int const nlines =
int(count(lyxpreamble.begin(), lyxpreamble.end(), '\n'));
- for (int j = 0; j != nlines; ++j) {
- texrow.newline();
- }
+ texrow.newlines(nlines);
os << lyxpreamble;
}
+void BufferParams::readIncludeonly(Lexer & lex)
+{
+ if (!lex.eatLine()) {
+ lyxerr << "Error (BufferParams::readIncludeonly):"
+ "Unexpected end of input." << endl;
+ return;
+ }
+ while (true) {
+ string child = lex.getString();
+ if (child == "\\end_includeonly")
+ break;
+ includedChildren_.push_back(child);
+ lex.eatLine();
+ }
+}
+
+
string BufferParams::paperSizeName(PapersizePurpose purpose) const
{
char real_papersize = papersize;
}
+string const BufferParams::font_encoding() const
+{
+ return (fontenc == "global") ? lyxrc.fontenc : fontenc;
+}
+
+
string BufferParams::babelCall(string const & lang_opts) const
{
string lang_pack = lyxrc.language_package;
// viet = string::npos when not found
// the same is for all other languages that are not directly supported by
// babel, but where LaTeX-packages add babel support.
- // this is currently the case for Latvian, Lithuanian, and Mongolian
+ // this is currently the case for Latvian, Lithuanian, Mongolian
+ // and Turkmen
size_t latvian = lang_opts.find("latvian");
size_t lithu = lang_opts.find("lithuanian");
size_t mongo = lang_opts.find("mongolian");
+ size_t turkmen = lang_opts.find("turkmen");
// If Japanese is used, babel must directly be loaded with the
// language options, see
- // http://bugzilla.lyx.org/show_bug.cgi?id=4597#c4
+ // http://www.lyx.org/trac/ticket/4597#c4
size_t japan = lang_opts.find("japanese");
if (!lyxrc.language_global_options || viet != string::npos
|| japan != string::npos || latvian != string::npos
- || lithu != string::npos || mongo != string::npos)
+ || lithu != string::npos || mongo != string::npos
+ || turkmen != string::npos)
return "\\usepackage[" + lang_opts + "]{babel}";
return lang_pack;
}
}
// ROMAN FONTS
- // Computer Modern (must be explicitely selectable -- there might be classes
+ // Computer Modern (must be explicitly selectable -- there might be classes
// that define a different default font!
if (rm == "cmr") {
os << "\\renewcommand{\\rmdefault}{cmr}\n";
// AE
else if (rm == "ae") {
// not needed when using OT1 font encoding.
- if (lyxrc.fontenc != "default")
+ if (font_encoding() != "default")
os << "\\usepackage{ae,aecompl}\n";
}
// Times
// fourier supersedes utopia.sty, but does
// not work with OT1 encoding.
if (LaTeXFeatures::isAvailable("fourier")
- && lyxrc.fontenc != "default") {
+ && font_encoding() != "default") {
os << "\\usepackage";
if (osf || sc) {
os << '[';