Merge branch 'master' into features/indexmacros

[lyx.git] / src / insets / InsetLayout.cpp

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index 5b5308ddcf71feaac84318b3cd99b4f3b82a6c00..64258a8483cefd2c1dbce56e550b40713dc7d58a 100644 (file)
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Martin Vermeer
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -32,28 +32,28 @@ using namespace lyx::support;
 
 namespace lyx {
 
-InsetLayout::InsetDecoration translateDecoration(std::string const & str)
+InsetDecoration translateDecoration(std::string const & str)
 {
        if (compare_ascii_no_case(str, "classic") == 0)
-               return InsetLayout::CLASSIC;
+               return InsetDecoration::CLASSIC;
        if (compare_ascii_no_case(str, "minimalistic") == 0)
-               return InsetLayout::MINIMALISTIC;
+               return InsetDecoration::MINIMALISTIC;
        if (compare_ascii_no_case(str, "conglomerate") == 0)
-               return InsetLayout::CONGLOMERATE;
-       return InsetLayout::DEFAULT;
+               return InsetDecoration::CONGLOMERATE;
+       return InsetDecoration::DEFAULT;
 }
 
 namespace {
 
-InsetLayout::InsetLaTeXType translateLaTeXType(std::string const & str)
+InsetLaTeXType translateLaTeXType(std::string const & str)
 {
        if (compare_ascii_no_case(str, "command") == 0)
-               return InsetLayout::COMMAND;
+               return InsetLaTeXType::COMMAND;
        if (compare_ascii_no_case(str, "environment") == 0)
-               return InsetLayout::ENVIRONMENT;
+               return InsetLaTeXType::ENVIRONMENT;
        if (compare_ascii_no_case(str, "none") == 0)
-               return InsetLayout::NOLATEXTYPE;
-       return InsetLayout::ILT_ERROR;
+               return InsetLaTeXType::NOLATEXTYPE;
+       return InsetLaTeXType::ILT_ERROR;
 }
 
 } // namespace
@@ -96,6 +96,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
                IL_DOCBOOKSECTION,
                IL_DOCBOOKININFO,
                IL_DOCBOOKARGUMENTBEFOREMAINTAG,
+               IL_DOCBOOKARGUMENTAFTERMAINTAG,
                IL_DOCBOOKNOTINPARA,
                IL_DOCBOOKWRAPPERTAG,
                IL_DOCBOOKWRAPPERTAGTYPE,
@@ -106,6 +107,11 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
                IL_DOCBOOKITEMWRAPPERTAG,
                IL_DOCBOOKITEMWRAPPERTAGTYPE,
                IL_DOCBOOKITEMWRAPPERATTR,
+               IL_DOCBOOKINNERTAG,
+               IL_DOCBOOKINNERTAGTYPE,
+               IL_DOCBOOKINNERATTR,
+        IL_DOCBOOKNOFONTINSIDE,
+        IL_DOCBOOKRENDERASIMAGE,
                IL_INTOC,
                IL_ISTOCCAPTION,
                IL_LABELFONT,
@@ -150,16 +156,22 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
                { "custompars", IL_CUSTOMPARS },
                { "decoration", IL_DECORATION },
                { "display", IL_DISPLAY },
+               { "docbookargumentaftermaintag", IL_DOCBOOKARGUMENTAFTERMAINTAG },
                { "docbookargumentbeforemaintag", IL_DOCBOOKARGUMENTBEFOREMAINTAG },
                { "docbookattr", IL_DOCBOOKATTR },
                { "docbookininfo", IL_DOCBOOKININFO },
+               { "docbookinnerattr", IL_DOCBOOKINNERATTR },
+               { "docbookinnertag", IL_DOCBOOKINNERTAG },
+               { "docbookinnertagtype", IL_DOCBOOKINNERTAGTYPE },
                { "docbookitemattr", IL_DOCBOOKITEMATTR },
                { "docbookitemtag", IL_DOCBOOKITEMTAG },
                { "docbookitemtagtype", IL_DOCBOOKITEMTAGTYPE },
                { "docbookitemwrapperattr", IL_DOCBOOKITEMWRAPPERATTR },
                { "docbookitemwrappertag", IL_DOCBOOKITEMWRAPPERTAG },
                { "docbookitemwrappertagtype", IL_DOCBOOKITEMWRAPPERTAGTYPE },
+               { "docbooknofontinside", IL_DOCBOOKNOFONTINSIDE },
                { "docbooknotinpara", IL_DOCBOOKNOTINPARA },
+               { "docbookrenderasimage", IL_DOCBOOKRENDERASIMAGE },
                { "docbooksection", IL_DOCBOOKSECTION },
                { "docbooktag", IL_DOCBOOKTAG },
                { "docbooktagtype", IL_DOCBOOKTAGTYPE },
@@ -217,8 +229,10 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
 
        lex.pushTable(elementTags);
 
-       labelfont_ = inherit_font;
-       bgcolor_ = Color_none;
+       if (labelfont_ == sane_font)
+               labelfont_ = inherit_font;
+       if (bgcolor_ == Color_error)
+               bgcolor_ = Color_none;
        bool getout = false;
        // whether we've read the CustomPars or ForcePlain tag
        // for issuing a warning in case MultiPars comes later
@@ -256,13 +270,13 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
                        string lt;
                        lex >> lt;
                        lyxtype_ = translateLyXType(lt);
-                       if (lyxtype_  == NOLYXTYPE) {
+                       if (lyxtype_  == InsetLyXType::NOLYXTYPE) {
                                LYXERR0("Unknown LyXType `" << lt << "'.");
                                // this is not really a reason to abort
                                if (validating)
                                        return false;
                        }
-                       if (lyxtype_ == CHARSTYLE) {
+                       if (lyxtype_ == InsetLyXType::CHARSTYLE) {
                                // by default, charstyles force the plain layout
                                multipar_ = false;
                                forceplain_ = true;
@@ -273,7 +287,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
                        string lt;
                        lex >> lt;
                        latextype_ = translateLaTeXType(lt);
-                       if (latextype_  == ILT_ERROR) {
+                       if (latextype_  == InsetLaTeXType::ILT_ERROR) {
                                LYXERR0("Unknown LaTeXType `" << lt << "'.");
                                // this is not really a reason to abort
                                if (validating)
@@ -515,12 +529,24 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
                case IL_DOCBOOKTAGTYPE:
                        lex >> docbooktagtype_;
                        break;
+               case IL_DOCBOOKINNERTAG:
+                       lex >> docbookinnertag_;
+                       break;
+               case IL_DOCBOOKINNERATTR:
+                       lex >> docbookinnerattr_;
+                       break;
+               case IL_DOCBOOKINNERTAGTYPE:
+                       lex >> docbookinnertagtype_;
+                       break;
                case IL_DOCBOOKININFO:
                        lex >> docbookininfo_;
                        break;
                case IL_DOCBOOKARGUMENTBEFOREMAINTAG:
                        lex >> docbookargumentbeforemaintag_;
                        break;
+               case IL_DOCBOOKARGUMENTAFTERMAINTAG:
+                       lex >> docbookargumentaftermaintag_;
+                       break;
                case IL_DOCBOOKNOTINPARA:
                        lex >> docbooknotinpara_;
                        break;
@@ -554,6 +580,12 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
                case IL_DOCBOOKWRAPPERATTR:
                        lex >> docbookwrapperattr_;
                        break;
+        case IL_DOCBOOKNOFONTINSIDE:
+            lex >> docbooknofontinside_;
+            break;
+        case IL_DOCBOOKRENDERASIMAGE:
+            lex >> docbookrenderasimage_;
+            break;
                case IL_REQUIRES: {
                        lex.eatLine();
                        vector<string> const req
@@ -599,17 +631,17 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
 }
 
 
-InsetLayout::InsetLyXType translateLyXType(std::string const & str)
+InsetLyXType translateLyXType(std::string const & str)
 {
        if (compare_ascii_no_case(str, "charstyle") == 0)
-               return InsetLayout::CHARSTYLE;
+               return InsetLyXType::CHARSTYLE;
        if (compare_ascii_no_case(str, "custom") == 0)
-               return InsetLayout::CUSTOM;
+               return InsetLyXType::CUSTOM;
        if (compare_ascii_no_case(str, "end") == 0)
-               return InsetLayout::END;
+               return InsetLyXType::END;
        if (compare_ascii_no_case(str, "standard") == 0)
-               return InsetLayout::STANDARD;
-       return InsetLayout::NOLYXTYPE;
+               return InsetLyXType::STANDARD;
+       return InsetLyXType::NOLYXTYPE;
 }
 
 
@@ -702,6 +734,14 @@ std::string InsetLayout::docbooktagtype() const
 }
 
 
+std::string InsetLayout::docbookinnertagtype() const
+{
+       if (docbookinnertagtype_ != "block" && docbookinnertagtype_ != "paragraph" && docbookinnertagtype_ != "inline")
+               docbookinnertagtype_ = "block";
+       return docbookinnertagtype_;
+}
+
+
 std::string InsetLayout::docbookwrappertagtype() const
 {
        if (docbookwrappertagtype_ != "block" && docbookwrappertagtype_ != "paragraph" && docbookwrappertagtype_ != "inline")
@@ -832,6 +872,9 @@ void InsetLayout::readArgument(Lexer & lex)
                } else if (tok == "docbookargumentbeforemaintag") {
                        lex.next();
                        arg.docbookargumentbeforemaintag = lex.getBool();
+               } else if (tok == "docbookargumentaftermaintag") {
+                       lex.next();
+                       arg.docbookargumentaftermaintag = lex.getBool();
                } else {
                        lex.printError("Unknown tag");
                        error = true;