#11756 Respect system preferences for tabbing on Mac

[lyx.git] / src / Layout.cpp

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 50475061edcd9f2a5a09b49ae08e5b9f6b2e6fd1..c45fd5c101d4e4d3cbfc4ad26289ca36677157ed 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -107,10 +107,8 @@ enum LayoutTags {
        LT_DOCBOOKTAG,
        LT_DOCBOOKATTR,
        LT_DOCBOOKININFO,
-       LT_DOCBOOKABSTRACT,
        LT_DOCBOOKWRAPPERTAG,
        LT_DOCBOOKWRAPPERATTR,
-       LT_DOCBOOKWRAPPERMERGEWITHPREVIOUS,
        LT_DOCBOOKSECTIONTAG,
        LT_DOCBOOKITEMWRAPPERTAG,
        LT_DOCBOOKITEMWRAPPERATTR,
@@ -178,8 +176,6 @@ Layout::Layout()
        htmllabelfirst_ = false;
        htmlforcecss_ = false;
        htmltitle_ = false;
-       docbookabstract_ = false;
-       docbookwrappermergewithprevious_ = false;
        spellcheck = true;
        forcelocal = 0;
        itemcommand_ = "item";
@@ -223,7 +219,6 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
                { "commanddepth",   LT_COMMANDDEPTH },
                { "copystyle",      LT_COPYSTYLE },
                { "dependson",      LT_DEPENDSON },
-               { "docbookabstract",         LT_DOCBOOKABSTRACT },
                { "docbookattr",             LT_DOCBOOKATTR },
                { "docbookforceabstracttag", LT_DOCBOOKFORCEABSTRACTTAG },
                { "docbookininfo",           LT_DOCBOOKININFO },
@@ -238,7 +233,6 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
                { "docbooksectiontag",       LT_DOCBOOKSECTIONTAG },
                { "docbooktag",              LT_DOCBOOKTAG },
                { "docbookwrapperattr",      LT_DOCBOOKWRAPPERATTR },
-               { "docbookwrappermergewithprevious", LT_DOCBOOKWRAPPERMERGEWITHPREVIOUS },
                { "docbookwrappertag",       LT_DOCBOOKWRAPPERTAG },
                { "end",            LT_END },
                { "endlabelstring", LT_ENDLABELSTRING },
@@ -741,10 +735,6 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
                        lex >> docbookininfo_;
                        break;
 
-               case LT_DOCBOOKABSTRACT:
-                       lex >> docbookabstract_;
-                       break;
-
                case LT_DOCBOOKWRAPPERTAG:
                        lex >> docbookwrappertag_;
                        break;
@@ -753,10 +743,6 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
                        lex >> docbookwrapperattr_;
                        break;
 
-               case LT_DOCBOOKWRAPPERMERGEWITHPREVIOUS:
-                       lex >> docbookwrappermergewithprevious_;
-                       break;
-
                case LT_DOCBOOKSECTIONTAG:
                        lex >> docbooksectiontag_;
                        break;
@@ -1610,7 +1596,6 @@ void Layout::write(ostream & os) const
                os << "\tDocBookAttr " << docbookattr_ << '\n';
        if(!docbookininfo_.empty())
                os << "\tDocBookInInfo " << docbookininfo_ << '\n';
-       os << "\tDocBookAbstract " << docbookabstract_ << '\n';
        if(!docbookwrappertag_.empty())
                os << "\tDocBookWrapperTag " << docbookwrappertag_ << '\n';
        if(!docbookwrapperattr_.empty())
@@ -1625,7 +1610,6 @@ void Layout::write(ostream & os) const
                os << "\tDocBookItemWrapperTag " << docbookitemwrappertag_ << '\n';
        if(!docbookitemwrapperattr_.empty())
                os << "\tDocBookItemWrapperAttr " << docbookitemwrapperattr_ << '\n';
-       os << "\tDocBookItemWrapperMergeWithPrevious " << docbookwrappermergewithprevious_ << '\n';
        if(!docbookitemlabeltag_.empty())
                os << "\tDocBookItemLabelTag " << docbookitemlabeltag_ << '\n';
        if(!docbookitemlabelattr_.empty())