Add proper extension as needed in Save as and Export

[features.git] / src / Layout.cpp

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 942a1e37b9aaec591bfb463a204d0469ef93914b..e5d683ec1855d3f089eaa19828926c7eff5a1017 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -13,8 +13,6 @@
 #include <config.h>
 
 #include "Layout.h"
-#include "FontInfo.h"
-#include "Language.h"
 #include "Lexer.h"
 #include "output_xhtml.h"
 #include "TextClass.h"
@@ -23,7 +21,6 @@
 #include "support/docstream.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
-#include "support/Messages.h"
 #include "support/textutils.h"
 
 
@@ -117,6 +114,7 @@ enum LayoutTags {
        LT_DOCBOOKWRAPPERATTR,
        LT_DOCBOOKWRAPPERTAGTYPE,
        LT_DOCBOOKWRAPPERMERGEWITHPREVIOUS,
+       LT_DOCBOOKSECTION,
        LT_DOCBOOKSECTIONTAG,
        LT_DOCBOOKITEMWRAPPERTAG,
        LT_DOCBOOKITEMWRAPPERATTR,
@@ -131,13 +129,14 @@ enum LayoutTags {
        LT_DOCBOOKITEMINNERATTR,
        LT_DOCBOOKITEMINNERTAGTYPE,
        LT_DOCBOOKFORCEABSTRACTTAG,
+       LT_DOCBOOKNOFONTINSIDE,
        LT_INPREAMBLE,
        LT_HTMLTITLE,
        LT_SPELLCHECK,
        LT_REFPREFIX,
        LT_RESETARGS,
        LT_RESUMECOUNTER,
-       LT_STEPMASTERCOUNTER,
+       LT_STEPPARENTCOUNTER,
        LT_RIGHTDELIM,
        LT_FORCELOCAL,
        LT_TOGGLE_INDENT,
@@ -155,7 +154,7 @@ Layout::Layout()
        margintype = MARGIN_STATIC;
        latextype = LATEX_PARAGRAPH;
        resumecounter = false;
-       stepmastercounter = false;
+       stepparentcounter = false;
        intitle = false;
        inpreamble = false;
        needprotect = false;
@@ -190,6 +189,7 @@ Layout::Layout()
        htmltitle_ = false;
        docbookabstract_ = false;
        docbookwrappermergewithprevious_ = false;
+       docbooksection_ = false;
        spellcheck = true;
        forcelocal = 0;
        itemcommand_ = "item";
@@ -253,6 +253,8 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass,
                { "docbookitemwrapperattr",    LT_DOCBOOKITEMWRAPPERATTR },
                { "docbookitemwrappertag",     LT_DOCBOOKITEMWRAPPERTAG },
                { "docbookitemwrappertagtype", LT_DOCBOOKITEMWRAPPERTAGTYPE },
+               { "docbooknofontinside",       LT_DOCBOOKNOFONTINSIDE, },
+               { "docbooksection",            LT_DOCBOOKSECTION },
                { "docbooksectiontag",         LT_DOCBOOKSECTIONTAG },
                { "docbooktag",                LT_DOCBOOKTAG },
                { "docbooktagtype",            LT_DOCBOOKTAGTYPE },
@@ -324,7 +326,7 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass,
                { "rightmargin",    LT_RIGHTMARGIN },
                { "spacing",        LT_SPACING },
                { "spellcheck",     LT_SPELLCHECK },
-               { "stepmastercounter",  LT_STEPMASTERCOUNTER },
+               { "stepparentcounter",  LT_STEPPARENTCOUNTER },
                { "textfont",       LT_TEXTFONT },
                { "toclevel",       LT_TOCLEVEL },
                { "toggleindent",   LT_TOGGLE_INDENT },
@@ -444,8 +446,8 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass,
                        lex >> resumecounter;
                        break;
 
-               case LT_STEPMASTERCOUNTER:
-                       lex >> stepmastercounter;
+               case LT_STEPPARENTCOUNTER:
+                       lex >> stepparentcounter;
                        break;
 
                case LT_ARGUMENT:
@@ -797,15 +799,19 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass,
                        lex >> docbookwrappermergewithprevious_;
                        break;
 
+               case LT_DOCBOOKSECTION:
+                       lex >> docbooksection_;
+                       break;
+
                case LT_DOCBOOKSECTIONTAG:
                        lex >> docbooksectiontag_;
                        break;
 
-        case LT_DOCBOOKITEMWRAPPERTAG:
-            lex >> docbookitemwrappertag_;
-            break;
-
-        case LT_DOCBOOKITEMWRAPPERATTR:
+               case LT_DOCBOOKITEMWRAPPERTAG:
+                       lex >> docbookitemwrappertag_;
+                       break;
+       
+               case LT_DOCBOOKITEMWRAPPERATTR:
                        lex >> docbookitemwrapperattr_;
                        break;
 
@@ -849,6 +855,10 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass,
                        lex >> docbookiteminnertagtype_;
                        break;
 
+        case LT_DOCBOOKNOFONTINSIDE:
+            lex >> docbooknofontinside_;
+            break;
+
                case LT_SPELLCHECK:
                        lex >> spellcheck;
                        break;
@@ -1186,6 +1196,10 @@ void Layout::readArgument(Lexer & lex, bool validating)
                        latexargs_));
        latexarg & arg = lam[id];
 
