Further cleanup of InsetFlex, InsetCollapsable and InsetLayout:

[lyx.git] / src / TextClass.cpp

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 5397227b08652f5b19c5d61428801656c92c38a8..c82b7367cfb1300dcf78a01f8d50701a4c5c43ce 100644 (file)
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -15,13 +15,15 @@
 #include <config.h>
 
 #include "TextClass.h"
-#include "debug.h"
-#include "Layout.h"
-#include "Lexer.h"
+
+#include "Color.h"
 #include "Counters.h"
+#include "debug.h"
 #include "gettext.h"
 #include "Floating.h"
 #include "FloatList.h"
+#include "Layout.h"
+#include "Lexer.h"
 
 #include "frontends/alert.h"
 
@@ -32,6 +34,12 @@
 
 #include <sstream>
 
+using std::endl;
+using std::find_if;
+using std::remove_if;
+using std::string;
+using std::ostream;
+
 namespace lyx {
 
 using support::FileName;
@@ -42,12 +50,7 @@ using support::rtrim;
 using support::subst;
 using support::addName;
 
-using std::endl;
-using std::find_if;
-using std::remove_if;
-using std::string;
-using std::ostream;
-
+extern FontInfo lyxRead(Lexer &, FontInfo const & fi = sane_font);
 
 namespace {
 
@@ -111,7 +114,7 @@ TextClass::TextClass(string const & fn, string const & cln,
        secnumdepth_ = 3;
        tocdepth_ = 3;
        pagestyle_ = "default";
-       defaultfont_ = Font(Font::ALL_SANE);
+       defaultfont_ = sane_font;
        opt_fontsize_ = "10|11|12";
        opt_pagestyle_ = "empty|plain|headings|fancy";
        titletype_ = TITLE_COMMAND_AFTER;
@@ -363,11 +366,11 @@ bool TextClass::read(FileName const & filename, ReadType rt)
                        break;
 
                case TC_DEFAULTFONT:
-                       defaultfont_.lyxRead(lexrc);
+                       defaultfont_ = lyxRead(lexrc);
                        if (!defaultfont_.resolved()) {
                                lexrc.printError("Warning: defaultfont should "
                                                 "be fully instantiated!");
-                               defaultfont_.realize(Font(Font::ALL_SANE));
+                               defaultfont_.realize(sane_font);
                        }
                        break;
 
@@ -610,15 +613,19 @@ enum InsetLayoutTags {
        IL_FONT = 1,
        IL_BGCOLOR,
        IL_DECORATION,
+       IL_FREESPACING,
+       IL_FORCELTR,
        IL_LABELFONT,
        IL_LABELSTRING,
        IL_LATEXNAME,
        IL_LATEXPARAM,
        IL_LATEXTYPE,
        IL_LYXTYPE,
+       IL_KEEPEMPTY,
        IL_MULTIPAR,
+       IL_NEEDPROTECT,
+       IL_PASSTHRU,
        IL_PREAMBLE,
-       IL_VERBATIM,
        IL_END
 };
 
@@ -630,6 +637,9 @@ void TextClass::readInsetLayout(Lexer & lexrc, docstring const & name)
                { "decoration", IL_DECORATION },
                { "end", IL_END },
                { "font", IL_FONT },
+               { "forceltr", IL_FORCELTR },
+               { "freespacing", IL_FREESPACING },
+               { "keepempty", IL_KEEPEMPTY },
                { "labelfont", IL_LABELFONT },
                { "labelstring", IL_LABELSTRING },
                { "latexname", IL_LATEXNAME },
@@ -637,8 +647,9 @@ void TextClass::readInsetLayout(Lexer & lexrc, docstring const & name)
                { "latextype", IL_LATEXTYPE },
                { "lyxtype", IL_LYXTYPE },
                { "multipar", IL_MULTIPAR },
-               { "preamble", IL_PREAMBLE },
-               { "verbatim", IL_VERBATIM }
+               { "needprotect", IL_NEEDPROTECT },
+               { "passthru", IL_PASSTHRU },
+               { "preamble", IL_PREAMBLE }
        };
 
        lexrc.pushTable(elementTags, IL_END);
@@ -649,12 +660,16 @@ void TextClass::readInsetLayout(Lexer & lexrc, docstring const & name)
        string decoration;
        string latexname;
        string latexparam;
-       Font font(defaultfont());
-       Font labelfont(defaultfont());
-       Color::color bgcolor(Color::background);
+       FontInfo font = inherit_font;
+       FontInfo labelfont = inherit_font;
+       ColorCode bgcolor(Color_background);
        string preamble;
-       bool multipar(false);
-       bool verbatim(false);
+       bool multipar = false;
+       bool passthru = false;
+       bool needprotect = false;
+       bool keepempty = false;
+       bool freespacing = false;
+       bool forceltr = false;
 
        bool getout = false;
        while (!getout && lexrc.isOK()) {
@@ -691,20 +706,37 @@ void TextClass::readInsetLayout(Lexer & lexrc, docstring const & name)
                        latexparam = subst(lexrc.getString(), "&quot;", "\"");
                        break;
                case IL_LABELFONT:
-                       labelfont.lyxRead(lexrc);
-                       labelfont.realize(defaultfont());
+                       labelfont = lyxRead(lexrc, inherit_font);
+                       // The label font is generally used as-is without
+                       // any realization against a given context.
+                       labelfont.realize(sane_font);
+                       break;
+               case IL_FORCELTR:
+                       lexrc.next();
+                       forceltr = lexrc.getBool();
                        break;
                case IL_MULTIPAR:
                        lexrc.next();
                        multipar = lexrc.getBool();
                        break;
-               case IL_VERBATIM:
+               case IL_PASSTHRU:
+                       lexrc.next();
+                       passthru = lexrc.getBool();
+                       break;
+               case IL_KEEPEMPTY:
+                       lexrc.next();
+                       keepempty = lexrc.getBool();
+                       break;
+               case IL_FREESPACING:
+                       lexrc.next();
+                       freespacing = lexrc.getBool();
+                       break;
+               case IL_NEEDPROTECT:
                        lexrc.next();
-                       verbatim = lexrc.getBool();
+                       needprotect = lexrc.getBool();
                        break;
                case IL_FONT:
-                       font.lyxRead(lexrc);
-                       font.realize(defaultfont());
+                       font = lyxRead(lexrc, inherit_font);
                        // So: define font before labelfont
                        labelfont = font;
                        break;
@@ -735,7 +767,11 @@ void TextClass::readInsetLayout(Lexer & lexrc, docstring const & name)
                il.latexname = latexname;
                il.latexparam = latexparam;
                il.multipar = multipar;
-               il.verbatim = verbatim;
+               il.passthru = passthru;
+               il.needprotect = needprotect;
+               il.freespacing = freespacing;
+               il.forceltr = forceltr;
+               il.keepempty = keepempty;
                il.font = font;
                il.labelfont = labelfont;
                il.bgcolor = bgcolor;           
@@ -937,7 +973,7 @@ void TextClass::readCounter(Lexer & lexrc)
 }
 
 
-Font const & TextClass::defaultfont() const
+FontInfo const & TextClass::defaultfont() const
 {
        return defaultfont_;
 }
@@ -1072,7 +1108,7 @@ InsetLayout const & TextClass::insetlayout(docstring const & name) const
        }
        static InsetLayout empty;
        empty.labelstring = from_utf8("UNDEFINED");
-       empty.bgcolor = Color::error;
+       empty.bgcolor = Color_error;
        return empty;
 }