cleanup and reorder initialisation code of GuiView and GuiToolbars. Move some things...

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 12a267fb5f48d1d90bb14f0b5dc8a733a707fb3b..962a6767d25dc5609861d39bd4061cb6608f898b 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -40,6 +40,7 @@
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "sgml.h"
+#include "TextClass.h"
 #include "TexRow.h"
 #include "VSpace.h"
 
@@ -161,7 +162,8 @@ public:
        bool latexSpecialPhrase(
                odocstream & os,
                pos_type & i,
-               unsigned int & column);
+               unsigned int & column,
+               OutputParams & runparams);
 
        ///
        void validate(LaTeXFeatures & features,
@@ -232,10 +234,10 @@ struct special_phrase {
 };
 
 special_phrase const special_phrases[] = {
-       { "LyX", from_ascii("\\protect\\LyX{}"), false },
-       { "TeX", from_ascii("\\protect\\TeX{}"), true },
-       { "LaTeX2e", from_ascii("\\protect\\LaTeXe{}"), true },
-       { "LaTeX", from_ascii("\\protect\\LaTeX{}"), true },
+       { "LyX", from_ascii("\\LyX{}"), false },
+       { "TeX", from_ascii("\\TeX{}"), true },
+       { "LaTeX2e", from_ascii("\\LaTeXe{}"), true },
+       { "LaTeX", from_ascii("\\LaTeX{}"), true },
 };
 
 size_t const phrases_nr = sizeof(special_phrases)/sizeof(special_phrase);
@@ -722,10 +724,10 @@ void Paragraph::Private::latexInset(Buffer const & buf,
        bool close = false;
        odocstream::pos_type const len = os.tellp();
 
-       if ((inset->lyxCode() == GRAPHICS_CODE
-            || inset->lyxCode() == MATH_CODE
-            || inset->lyxCode() == HYPERLINK_CODE)
-           && running_font.isRightToLeft()) {
+       if (inset->forceLTR() 
+           && running_font.isRightToLeft()
+               // ERT is an exception, it should be output with no decorations at all
+               && inset->lyxCode() != ERT_CODE) {
                if (running_font.language()->lang() == "farsi")
                        os << "\\beginL{}";
                else
@@ -886,7 +888,7 @@ void Paragraph::Private::latexSpecialChar(
        default:
 
                // LyX, LaTeX etc.
-               if (latexSpecialPhrase(os, i, column))
+               if (latexSpecialPhrase(os, i, column, runparams))
                        return;
 
                if (c == '\0')
@@ -989,7 +991,7 @@ bool Paragraph::Private::latexSpecialTypewriter(char_type const c, odocstream &
 
 
 bool Paragraph::Private::latexSpecialPhrase(odocstream & os, pos_type & i,
-       unsigned int & column)
+       unsigned int & column, OutputParams & runparams)
 {
        // FIXME: if we have "LaTeX" with a font
        // change in the middle (before the 'T', then
@@ -1000,6 +1002,8 @@ bool Paragraph::Private::latexSpecialPhrase(odocstream & os, pos_type & i,
        for (size_t pnr = 0; pnr < phrases_nr; ++pnr) {
                if (!isTextAt(special_phrases[pnr].phrase, i))
                        continue;
+               if (runparams.moving_arg)
+                       os << "\\protect";
                os << special_phrases[pnr].macro;
                i += special_phrases[pnr].phrase.length() - 1;
                column += special_phrases[pnr].macro.length() - 1;
@@ -1827,7 +1831,7 @@ bool Paragraph::latex(Buffer const & buf,
                                odocstream & os, TexRow & texrow,
                                OutputParams const & runparams) const
 {
-       LYXERR(Debug::LATEX) << "SimpleTeXOnePar...     " << this << endl;
+       LYXERR(Debug::LATEX, "SimpleTeXOnePar...     " << this);
 
        bool return_value = false;
 
@@ -2072,7 +2076,7 @@ bool Paragraph::latex(Buffer const & buf,
                                          runparams.moving_arg);
        }
 
-       LYXERR(Debug::LATEX) << "SimpleTeXOnePar...done " << this << endl;
+       LYXERR(Debug::LATEX, "SimpleTeXOnePar...done " << this);
        return return_value;
 }