Revert part of 21965 which was debugging code.

[lyx.git] / src / Text2.cpp

diff --git a/src/Text2.cpp b/src/Text2.cpp
index b21999fe51cb74d27831bb1d2cc5b9ef9f8e6660..d03d71d1073b198f4804aaeec066f3c5381a17da 100644 (file)
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -29,14 +29,11 @@
 #include "BufferView.h"
 #include "Bullet.h"
 #include "Changes.h"
-#include "Color.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "debug.h"
 #include "DispatchResult.h"
 #include "ErrorList.h"
 #include "FuncRequest.h"
-#include "gettext.h"
 #include "Language.h"
 #include "Layout.h"
 #include "Lexer.h"
@@ -46,8 +43,7 @@
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "ParIterator.h"
-#include "Server.h"
-#include "ServerSocket.h"
+#include "TextClass.h"
 #include "TextMetrics.h"
 #include "VSpace.h"
 
@@ -57,9 +53,10 @@
 
 #include "mathed/InsetMathHull.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/textutils.h"
 
-#include <boost/current_function.hpp>
 #include <boost/next_prior.hpp>
 
 #include <sstream>
@@ -84,42 +81,42 @@ bool Text::isMainText(Buffer const & buffer) const
 }
 
 
-Font Text::getLayoutFont(Buffer const & buffer, pit_type const pit) const
+FontInfo Text::getLayoutFont(Buffer const & buffer, pit_type const pit) const
 {
        LayoutPtr const & layout = pars_[pit].layout();
 
        if (!pars_[pit].getDepth())  {
-               Font lf = layout->resfont;
+               FontInfo lf = layout->resfont;
                // In case the default family has been customized
-               if (layout->font.family() == Font::INHERIT_FAMILY)
-                       lf.setFamily(buffer.params().getFont().family());
+               if (layout->font.family() == INHERIT_FAMILY)
+                       lf.setFamily(buffer.params().getFont().fontInfo().family());
                return lf;
        }
 
-       Font font = layout->font;
+       FontInfo font = layout->font;
        // Realize with the fonts of lesser depth.
        //font.realize(outerFont(pit, paragraphs()));
-       font.realize(buffer.params().getFont());
+       font.realize(buffer.params().getFont().fontInfo());
 
        return font;
 }
 
 
-Font Text::getLabelFont(Buffer const & buffer, Paragraph const & par) const
+FontInfo Text::getLabelFont(Buffer const & buffer, Paragraph const & par) const
 {
        LayoutPtr const & layout = par.layout();
 
        if (!par.getDepth()) {
-               Font lf = layout->reslabelfont;
+               FontInfo lf = layout->reslabelfont;
                // In case the default family has been customized
-               if (layout->labelfont.family() == Font::INHERIT_FAMILY)
-                       lf.setFamily(buffer.params().getFont().family());
+               if (layout->labelfont.family() == INHERIT_FAMILY)
+                       lf.setFamily(buffer.params().getFont().fontInfo().family());
                return lf;
        }
 
-       Font font = layout->labelfont;
+       FontInfo font = layout->labelfont;
        // Realize with the fonts of lesser depth.
-       font.realize(buffer.params().getFont());
+       font.realize(buffer.params().getFont().fontInfo());
 
        return font;
 }
