std::string const & latexname() const { return latexname_; }
///
std::string const & itemcommand() const { return itemcommand_; }
- /// The arguments of this layout
+ /// One argument of this layout
struct latexarg {
docstring labelstring;
docstring menustring;
bool is_toc_caption = false;
bool free_spacing = false;
std::string newlinecmd;
+ /// The DocBook tag corresponding to this argument.
+ docstring docbooktag;
+ docstring docbooktagtype;
+ docstring docbookattr;
+ /// Whether this argument should be output after the main tag (default: inside). The result if the argument
+ /// should be output both before and after the main tag is undefined.
+ bool docbookargumentbeforemaintag = false;
+ /// Whether this argument should be output before the main tag (default: inside). The result if the argument
+ /// should be output both before and after the main tag is undefined.
+ bool docbookargumentaftermaintag = false;
};
///
typedef std::map<std::string, latexarg> LaTeXArgMap;
///
std::string const & htmltag() const;
///
- std::string const & htmlattr() const;
+ std::string const & htmlattr() const { return htmlattr_; }
+ ///
+ std::string const & htmlclass() const;
+ /// Returns a complete attribute string, including class, etc.
+ std::string const & htmlGetAttrString() const;
///
std::string const & htmlitemtag() const;
///
///
std::string const & htmllabelattr() const;
///
+ bool htmlintoc() const { return htmlintoc_; }
+ ///
std::string defaultCSSClass() const;
///
bool htmllabelfirst() const { return htmllabelfirst_; }
///
std::string const & docbooksectiontag() const;
///
+ bool docbooksection() const { return docbooksection_; }
+ ///
std::string const & docbookitemwrappertag() const;
///
std::string const & docbookitemwrapperattr() const;
///
std::string const & docbookforceabstracttag() const;
///
+ bool docbooknofontinside() const { return docbooknofontinside_; }
+ ///
bool isParagraph() const { return latextype == LATEX_PARAGRAPH; }
///
bool isCommand() const { return latextype == LATEX_COMMAND; }
bool labelIsInline() const {
return labeltype == LABEL_STATIC
|| labeltype == LABEL_SENSITIVE
- || labeltype == LABEL_ENUMERATE
+ || labeltype == LABEL_ENUMERATE
|| labeltype == LABEL_ITEMIZE;
}
bool labelIsAbove() const {
return labeltype == LABEL_ABOVE
|| labeltype == LABEL_CENTERED
- || labeltype == LABEL_BIBLIO;
+ || labeltype == LABEL_BIBLIO;
}
///
bool addToToc() const { return add_to_toc_; }
docstring counter;
/// Resume counter?
bool resumecounter;
- /// Step master counter?
- bool stepmastercounter;
+ /// Step parent counter?
+ bool stepparentcounter;
/// Prefix to use when creating labels
docstring refprefix;
/// Depth of XML command
int commanddepth;
- /// Return a pointer on a new layout suitable to describe a caption.
- /// FIXME: remove this eventually. This is only for tex2lyx
- /// until it has proper support for the caption inset (JMarc)
- static Layout * forCaption();
-
/// Is this spellchecked?
bool spellcheck;
/**
///
/// Defaults to "div".
mutable std::string htmltag_;
- /// Additional attributes for inclusion with the start tag. Defaults
- /// to: class="layoutname".
- mutable std::string htmlattr_;
+ /// Additional attributes for inclusion with the start tag.
+ /// Note that the CSS class is handled separately.
+ std::string htmlattr_;
+ /// The CSS class to use. Calculated from the layout name if not given.
+ mutable std::string htmlclass_;
+ /// cached
+ mutable std::string htmlfullattrs_;
/// Tag for individual paragraphs in an environment. In lists, this
/// would be something like "li". But it also needs to be set for
/// quotation, e.g., since the paragraphs in a quote need to be
/// <item><label>...</label>...</item>
/// The latter is the default.
bool htmllabelfirst_;
+ /// Is this to be output with the toc?
+ bool htmlintoc_;
/// CSS information needed by this layout.
docstring htmlstyle_;
/// DocBook tag corresponding to this layout.
/// Outer tag for this section, only if this layout represent a sectionning item, including chapters
/// (default: section).
mutable std::string docbooksectiontag_;
+ /// Whether this element should be considered as a section-level element in DocBook.
+ bool docbooksection_;
/// Whether this tag must/can/can't go into an <info> tag (default: never, as it only makes sense for metadata).
mutable std::string docbookininfo_;
/// Wehther this paragraph should be considered as abstract.
/// in LyX must be considered as the abstract if this is true); this text must be output with the specific tag
/// held by this attribute
mutable std::string docbookforceabstracttag_;
+ /// Whether font tags are allowed inside this tag.
+ bool docbooknofontinside_ = false;
/// Should we generate the default CSS for this layout, even if HTMLStyle
/// has been given? Default is false.
/// Note that the default CSS is output first, then the user CSS, so it is