X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FContext.h;h=427e4020a81556c748b4754eff4885cb243b0047;hb=fd5adacef25eb40f813dedd961920c353448213a;hp=c5c45b06fb67e172c867c2098a472c18e6dd95ec;hpb=4b07e1ea9263b80dc04e222af328f19944ffcad5;p=features.git

diff --git a/src/tex2lyx/Context.h b/src/tex2lyx/Context.h
index c5c45b06fb..427e4020a8 100644
--- a/src/tex2lyx/Context.h
+++ b/src/tex2lyx/Context.h
@@ -40,11 +40,13 @@ public:
 		family = "default";
 		series = "default";
 		shape = "default";
+		language = "english";
 	}
 	std::string size;
 	std::string family;
 	std::string series;
 	std::string shape;
+	std::string language;
 };
 
 
@@ -80,7 +82,7 @@ public:
 		TeX2LyXDocClass const & textclass_,
 		Layout const * layout_ = 0,
 		Layout const * parent_layout_= 0,
-		TeXFont font_ = TeXFont());
+		TeXFont const & font_ = normalfont);
 	~Context();
 
 	/// Output a \\begin_layout if requested
@@ -111,7 +113,7 @@ public:
 	/// Add extra stuff if not already there
 	void add_extra_stuff(std::string const &);
 
-	/*! 
+	/*!
 	 *  Add paragraph-level extra stuff if not already there. This
 	 *  will be reset at the next check_layout()
 	 */
@@ -126,6 +128,12 @@ public:
 	std::string extra_stuff;
 	/// We may need to add something after this \\begin_layout command
 	std::string par_extra_stuff;
+	/// We may need to add something at the beginning of a list.
+	std::string list_extra_stuff;
+	/// Stuff between list begin and first item
+	std::string list_preamble;
+	/// A LaTeXParam to be ignored in parsing.
+	std::string latexparam;
 	/// If there has been an \\begin_deeper, we'll need a matching
 	/// \\end_deeper
 	bool need_end_deeper;
@@ -133,6 +141,13 @@ public:
 	/// for each paragraph, otherwise this has to be a deeper
 	/// paragraph.
 	bool has_item;
+	/// If we are in an itemize-like environment, this marks
+	/// the text before the first \item. Typically, list
+	/// parameters (such as lengths) are adjusted here.
+	bool in_list_preamble;
+	/// Store commands that should not be converted
+	/// (stored without \\)
+	std::set<std::string> pass_thru_cmds;
 	/// we are handling a standard paragraph in an itemize-like
 	/// environment
 	bool deeper_paragraph;
@@ -144,6 +159,8 @@ public:
 	 * would not work.
 	 */
 	bool new_layout_allowed;
+	/// May -- be converted to endash and --- to emdash?
+	bool merging_hyphens_allowed;
 	/// Did we output anything yet in any context?
 	static bool empty;
 
@@ -157,6 +174,12 @@ public:
 	TeXFont font;
 	/// font attributes of normal text
 	static TeXFont normalfont;
+	/// Table rotation angle
+	int tablerotation;
+	///
+	bool in_table_cell;
+	///
+	char cell_align;
 
 private:
 	void begin_layout(std::ostream & os, Layout const * const & l);