#include <config.h>
#include "Layout.h"
-#include "Lexer.h"
#include "output_xhtml.h"
#include "TextClass.h"
#include "support/debug.h"
#include "support/docstream.h"
#include "support/lassert.h"
+#include "support/Lexer.h"
#include "support/lstrings.h"
#include "support/textutils.h"
LT_FREE_SPACING,
LT_PASS_THRU,
LT_PASS_THRU_CHARS,
+ LT_NO_PASS_THRU_CHARS,
LT_PARBREAK_IS_NEWLINE,
LT_ITEMCOMMAND,
LT_ITEMSEP,
LT_DOCBOOKINNERTAGTYPE,
LT_DOCBOOKININFO,
LT_DOCBOOKABSTRACT,
+ LT_DOCBOOKGENERATETITLE,
LT_DOCBOOKWRAPPERTAG,
LT_DOCBOOKWRAPPERATTR,
LT_DOCBOOKWRAPPERTAGTYPE,
inpreamble = false;
needprotect = false;
needcprotect = false;
+ nocprotect = false;
needmboxprotect = false;
keepempty = false;
font = inherit_font;
{ "docbookabstract", LT_DOCBOOKABSTRACT },
{ "docbookattr", LT_DOCBOOKATTR },
{ "docbookforceabstracttag", LT_DOCBOOKFORCEABSTRACTTAG },
+ { "docbookgeneratetitle", LT_DOCBOOKGENERATETITLE },
{ "docbookininfo", LT_DOCBOOKININFO },
{ "docbookinnerattr", LT_DOCBOOKINNERATTR },
{ "docbookinnertag", LT_DOCBOOKINNERTAG },
{ "needprotect", LT_NEED_PROTECT },
{ "newline", LT_NEWLINE },
{ "nextnoindent", LT_NEXTNOINDENT },
+ { "nopassthruchars", LT_NO_PASS_THRU_CHARS },
{ "obsoletedby", LT_OBSOLETEDBY },
{ "paragraphgroup", LT_PAR_GROUP },
{ "parbreakisnewline", LT_PARBREAK_IS_NEWLINE },
lex >> needprotect;
break;
- case LT_NEED_CPROTECT:
- lex >> needcprotect;
+ case LT_NEED_CPROTECT: {
+ int i;
+ lex >> i;
+ nocprotect = false;
+ needcprotect = false;
+ if (i == -1)
+ nocprotect = true;
+ else if (i == 1)
+ needcprotect = true;
break;
+ }
case LT_NEED_MBOXPROTECT:
lex >> needmboxprotect;
lex >> pass_thru_chars;
break;
+ case LT_NO_PASS_THRU_CHARS:
+ lex >> no_pass_thru_chars;
+ break;
+
case LT_PARBREAK_IS_NEWLINE:
lex >> parbreak_is_newline;
break;
lex >> docbookiteminnertagtype_;
break;
- case LT_DOCBOOKNOFONTINSIDE:
- lex >> docbooknofontinside_;
- break;
+ case LT_DOCBOOKNOFONTINSIDE:
+ lex >> docbooknofontinside_;
+ break;
+
+ case LT_DOCBOOKGENERATETITLE:
+ lex >> docbookgeneratetitle_;
+ break;
case LT_SPELLCHECK:
lex >> spellcheck;
lex.next();
arg.tooltip = lex.getDocString();
} else if (tok == "requires") {
- lex.next();
+ lex.eatLine();
arg.required = lex.getString();
} else if (tok == "decoration") {
lex.next();
if (!arg.tooltip.empty())
os << "\t\tToolTip \"" << to_utf8(arg.tooltip) << "\"\n";
if (!arg.required.empty())
- os << "\t\tRequires \"" << arg.required << "\"\n";
+ os << "\t\tRequires " << arg.required << "\n";
if (!arg.decoration.empty())
os << "\t\tDecoration \"" << arg.decoration << "\"\n";
if (!arg.newlinecmd.empty())
<< to_utf8(rtrim(htmlpreamble_, "\n"))
<< "\n\tEndPreamble\n";
os << "\tHTMLTitle " << htmltitle_ << "\n";
- if(!docbooktag_.empty())
+ if (!docbooktag_.empty())
os << "\tDocBookTag " << docbooktag_ << '\n';
- if(!docbookattr_.empty())
+ if (!docbookattr_.empty())
os << "\tDocBookAttr \"" << docbookattr_ << "\"\n";
- if(!docbooktagtype_.empty())
+ if (!docbooktagtype_.empty())
os << "\tDocBookTagType " << docbooktagtype_ << '\n';
- if(!docbookinnertag_.empty())
+ if (!docbookinnertag_.empty())
os << "\tDocBookInnerTag " << docbookinnertag_ << '\n';
- if(!docbookinnerattr_.empty())
+ if (!docbookinnerattr_.empty())
os << "\tDocBookInnerAttr \"" << docbookinnerattr_ << "\"\n";
- if(!docbookinnertagtype_.empty())
+ if (!docbookinnertagtype_.empty())
os << "\tDocBookInnerTagType " << docbookinnertagtype_ << '\n';
- if(!docbookininfo_.empty())
+ if (!docbookininfo_.empty())
os << "\tDocBookInInfo " << docbookininfo_ << '\n';
os << "\tDocBookAbstract " << docbookabstract_ << '\n';
- if(!docbookwrappertag_.empty())
+ if (!docbookwrappertag_.empty())
os << "\tDocBookWrapperTag " << docbookwrappertag_ << '\n';
- if(!docbookwrapperattr_.empty())
+ if (!docbookwrapperattr_.empty())
os << "\tDocBookWrapperAttr " << docbookwrapperattr_ << '\n';
- if(!docbookwrappertagtype_.empty())
+ if (!docbookwrappertagtype_.empty())
os << "\tDocBookWrapperTagType " << docbookwrappertagtype_ << '\n';
os << "\tDocBookSection " << docbooksection_ << '\n';
- if(!docbooksectiontag_.empty())
+ if (!docbooksectiontag_.empty())
os << "\tDocBookSectionTag " << docbooksectiontag_ << '\n';
- if(!docbookitemtag_.empty())
+ if (!docbookitemtag_.empty())
os << "\tDocBookItemTag " << docbookitemtag_ << '\n';
- if(!docbookitemattr_.empty())
+ if (!docbookitemattr_.empty())
os << "\tDocBookItemAttr " << docbookitemattr_ << '\n';
- if(!docbookitemtagtype_.empty())
+ if (!docbookitemtagtype_.empty())
os << "\tDocBookItemTagType " << docbookitemtagtype_ << '\n';
- if(!docbookitemwrappertag_.empty())
+ if (!docbookitemwrappertag_.empty())
os << "\tDocBookItemWrapperTag " << docbookitemwrappertag_ << '\n';
- if(!docbookitemwrapperattr_.empty())
+ if (!docbookitemwrapperattr_.empty())
os << "\tDocBookItemWrapperAttr " << docbookitemwrapperattr_ << '\n';
- if(!docbookitemwrappertagtype_.empty())
+ if (!docbookitemwrappertagtype_.empty())
os << "\tDocBookItemWrapperTagType " << docbookitemwrappertagtype_ << '\n';
os << "\tDocBookWrapperMergeWithPrevious " << docbookwrappermergewithprevious_ << '\n';
- if(!docbookitemlabeltag_.empty())
+ if (!docbookitemlabeltag_.empty())
os << "\tDocBookItemLabelTag " << docbookitemlabeltag_ << '\n';
- if(!docbookitemlabelattr_.empty())
+ if (!docbookitemlabelattr_.empty())
os << "\tDocBookItemLabelAttr " << docbookitemlabelattr_ << '\n';
- if(!docbookitemlabeltagtype_.empty())
+ if (!docbookitemlabeltagtype_.empty())
os << "\tDocBookItemLabelTagType " << docbookitemlabeltagtype_ << '\n';
- if(!docbookiteminnertag_.empty())
+ if (!docbookiteminnertag_.empty())
os << "\tDocBookItemInnerTag " << docbookiteminnertag_ << '\n';
- if(!docbookiteminnerattr_.empty())
+ if (!docbookiteminnerattr_.empty())
os << "\tDocBookItemInnerAttr " << docbookiteminnerattr_ << '\n';
- if(!docbookiteminnertagtype_.empty())
+ if (!docbookiteminnertagtype_.empty())
os << "\tDocBookItemInnerTagType " << docbookiteminnertagtype_ << '\n';
- if(!docbookforceabstracttag_.empty())
+ if (!docbookforceabstracttag_.empty())
os << "\tDocBookForceAbstractTag " << docbookforceabstracttag_ << '\n';
os << "\tDocBookNoFontInside " << docbooknofontinside_ << "\n"
"\tSpellcheck " << spellcheck << "\n"