///
void readSpacing(Lexer &);
///
- docstring const & name() const { return name_; };
+ docstring const & name() const { return name_; }
///
void setName(docstring const & n) { name_ = n; }
///
docstring const & preamble() const { return preamble_; }
/// Get language dependent macro definitions needed for this layout
/// for language \p lang
- docstring const langpreamble(Language const * lang) const;
+ docstring const langpreamble(Language const * lang, bool const polyglossia) const;
/// Get language and babel dependent macro definitions needed for
/// this layout for language \p lang
- docstring const babelpreamble(Language const * lang) const;
+ docstring const babelpreamble(Language const * lang, bool const polyglossia) const;
///
std::set<std::string> const & requires() const { return requires_; }
///
///
std::string const & itemtag() const { return itemtag_; }
///
- std::string const htmltag() const;
+ std::string const & htmltag() const;
///
std::string const & htmlattr() const;
///
- std::string const & htmlitem() const;
+ std::string const & htmlitemtag() const;
///
std::string const & htmlitemattr() const;
///
- std::string const & htmllabel() const;
+ std::string const & htmllabeltag() const;
///
std::string const & htmllabelattr() const;
///
+ std::string defaultCSSClass() const;
+ ///
bool htmllabelfirst() const { return htmllabelfirst_; }
///
docstring htmlstyle() const;
///
docstring const & htmlpreamble() const { return htmlpreamble_; }
///
+ bool htmltitle() const { return htmltitle_; }
+ ///
bool isParagraph() const { return latextype == LATEX_PARAGRAPH; }
///
bool isCommand() const { return latextype == LATEX_COMMAND; }
bool free_spacing;
///
bool pass_thru;
+ ///
+ bool parbreak_is_newline;
/// show this in toc
int toclevel;
/// special value of toclevel for non-section layouts
LatexType latextype;
/// Does this object belong in the title part of the document?
bool intitle;
- /// Does this layout allow for an optional parameter?
- int optionalargs;
+ /// Is the content to go in the preamble rather than the body?
+ bool inpreamble;
+ /// Number of requried arguments for this command or environment
+ unsigned int reqargs;
+ /// Number of optional arguments for this command or environment
+ /// These MUST come at the beginning, so:
+ /// \cmd[opt1][opt2]{req1}{here is the text from LyX}
+ /// is fine. But:
+ /// \cmd[opt1]{req1}[opt2]{here is the text from LyX}
+ /// is not.
+ unsigned int optargs;
/// Which counter to step
docstring counter;
+ /// Prefix to use when creating labels
+ docstring refprefix;
/// Depth of XML command
int commanddepth;
/// until it has proper support for the caption inset (JMarc)
static Layout * forCaption();
+ /// Is this spellchecked?
+ bool spellcheck;
+
private:
/// generates the default CSS for this layout
void makeDefaultCSS() const;
+ ///
+ std::string defaultCSSItemClass() const { return defaultCSSClass() + "_item"; }
+ ///
+ std::string defaultCSSLabelClass() const { return defaultCSSClass() + "_label"; }
/// Name of the layout/paragraph environment
docstring name_;
/// in "p" tags. Default is "div".
/// Note that when I said "environment", I meant it: This has no
/// effect for LATEX_PARAGRAPH type layouts.
- mutable std::string htmlitem_;
- /// Attributes for htmlitem_. Default is: class="layoutnameitem".
+ mutable std::string htmlitemtag_;
+ /// Attributes for htmlitemtag_. Default is: class="layoutname_item".
mutable std::string htmlitemattr_;
/// Tag for labels, of whatever sort. One use for this is in setting
/// descriptions, in which case it would be: dt. Another use is to
/// customize the display of, say, the auto-generated label for
/// sections. Defaults to "span".
/// If set to "NONE", this suppresses the printing of the label.
- mutable std::string htmllabel_;
- /// Attributes for the label. Defaults to: class="layoutnamelabel".
+ mutable std::string htmllabeltag_;
+ /// Attributes for the label. Defaults to: class="layoutname_label".
mutable std::string htmllabelattr_;
/// Whether to put the label before the item, or within the item.
/// I.e., do we have (true):
/// has been given? Default is false.
/// Note that the default CSS is output first, then the user CSS, so it is
/// possible to override what one does not want.
- bool htmlforcedefault_;
+ bool htmlforcecss_;
/// A cache for the default style info so generated.
mutable docstring htmldefaultstyle_;
/// Any other info for the HTML header.
docstring htmlpreamble_;
+ /// Whether this is the <title> paragraph.
+ bool htmltitle_;
+ /// calculating this is expensive, so we cache it.
+ mutable std::string defaultcssclass_;
/// This is the `category' for this layout. The following are
/// recommended basic categories: FrontMatter, BackMatter, MainText,
/// Section, Starred, List, Theorem.