X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.h;h=f957f747304a85425b1142d2a701c54b3162c831;hb=815a9bd97e8236d47761a143041702045abf2cbd;hp=b1027fdb39d7d1aab776edb6a2fe8fdd05a34da5;hpb=67b7ca00a017a61ced78cdfd412c0502ad7dbee3;p=lyx.git

diff --git a/src/Layout.h b/src/Layout.h
index b1027fdb39..f957f74730 100644
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -73,7 +73,7 @@ public:
 	///
 	void readSpacing(Lexer &);
 	///
-	docstring const & name() const { return name_; };
+	docstring const & name() const { return name_; }
 	///
 	void setName(docstring const & n) { name_ = n; }
 	///
@@ -95,10 +95,10 @@ public:
 	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_; }
 	///
@@ -110,17 +110,19 @@ public:
 	///
 	std::string const & itemtag() const { return itemtag_; }
 	/// 
-	std::string const & htmltag() const { return htmltag_; }
+	std::string const & htmltag() const;
 	/// 
-	std::string const & htmlattr() const { return htmlattr_; }
+	std::string const & htmlattr() const;
 	/// 
-	std::string const & htmlitem() const { return htmlitem_; }
+	std::string const & htmlitemtag() const;
 	/// 
-	std::string const & htmlitemattr() const { return htmlitemattr_; }
+	std::string const & htmlitemattr() const;
 	/// 
-	std::string const & htmllabel() const { return htmllabel_; }
+	std::string const & htmllabeltag() const;
 	/// 
-	std::string const & htmllabelattr() const { return htmllabelattr_; }
+	std::string const & htmllabelattr() const;
+	///
+	std::string defaultCSSClass() const;
 	///
 	bool htmllabelfirst() const { return htmllabelfirst_; }
 	/// 
@@ -128,6 +130,8 @@ public:
 	/// 
 	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; }
@@ -210,10 +214,6 @@ public:
 	///
 	MarginType margintype;
 	///
-	bool fill_top;
-	///
-	bool fill_bottom;
-	///
 	bool newline_allowed;
 	///
 	bool nextnoindent;
@@ -221,6 +221,8 @@ public:
 	bool free_spacing;
 	///
 	bool pass_thru;
+	///
+	bool parbreak_is_newline;
 	/// show this in toc
 	int toclevel;
 	/// special value of toclevel for non-section layouts
@@ -235,10 +237,21 @@ public:
 	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;
 
@@ -247,10 +260,17 @@ public:
 	/// 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_;
@@ -289,26 +309,38 @@ private:
 	std::string labeltag_;
 	/// Internal tag to surround the item text in a list.
 	std::string itemtag_;
-	/// Tag for HTML output, e.g., h2. Defaults to "div".
-	std::string htmltag_;
+	/// The interpretation of this tag varies depending upon the latextype.
+	/// In an environment, it is the tag enclosing all content for this set of 
+	/// paragraphs. So for quote, e.g,. it would be: blockquote. For itemize, 
+	/// it would be: ul. (You get the idea.)
+	///
+	/// For a command, it is the tag enclosing the content of the command.
+	/// So, for section, it might be: h2.
+	/// 
+	/// For the paragraph type, it is the tag that will enclose each paragraph.
+	///
+	/// Defaults to "div".
+	mutable std::string htmltag_;
 	/// Additional attributes for inclusion with the start tag. Defaults
 	/// to: class="layoutname".
-	std::string htmlattr_;
+	mutable std::string htmlattr_;
 	/// 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 
 	/// in "p" tags. Default is "div".
-	std::string htmlitem_;
-	/// Attributes for htmlitem_. Default is: class="layoutnameitem".
-	std::string htmlitemattr_;
+	/// Note that when I said "environment", I meant it: This has no
+	/// effect for LATEX_PARAGRAPH type layouts.
+	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.
-	std::string htmllabel_;
-	/// Attributes for the label. Defaults to: class="layoutnamelabel".
-	std::string htmllabelattr_;
+	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):
 	///    <label>...</label><item>...</item>
@@ -322,11 +354,15 @@ private:
 	/// 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.