trackChanges = false;
outputChanges = false;
use_default_options = true;
+ maintain_unincluded_children = false;
secnumdepth = 3;
tocdepth = 3;
language = default_language;
suppress_date = false;
// white is equal to no background color
backgroundcolor = lyx::rgbFromHexName("#ffffff");
- compressed = 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;
}
// 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 == "\\backgroundcolor") {
lex.eatLine();
backgroundcolor = lyx::rgbFromHexName(lex.getString());
+ } else if (token == "\\notefontcolor") {
+ lex.eatLine();
+ string color = lex.getString();
+ notefontcolor = lyx::rgbFromHexName(color);
+ // set the font color within LyX
+ 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
<< '\n';
if (backgroundcolor != lyx::rgbFromHexName("#ffffff"))
os << "\\backgroundcolor " << lyx::X11hexname(backgroundcolor) << '\n';
+ if (notefontcolor != lyx::rgbFromHexName("#cccccc"))
+ os << "\\notefontcolor " << lyx::X11hexname(notefontcolor) << '\n';
BranchList::const_iterator it = branchlist().begin();
BranchList::const_iterator end = branchlist().end();
}
}
- 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";
os << pimpl_->authorlist;
}
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";
size_t mongo = language_options.str().find("mongolian");
// 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
// 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();
// 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 not empty
docstring atlyxpreamble;
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;
size_t mongo = lang_opts.find("mongolian");
// 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
}
// 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";
projects / lyx.git / blobdiff