Revert part of 21965 which was debugging code.

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 05151cd08639b870563fe986c67aa295fd0245fb..b28082f83e4de5e6071756de9e9f389ec78d8f18 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -24,8 +24,6 @@
 #include "Changes.h"
 #include "Counters.h"
 #include "Encoding.h"
-#include "debug.h"
-#include "gettext.h"
 #include "InsetList.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
@@ -34,12 +32,12 @@
 #include "Font.h"
 #include "FontList.h"
 #include "LyXRC.h"
-#include "Messages.h"
 #include "OutputParams.h"
 #include "output_latex.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "sgml.h"
+#include "TextClass.h"
 #include "TexRow.h"
 #include "VSpace.h"
 
@@ -48,11 +46,13 @@
 
 #include "insets/InsetBibitem.h"
 #include "insets/InsetLabel.h"
-#include "insets/InsetOptArg.h"
 
+#include "support/convert.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/Messages.h"
 #include "support/textutils.h"
-#include "support/convert.h"
 #include "support/unicode.h"
 
 #include <sstream>
@@ -702,7 +702,6 @@ void Paragraph::Private::latexInset(Buffer const & buf,
                        if (runparams.moving_arg)
                                os << "\\protect ";
 
-                       os << "\\\\\n";
                }
                texrow.newline();
                texrow.start(owner_->id(), i + 1);
@@ -723,10 +722,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
@@ -1830,7 +1829,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;
 
@@ -2075,7 +2074,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;
 }