X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=1ccb263014651595f417bb099d9ea820c8a4b522;hb=bea9d2f3f774d62aa48fe83ebbefdd0e7d5f85b9;hp=03368dc8762e2b6400482dd5da0a70da5da54c33;hpb=a6b07608d8e9de24383d3ebaec20b6b265ed9314;p=lyx.git diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 03368dc876..1ccb263014 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -46,11 +46,11 @@ #include "LyX.h" #include "LyXRC.h" #include "LyXVC.h" -#include "output_docbook.h" #include "output.h" #include "output_latex.h" -#include "output_xhtml.h" +#include "output_docbook.h" #include "output_plaintext.h" +#include "output_xhtml.h" #include "Paragraph.h" #include "ParagraphParameters.h" #include "ParIterator.h" @@ -664,7 +664,6 @@ void Buffer::cloneWithChildren(BufferMap & bufmap, CloneList_ptr clones) const buffer_clone->setChild(dit, child_clone); } buffer_clone->d->macro_lock = false; - return; } @@ -1357,7 +1356,7 @@ Buffer::ReadStatus Buffer::convertLyXFormat(FileName const & fn, LYXERR(Debug::INFO, "Running '" << command_str << '\''); cmd_ret const ret = runCommand(command_str); - if (ret.first != 0) { + if (!ret.valid) { if (from_format < LYX_FORMAT) { Alert::error(_("Conversion script failed"), bformat(_("%1$s is from an older version" @@ -1549,9 +1548,8 @@ bool Buffer::save() const // time stamp is invalidated by copying/moving saveCheckSum(); markClean(); - if (d->file_format != LYX_FORMAT) - // the file associated with this buffer is now in the current format - d->file_format = LYX_FORMAT; + // the file associated with this buffer is now in the current format + d->file_format = LYX_FORMAT; return true; } // else we saved the file, but failed to move it to the right location. @@ -1905,9 +1903,9 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os, docstring uncodable_glyphs; Encoding const * const enc = runparams.encoding; if (enc) { - for (size_t n = 0; n < inputpath.size(); ++n) { - if (!enc->encodable(inputpath[n])) { - docstring const glyph(1, inputpath[n]); + for (char_type n : inputpath) { + if (!enc->encodable(n)) { + docstring const glyph(1, n); LYXERR0("Uncodable character '" << glyph << "' in input path!"); @@ -2112,7 +2110,7 @@ Buffer::ExportStatus Buffer::makeDocBookFile(FileName const & fname, updateMacroInstances(OutputUpdate); ExportStatus const retval = - writeDocBookSource(ofs, fname.absFileName(), runparams, output); + writeDocBookSource(ofs, runparams, output); if (retval == ExportKilled) return ExportKilled; @@ -2123,17 +2121,17 @@ Buffer::ExportStatus Buffer::makeDocBookFile(FileName const & fname, } -Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os, string const & fname, +Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os, OutputParams const & runparams, OutputWhat output) const { LaTeXFeatures features(*this, params(), runparams); validate(features); + d->bibinfo_.makeCitationLabels(*this); d->texrow.reset(); DocumentClass const & tclass = params().documentClass(); - string const & top_element = tclass.latexname(); bool const output_preamble = output == FullSource || output == OnlyPreamble; @@ -2141,68 +2139,38 @@ Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os, string const & output == FullSource || output == OnlyBody; if (output_preamble) { - if (runparams.flavor == OutputParams::XML) - os << "\n"; - - // FIXME UNICODE - os << "\n"; - preamble += "\n"; - preamble += "\n"; - preamble += "\n"; - } + // XML preamble, no doctype needed. + // Not using XMLStream for this, as the root tag would be in the tag stack and make troubles with the error + // detection mechanisms (these are called before the end tag is output, and thus interact with the canary + // parsep in output_docbook.cpp). + os << "\n" + << "\n"; - string const name = runparams.nice - ? changeExtension(absFileName(), ".sgml") : fname; - preamble += features.getIncludedFiles(name); - preamble += features.getLyXSGMLEntities(); + // Directly output the root tag, based on the current type of document. + string languageCode = params().language->code(); + string params = "xml:lang=\"" + languageCode + '"' + + " xmlns=\"http://docbook.org/ns/docbook\"" + + " xmlns:xlink=\"http://www.w3.org/1999/xlink\"" + + " xmlns:m=\"http://www.w3.org/1998/Math/MathML\"" + + " xmlns:xi=\"http://www.w3.org/2001/XInclude\"" + + " version=\"5.2\""; - if (!preamble.empty()) { - os << "\n [ " << preamble << " ]"; - } - os << ">\n\n"; + os << "<" << from_ascii(tclass.docbookroot()) << " " << from_ascii(params) << ">\n"; } if (output_body) { - string top = top_element; - top += " lang=\""; - if (runparams.flavor == OutputParams::XML) - top += params().language->code(); - else - top += params().language->code().substr(0, 2); - top += '"'; - - if (!params().options.empty()) { - top += ' '; - top += params().options; - } - - os << "\n"; - - params().documentClass().counters().reset(); + // Start to output the document. + XMLStream xs(os); + docbookParagraphs(text(), *this, xs, runparams); + } - xml::openTag(os, top); - os << '\n'; - try { - docbookParagraphs(text(), *this, os, runparams); - } - catch (ConversionException const &) { return ExportKilled; } - xml::closeTag(os, top_element); + if (output_preamble) { + // Close the root element. No need for a line break, as free text is never allowed + // in a root element, it must always be wrapped in some container. + os << "" << from_ascii(tclass.docbookroot()) << ">"; } + return ExportSuccess; } @@ -2259,7 +2227,7 @@ Buffer::ExportStatus Buffer::writeLyXHTMLSource(odocstream & os, os << "