#include "insets/InsetBranch.h"
#include "insets/InsetInclude.h"
-#include "insets/InsetTabular.h"
#include "insets/InsetText.h"
#include "mathed/InsetMathHull.h"
catch (EncodingException const & e) {
docstring const failed(1, e.failed_char);
ostringstream oss;
- oss << "0x" << hex << e.failed_char << dec;
+ oss << "0x" << hex << static_cast<uint32_t>(e.failed_char) << dec;
if (getParFromID(e.par_id).paragraph().layout().pass_thru) {
docstring msg = bformat(_("Uncodable character '%1$s'"
" (code point %2$s)"),
// parsep in output_docbook.cpp).
os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
<< "<!-- This DocBook file was created by LyX " << lyx_version
- << "\n See http://www.lyx.org/ for more information -->\n";
+ << "\n See https://www.lyx.org/ for more information -->\n";
// Directly output the root tag, based on the current type of document.
string languageCode = params().language->code();
// Generate the LaTeX file if neccessary
OutputParams runparams(¶ms().encoding());
- runparams.flavor = OutputParams::LATEX;
+ runparams.flavor = Flavor::LaTeX;
runparams.nice = false;
runparams.linelen = lyxrc.plaintext_linelen;
ExportStatus const retval =
}
-void Buffer::addBiblioInfo(BiblioInfo const & bin) const
+void Buffer::addBiblioInfo(BiblioInfo const & bi_in) const
{
- // We add the biblio info to the master buffer,
- // if there is one, but also to every single buffer,
- // in case a child is compiled alone.
- BiblioInfo & bi = d->bibinfo_;
- bi.mergeBiblioInfo(bin);
+ // We add the biblio info to the parent buffer,
+ // if there is one, but also to this buffer, in case
+ // it is compiled alone.
+ BiblioInfo & our_bi = d->bibinfo_;
+ our_bi.mergeBiblioInfo(bi_in);
- if (parent() != nullptr) {
- BiblioInfo & masterbi = parent()->d->bibinfo_;
- masterbi.mergeBiblioInfo(bin);
- }
+ if (parent())
+ parent()->addBiblioInfo(bi_in);
}
return ParConstIterator(doc_iterator_end(this));
}
+bool Buffer::empty() const
+{
+ return paragraphs().size() == 1 && paragraphs().front().empty();
+}
+
Language const * Buffer::language() const
{
// Some macros rely on font encoding
runparams.main_fontenc = params().main_font_encoding();
+ // Use the right wrapping for the comment at the beginning of the generated
+ // snippet, so that it is either valid LaTeX or valid XML (including HTML and DocBook).
+ docstring comment_start = from_ascii("% ");
+ docstring comment_end = from_ascii("");
+ if (runparams.flavor == Flavor::Html || runparams.flavor == Flavor::DocBook5) {
+ comment_start = from_ascii("<!-- ");
+ comment_end = from_ascii(" -->");
+ }
+
if (output == CurrentParagraph) {
runparams.par_begin = par_begin;
runparams.par_end = par_end;
if (par_begin + 1 == par_end) {
- os << "% "
+ os << comment_start
<< bformat(_("Preview source code for paragraph %1$d"), par_begin)
+ << comment_end
<< "\n\n";
} else {
- os << "% "
+ os << comment_start
<< bformat(_("Preview source code from paragraph %1$s to %2$s"),
convert<docstring>(par_begin),
convert<docstring>(par_end - 1))
+ << comment_end
<< "\n\n";
}
// output paragraphs
- if (runparams.flavor == OutputParams::LYX) {
+ if (runparams.flavor == Flavor::LyX) {
Paragraph const & par = text().paragraphs()[par_begin];
ostringstream ods;
depth_type dt = par.getDepth();
par.write(ods, params(), dt);
os << from_utf8(ods.str());
- } else if (runparams.flavor == OutputParams::HTML) {
+ } else if (runparams.flavor == Flavor::Html) {
XMLStream xs(os);
setMathFlavor(runparams);
xhtmlParagraphs(text(), *this, xs, runparams);
- } else if (runparams.flavor == OutputParams::TEXT) {
+ } else if (runparams.flavor == Flavor::Text) {
bool dummy = false;
// FIXME Handles only one paragraph, unlike the others.
// Probably should have some routine with a signature like them.
writePlaintextParagraph(*this,
text().paragraphs()[par_begin], os, runparams, dummy);
- } else if (runparams.flavor == OutputParams::DOCBOOK5) {
+ } else if (runparams.flavor == Flavor::DocBook5) {
XMLStream xs{os};
docbookParagraphs(text(), *this, xs, runparams);
} else {
d->ignore_parent = false;
}
} else {
- os << "% ";
+ os << comment_start;
if (output == FullSource)
os << _("Preview source code");
else if (output == OnlyPreamble)
os << _("Preview preamble");
else if (output == OnlyBody)
os << _("Preview body");
+ os << comment_end;
os << "\n\n";
- if (runparams.flavor == OutputParams::LYX) {
+ if (runparams.flavor == Flavor::LyX) {
ostringstream ods;
if (output == FullSource)
write(ods);
else if (output == OnlyBody)
text().write(ods);
os << from_utf8(ods.str());
- } else if (runparams.flavor == OutputParams::HTML) {
+ } else if (runparams.flavor == Flavor::Html) {
writeLyXHTMLSource(os, runparams, output);
- } else if (runparams.flavor == OutputParams::TEXT) {
- if (output == OnlyPreamble) {
+ } else if (runparams.flavor == Flavor::Text) {
+ if (output == OnlyPreamble)
os << "% "<< _("Plain text does not have a preamble.");
- } else
+ else
writePlaintextFile(*this, os, runparams);
- } else if (runparams.flavor == OutputParams::DOCBOOK5) {
+ } else if (runparams.flavor == Flavor::DocBook5) {
writeDocBookSource(os, runparams, output);
} else {
// latex or literate
}
MarkAsExporting exporting(this);
string backend_format;
- runparams.flavor = OutputParams::LATEX;
+ runparams.flavor = Flavor::LaTeX;
runparams.linelen = lyxrc.plaintext_linelen;
runparams.includeall = includeall;
vector<string> backs = params().backends();
LYXERR(Debug::FILES, "backend_format=" << backend_format);
// FIXME: Don't hardcode format names here, but use a flag
if (backend_format == "pdflatex")
- runparams.flavor = OutputParams::PDFLATEX;
+ runparams.flavor = Flavor::PdfLaTeX;
else if (backend_format == "luatex")
- runparams.flavor = OutputParams::LUATEX;
+ runparams.flavor = Flavor::LuaTeX;
else if (backend_format == "dviluatex")
- runparams.flavor = OutputParams::DVILUATEX;
+ runparams.flavor = Flavor::DviLuaTeX;
else if (backend_format == "xetex")
- runparams.flavor = OutputParams::XETEX;
+ runparams.flavor = Flavor::XeTeX;
}
string filename = latexName(false);
// Plain text backend
if (backend_format == "text") {
- runparams.flavor = OutputParams::TEXT;
+ runparams.flavor = Flavor::Text;
try {
writePlaintextFile(*this, FileName(filename), runparams);
}
}
// HTML backend
else if (backend_format == "xhtml") {
- runparams.flavor = OutputParams::HTML;
+ runparams.flavor = Flavor::Html;
setMathFlavor(runparams);
if (makeLyXHTMLFile(FileName(filename), runparams) == ExportKilled)
return ExportKilled;
writeFile(FileName(filename));
// DocBook backend
else if (backend_format == "docbook5") {
- runparams.flavor = OutputParams::DOCBOOK5;
+ runparams.flavor = Flavor::DocBook5;
runparams.nice = false;
if (makeDocBookFile(FileName(filename), runparams) == ExportKilled)
return ExportKilled;