#11756 Respect system preferences for tabbing on Mac

[lyx.git] / src / Layout.cpp

diff --git a/src/Layout.cpp b/src/Layout.cpp
index a7e80ea3f36d56980fdbd0002456204f4589ce4c..c45fd5c101d4e4d3cbfc4ad26289ca36677157ed 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -109,7 +109,6 @@ enum LayoutTags {
        LT_DOCBOOKININFO,
        LT_DOCBOOKWRAPPERTAG,
        LT_DOCBOOKWRAPPERATTR,
-       LT_DOCBOOKWRAPPERMERGEWITHPREVIOUS,
        LT_DOCBOOKSECTIONTAG,
        LT_DOCBOOKITEMWRAPPERTAG,
        LT_DOCBOOKITEMWRAPPERATTR,
@@ -177,7 +176,6 @@ Layout::Layout()
        htmllabelfirst_ = false;
        htmlforcecss_ = false;
        htmltitle_ = false;
-       docbookwrappermergewithprevious_ = false;
        spellcheck = true;
        forcelocal = 0;
        itemcommand_ = "item";
@@ -236,7 +234,6 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
                { "docbooktag",              LT_DOCBOOKTAG },
                { "docbookwrapperattr",      LT_DOCBOOKWRAPPERATTR },
                { "docbookwrappertag",       LT_DOCBOOKWRAPPERTAG },
-               { "docbookwrappermergewithprevious", LT_DOCBOOKWRAPPERMERGEWITHPREVIOUS },
                { "end",            LT_END },
                { "endlabelstring", LT_ENDLABELSTRING },
                { "endlabeltype",   LT_ENDLABELTYPE },
@@ -746,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;
@@ -1617,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())