+       if (listpreamble)
+               // list preamble has no delimiters by default
+               arg.nodelims = true;
+
        bool error = false;
        bool finished = false;
        while (!finished && lex.isOK() && !error) {
@@ -1261,6 +1275,21 @@ void Layout::readArgument(Lexer & lex, bool validating)
                } else if (tok == "freespacing") {
                        lex.next();
                        arg.free_spacing = lex.getBool();
+               } else if (tok == "docbooktag") {
+                       lex.next();
+                       arg.docbooktag = lex.getDocString();
+               } else if (tok == "docbookattr") {
+                       lex.next();
+                       arg.docbookattr = lex.getDocString();
+               } else if (tok == "docbooktagtype") {
+                       lex.next();
+                       arg.docbooktagtype = lex.getDocString();
+               } else if (tok == "docbookargumentaftermaintag") {
+                       lex.next();
+                       arg.docbookargumentaftermaintag = lex.getBool();
+               } else if (tok == "docbookargumentbeforemaintag") {
+                       lex.next();
+                       arg.docbookargumentbeforemaintag = lex.getBool();
                } else {
                        lex.printError("Unknown tag");
                        error = true;
@@ -1384,7 +1413,7 @@ void Layout::write(ostream & os) const
              "\tInPreamble " << inpreamble << "\n"
              "\tTocLevel " << toclevel << "\n"
              "\tResumeCounter " << resumecounter << "\n"
-            "\tStepMasterCounter " << stepmastercounter << '\n';
+             "\tStepParentCounter " << stepparentcounter << '\n';
        // ResetArgs does not make sense here
        for (LaTeXArgMap::const_iterator it = latexargs_.begin();
             it != latexargs_.end(); ++it)
@@ -1672,6 +1701,7 @@ void Layout::write(ostream & os) const
                os << "\tDocBookWrapperAttr " << docbookwrapperattr_ << '\n';
        if(!docbookwrappertagtype_.empty())
                os << "\tDocBookWrapperTagType " << docbookwrappertagtype_ << '\n';
+       os << "\tDocBookSection " << docbooksection_ << '\n';
        if(!docbooksectiontag_.empty())
                os << "\tDocBookSectionTag " << docbooksectiontag_ << '\n';
        if(!docbookitemtag_.empty())
@@ -1701,7 +1731,8 @@ void Layout::write(ostream & os) const
                os << "\tDocBookItemInnerTagType " << docbookiteminnertagtype_ << '\n';
        if(!docbookforceabstracttag_.empty())
                os << "\tDocBookForceAbstractTag " << docbookforceabstracttag_ << '\n';
-       os << "\tSpellcheck " << spellcheck << "\n"
+    os << "\tDocBookNoFontInside " << docbooknofontinside_ << "\n"
+             "\tSpellcheck " << spellcheck << "\n"
              "\tForceLocal " << forcelocal << "\n"
              "End\n";
 }
@@ -1868,7 +1899,7 @@ string const & Layout::docbookattr() const
 }
 
 
-bool isValidTagType(std::string type)
+bool isValidTagType(std::string const & type)
 {
        return !(type.empty() || (type != "block" && type != "paragraph" && type != "inline"));
 }