@@ -132,7 +129,7 @@ void Text::setCharFont(Buffer const & buffer, pit_type pit,
        LayoutPtr const & layout = pars_[pit].layout();
 
        // Get concrete layout font to reduce against
-       Font layoutfont;
+       FontInfo layoutfont;
 
        if (pos < pars_[pit].beginOfBody())
                layoutfont = layout->labelfont;
@@ -154,12 +151,12 @@ void Text::setCharFont(Buffer const & buffer, pit_type pit,
        // Inside inset, apply the inset's font attributes if any
        // (charstyle!)
        if (!isMainText(buffer))
-               layoutfont.realize(display_font);
+               layoutfont.realize(display_font.fontInfo());
 
-       layoutfont.realize(buffer.params().getFont());
+       layoutfont.realize(buffer.params().getFont().fontInfo());
 
        // Now, reduce font against full layout font
-       font.reduce(layoutfont);
+       font.fontInfo().reduce(layoutfont);
 
        pars_[pit].setFont(pos, font);
 }
@@ -233,7 +230,7 @@ void Text::setLayout(Cursor & cur, docstring const & layout)
        LayoutPtr const & lyxlayout = params.getTextClass()[layout];
        if (lyxlayout->is_environment) {
                // move everything in a new environment inset
-               LYXERR(Debug::DEBUG) << "setting layout " << to_utf8(layout) << endl;
+               LYXERR(Debug::DEBUG, "setting layout " << to_utf8(layout));
                lyx::dispatch(FuncRequest(LFUN_LINE_BEGIN));
                lyx::dispatch(FuncRequest(LFUN_LINE_END_SELECT));
                lyx::dispatch(FuncRequest(LFUN_CUT));
@@ -317,7 +314,7 @@ void Text::setFont(Cursor & cur, Font const & font, bool toggleall)
        BOOST_ASSERT(this == cur.text());
        // Set the current_font
        // Determine basis font
-       Font layoutfont;
+       FontInfo layoutfont;
        pit_type pit = cur.pit();
        if (cur.pos() < pars_[pit].beginOfBody())
                layoutfont = getLabelFont(cur.buffer(), pars_[pit]);
@@ -331,9 +328,9 @@ void Text::setFont(Cursor & cur, Font const & font, bool toggleall)
 
        // Reduce to implicit settings
        cur.current_font = cur.real_current_font;
-       cur.current_font.reduce(layoutfont);
+       cur.current_font.fontInfo().reduce(layoutfont);
        // And resolve it completely
-       cur.real_current_font.realize(layoutfont);
+       cur.real_current_font.fontInfo().realize(layoutfont);
 
        // if there is no selection that's all we need to do
        if (!cur.selection())
@@ -396,7 +393,8 @@ void Text::toggleFree(Cursor & cur, Font const & font, bool toggleall)
 {
        BOOST_ASSERT(this == cur.text());
        // If the mask is completely neutral, tell user
-       if (font == Font(Font::ALL_IGNORE)) {
+       if (font.fontInfo() == ignore_font && 
+               (font.language() == 0 || font.language() == ignore_language)) {
                // Could only happen with user style
                cur.message(_("No font change defined."));
                return;
@@ -408,7 +406,7 @@ void Text::toggleFree(Cursor & cur, Font const & font, bool toggleall)
        CursorSlice resetCursor = cur.top();
        bool implicitSelection =
                font.language() == ignore_language
-               && font.number() == Font::IGNORE
+               && font.fontInfo().number() == FONT_IGNORE
                && selectWordWhenUnderCursor(cur, WHOLE_WORD_STRICT);
 
        // Set font
@@ -746,7 +744,7 @@ void Text::fixCursorAfterDelete(CursorSlice & cur, CursorSlice const & where)
 bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
                Cursor & old, bool & need_anchor_change)
 {
-       //LYXERR(Debug::DEBUG) << "DEPM: cur:\n" << cur << "old:\n" << old << endl;
+       //LYXERR(Debug::DEBUG, "DEPM: cur:\n" << cur << "old:\n" << old);
 
        Paragraph & oldpar = old.paragraph();
 
@@ -819,7 +817,7 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
                bool const soa = oldpar.params().startOfAppendix();
                plist.erase(boost::next(plist.begin(), old.pit()));
                // do not lose start of appendix marker (bug 4212)
-               if (soa)
+               if (soa && old.pit() < pit_type(plist.size()))
                        plist[old.pit()].params().startOfAppendix(true);
 
                // see #warning (FIXME?) above