Transfer the setting of the current LyXView from workArea::focusInEvent() to GuiView...

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 7a987dc5591cebedf74e9f66f20046a754efe0ba..80a7009c81eb14d05e382621eb7d0142dfc4c659 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -28,10 +28,10 @@
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Color.h"
+#include "Layout.h"
 #include "Length.h"
 #include "Font.h"
 #include "LyXRC.h"
-#include "Row.h"
 #include "Messages.h"
 #include "OutputParams.h"
 #include "output_latex.h"
@@ -1285,17 +1285,6 @@ void Paragraph::insertInset(pos_type pos, Inset * inset,
        pimpl_->insertInset(pos, inset, change);
        // Set the font/language of the inset...
        setFont(pos, font);
-       // ... as well as the font/language of the text inside the inset
-       // FIXME: This is far from perfect. It basically overrides work being done
-       // in the InsetText constructor. Also, it doesn't work for Tables 
-       // (precisely because each cell's font/language is set in the Table's 
-       // constructor, so by now it's too late). The long-term solution should
-       // be moving current_font into Cursor, and getting rid of all this...
-       // (see http://thread.gmane.org/gmane.editors.lyx.devel/88869/focus=88944)
-       if (inset->asTextInset()) {
-               inset->asTextInset()->text_.current_font = font;
-               inset->asTextInset()->text_.real_current_font = font;
-       }
 }
 
 
@@ -1619,7 +1608,7 @@ docstring const & Paragraph::getLabelstring() const
 // the next two functions are for the manual labels
 docstring const Paragraph::getLabelWidthString() const
 {
-       if (!params().labelWidthString().empty())
+       if (layout()->margintype == MARGIN_MANUAL)
                return params().labelWidthString();
        else
                return _("Senseless with this layout!");
@@ -1669,7 +1658,9 @@ docstring Paragraph::expandLabel(LayoutPtr const & layout,
                size_t const j = fmt.find('@', i + 1);
                if (j != docstring::npos) {
                        docstring parent(fmt, i + 1, j - i - 1);
-                       docstring label = expandLabel(tclass[parent], bparams,
+                       docstring label = from_ascii("??");
+                       if (tclass.hasLayout(parent))
+                               docstring label = expandLabel(tclass[parent], bparams,
                                                      process_appendix);
                        fmt = docstring(fmt, 0, i) + label 
                                + docstring(fmt, j + 1, docstring::npos);
@@ -2406,7 +2397,7 @@ Paragraph::getParLanguage(BufferParams const & bparams) const
 }
 
 
-bool Paragraph::isRightToLeftPar(BufferParams const & bparams) const
+bool Paragraph::isRTL(BufferParams const & bparams) const
 {
        return lyxrc.rtl_support
                && getParLanguage(bparams)->rightToLeft()