Clean includes in TextMetrics.cpp

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 97a6cfbd31afe1e771034326ef982b37fff7a7fb..1ccb263014651595f417bb099d9ea820c8a4b522 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -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!");
@@ -2140,8 +2138,6 @@ Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os,
        bool const output_body =
          output == FullSource || output == OnlyBody;
 
-       XMLStream xs(os);
-
        if (output_preamble) {
                // 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
@@ -2164,16 +2160,17 @@ Buffer::ExportStatus Buffer::writeDocBookSource(odocstream & os,
        }
 
        if (output_body) {
-               params().documentClass().counters().reset();
-
                // Start to output the document.
+               XMLStream xs(os);
                docbookParagraphs(text(), *this, xs, runparams);
        }
 
        if (output_preamble) {
-               // Close the root element.
-               os << "\n</" << from_ascii(tclass.docbookroot()) << ">";
+               // 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;
 }
 
@@ -4012,10 +4009,7 @@ InsetLabel const * Buffer::insetLabel(docstring const & label,
 
 bool Buffer::activeLabel(docstring const & label) const
 {
-       if (!insetLabel(label, true))
-               return false;
-
-       return true;
+       return insetLabel(label, true) != nullptr;
 }
 
 
@@ -4414,7 +4408,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
                                // Only show this alert if this is an export to a non-temporary
                                // file (not for previewing).
                                docstring s = bformat(_("No information for exporting the format %1$s."),
-                                                     theFormats().prettyName(format));
+                                                     translateIfPossible(theFormats().prettyName(format)));
                                if (format == "pdf4")
                                        s += "\n"
                                          + bformat(_("Hint: use non-TeX fonts or set input encoding "
@@ -4470,7 +4464,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
        // DocBook backend
        else if (backend_format == "docbook5") {
                runparams.flavor = OutputParams::DOCBOOK5;
-               runparams.nice = !put_in_tempdir;
+               runparams.nice = false;
                if (makeDocBookFile(FileName(filename), runparams) == ExportKilled)
                        return ExportKilled;
        }
@@ -4612,13 +4606,13 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
                } else {
                        message(bformat(_("Document exported as %1$s "
                                "to file `%2$s'"),
-                               theFormats().prettyName(format),
+                               translateIfPossible(theFormats().prettyName(format)),
                                makeDisplayPath(result_file)));
                }
        } else {
                // This must be a dummy converter like fax (bug 1888)
                message(bformat(_("Document exported as %1$s"),
-                       theFormats().prettyName(format)));
+                       translateIfPossible(theFormats().prettyName(format))));
        }
 
        return success ? ExportSuccess : ExportConverterError;