Differentiate backups from autosave files (#12659)

[lyx.git] / src / Font.cpp

diff --git a/src/Font.cpp b/src/Font.cpp
index 3ba04eba4756f9a6f2fcdccce2cf766433181db2..0e4aa2b24b42cef0192685998baa12eaa19d515e 100644 (file)
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -294,7 +294,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                        os << "\\textLR{";
                        count += 8;
                // currently the remaining RTL languages are arabic_arabtex and hebrew
-               } else if (isRightToLeft() != prev.isRightToLeft()) {
+               } else if (isRightToLeft() != prev.isRightToLeft() && !runparams.isFullUnicode()) {
                        if (needs_cprotection) {
                                os << "\\cprotect";
                                count += 9;
@@ -336,11 +336,18 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
        p.reduce(prev.bits_);
 
        if (f.size() != INHERIT_SIZE) {
-               os << '{';
-               ++count;
-               os << '\\'
-                  << LaTeXSizeSwitchNames[f.size()] << termcmd;
-               count += strlen(LaTeXSizeSwitchNames[f.size()]) + 1;
+               if (!runparams.find_effective()) {
+                       os << '{';
+                       ++count;
+                       os << '\\'
+                          << LaTeXSizeSwitchNames[f.size()] << termcmd;
+                       count += strlen(LaTeXSizeSwitchNames[f.size()]) + 1;
+               }
+               else {
+                       os << '\\'
+                          << LaTeXSizeSwitchNames[f.size()] << '{';
+                       count += strlen(LaTeXSizeSwitchNames[f.size()]) + 2;
+               }
        }
        if (f.family() != INHERIT_FAMILY) {
                if (non_inherit_inset) {
@@ -758,34 +765,34 @@ void Font::validate(LaTeXFeatures & features) const
        Language const * doc_language = bparams.language;
 
        if (bits_.noun() == FONT_ON) {
-               LYXERR(Debug::LATEX, "font.noun: " << bits_.noun());
+               LYXERR(Debug::OUTFILE, "font.noun: " << bits_.noun());
                features.require("noun");
-               LYXERR(Debug::LATEX, "Noun enabled. Font: " << to_utf8(stateText()));
+               LYXERR(Debug::OUTFILE, "Noun enabled. Font: " << to_utf8(stateText()));
        }
        if (bits_.underbar() == FONT_ON) {
-               LYXERR(Debug::LATEX, "font.underline: " << bits_.underbar());
+               LYXERR(Debug::OUTFILE, "font.underline: " << bits_.underbar());
                features.require("ulem");
-               LYXERR(Debug::LATEX, "Underline enabled. Font: " << to_utf8(stateText()));
+               LYXERR(Debug::OUTFILE, "Underline enabled. Font: " << to_utf8(stateText()));
        }
        if (bits_.strikeout() == FONT_ON) {
-               LYXERR(Debug::LATEX, "font.strikeout: " << bits_.strikeout());
+               LYXERR(Debug::OUTFILE, "font.strikeout: " << bits_.strikeout());
                features.require("ulem");
-               LYXERR(Debug::LATEX, "Strike out enabled. Font: " << to_utf8(stateText()));
+               LYXERR(Debug::OUTFILE, "Strike out enabled. Font: " << to_utf8(stateText()));
        }
        if (bits_.xout() == FONT_ON) {
-               LYXERR(Debug::LATEX, "font.xout: " << bits_.xout());
+               LYXERR(Debug::OUTFILE, "font.xout: " << bits_.xout());
                features.require("ulem");
-               LYXERR(Debug::LATEX, "Cross out enabled. Font: " << to_utf8(stateText()));
+               LYXERR(Debug::OUTFILE, "Cross out enabled. Font: " << to_utf8(stateText()));
        }
        if (bits_.uuline() == FONT_ON) {
-               LYXERR(Debug::LATEX, "font.uuline: " << bits_.uuline());
+               LYXERR(Debug::OUTFILE, "font.uuline: " << bits_.uuline());
                features.require("ulem");
-               LYXERR(Debug::LATEX, "Double underline enabled. Font: " << to_utf8(stateText()));
+               LYXERR(Debug::OUTFILE, "Double underline enabled. Font: " << to_utf8(stateText()));
        }
        if (bits_.uwave() == FONT_ON) {
-               LYXERR(Debug::LATEX, "font.uwave: " << bits_.uwave());
+               LYXERR(Debug::OUTFILE, "font.uwave: " << bits_.uwave());
                features.require("ulem");
-               LYXERR(Debug::LATEX, "Wavy underline enabled. Font: " << to_utf8(stateText()));
+               LYXERR(Debug::OUTFILE, "Wavy underline enabled. Font: " << to_utf8(stateText()));
        }
        switch (bits_.color()) {
                case Color_none:
@@ -811,7 +818,7 @@ void Font::validate(LaTeXFeatures & features) const
                        break;
                default:
                        features.require("color");
-                       LYXERR(Debug::LATEX, "Color enabled. Font: " << to_utf8(stateText()));
+                       LYXERR(Debug::OUTFILE, "Color enabled. Font: " << to_utf8(stateText()));
        }
 
        // FIXME: Do something for background and soul package?
@@ -823,7 +830,7 @@ void Font::validate(LaTeXFeatures & features) const
            && lang_ != latex_language)
        {
                features.useLanguage(lang_);
-               LYXERR(Debug::LATEX, "Found language " << lang_->lang());
+               LYXERR(Debug::OUTFILE, "Found language " << lang_->lang());
        }
 }