X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=de4866e3b9b9d6aa9ae4fec9dac6902fe679cb8e;hb=0233b6753d5a7ef67263c3111411be04765c629b;hp=3701b7768301e033e35fd04db72f5353d9aee5df;hpb=bf6257967e48709d375d5b8aa1cdd66c7f7bc25a;p=lyx.git

diff --git a/src/buffer.C b/src/buffer.C
index 3701b77683..de4866e3b9 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -32,6 +32,8 @@
 #include <locale>
 #endif
 
+#include <boost/tuple/tuple.hpp>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -105,6 +107,7 @@
 #include "converter.h"
 #include "BufferView.h"
 #include "ParagraphParameters.h"
+#include "iterators.h"
 
 using std::ostream;
 using std::ofstream;
@@ -200,7 +203,7 @@ pair<Buffer::LogType, string> const Buffer::getLogName(void) const
 
 	string path = OnlyPath(filename);
 
-	if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1))
+	if (lyxrc.use_tempdir || !IsDirWriteable(path))
 		path = tmppath;
 
 	string const fname = AddName(path,
@@ -209,7 +212,7 @@ pair<Buffer::LogType, string> const Buffer::getLogName(void) const
 	string const bname =
 		AddName(path, OnlyFilename(
 			ChangeExtension(filename,
-					formats.Extension("literate") + ".out")));
+					formats.extension("literate") + ".out")));
 
 	// If no Latex log or Build log is newer, show Build log
 
@@ -285,6 +288,7 @@ namespace {
 
 string last_inset_read;
 
+#ifndef NO_COMPABILITY
 struct ErtComp 
 {
 	ErtComp() : active(false), in_tabular(false) {
@@ -296,13 +300,14 @@ struct ErtComp
 
 std::stack<ErtComp> ert_stack;
 ErtComp ert_comp;
+#endif
 
+#warning And _why_ is this here? (Lgb)
+int unknown_layouts;
 
 } // anon
 
 
-int unknown_layouts;
-
 // candidate for move to BufferView
 // (at least some parts in the beginning of the func)
 //
@@ -314,12 +319,11 @@ int unknown_layouts;
 bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par)
 {
 	unknown_layouts = 0;
-#ifdef NO_LATEX
+#ifndef NO_COMPABILITY
 	ert_comp.contents.erase();
 	ert_comp.active = false;
 	ert_comp.in_tabular = false;
 #endif
-	
 	int pos = 0;
 	Paragraph::depth_type depth = 0; 
 	bool the_end_read = false;
@@ -339,9 +343,9 @@ bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par)
 		markDirty();
 		// We don't want to adopt the parameters from the
 		// document we insert, so we skip until the text begins:
-		while (lex.IsOK()) {
+		while (lex.isOK()) {
 			lex.nextToken();
-			string const pretoken = lex.GetString();
+			string const pretoken = lex.getString();
 			if (pretoken == "\\layout") {
 				lex.pushToken(pretoken);
 				break;
@@ -349,9 +353,9 @@ bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par)
 		}
 	}
 
-	while (lex.IsOK()) {
+	while (lex.isOK()) {
 		lex.nextToken();
-		string const token = lex.GetString();
+		string const token = lex.getString();
 
 		if (token.empty()) continue;
 
@@ -385,6 +389,7 @@ bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par)
 }
 
 
+#ifndef NO_COMPABILITY
 void Buffer::insertErtContents(Paragraph * par, int & pos,
 			       LyXFont const & font, bool set_inactive) 
 {
@@ -399,6 +404,7 @@ void Buffer::insertErtContents(Paragraph * par, int & pos,
 		ert_comp.active = false;
 	}
 }
+#endif
 
 
 bool
@@ -410,6 +416,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 	)
 {
 	bool the_end_read = false;
+#ifndef NO_COMPABILITY
 #ifndef NO_PEXTRA_REALLY
 	// This is super temporary but is needed to get the compability
 	// mode for minipages work correctly together with new tabulars.
@@ -419,9 +426,9 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 	static Paragraph * minipar;
 	static Paragraph * parBeforeMinipage;
 #endif
-	
+#endif
 	if (token[0] != '\\') {
-#ifdef NO_LATEX
+#ifndef NO_COMPABILITY
 		if (ert_comp.active) {
 			ert_comp.contents += token;
 		} else {
@@ -431,7 +438,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 			par->insertChar(pos, (*cit), font);
 			++pos;
 		}
-#ifdef NO_LATEX
+#ifndef NO_COMPABILITY
 		}
 #endif
 	} else if (token == "\\i") {
@@ -440,18 +447,18 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 		par->insertInset(pos, inset, font);
 		++pos;
 	} else if (token == "\\layout") {
-#ifdef NO_LATEX
+#ifndef NO_COMPABILITY
 		ert_comp.in_tabular = false;
 		// Do the insetert.
 		insertErtContents(par, pos, font);
 #endif
-                lex.EatLine();
-                string const layoutname = lex.GetString();
+                lex.eatLine();
+                string const layoutname = lex.getString();
                 pair<bool, LyXTextClass::LayoutList::size_type> pp
                         = textclasslist.NumberOfLayout(params.textclass,
                                                        layoutname);
 
-#ifdef NO_LATEX
+#ifndef NO_COMPABILITY
 		if (compare_no_case(layoutname, "latex") == 0) {
 			ert_comp.active = true;
 		}
@@ -517,6 +524,10 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 			pos = 0;
 			if (pp.first) {
 				par->layout = pp.second;
+#ifndef NO_COMPABILITY
+			} else if (ert_comp.active) {
+				par->layout = 0;
+#endif
 			} else {
 				// layout not found
 				// use default layout "Standard" (0)
@@ -546,11 +557,17 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
                 }
 #endif
 
+#ifndef NO_COMPABILITY
 	} else if (token == "\\begin_float") {
+		insertErtContents(par, pos, font);
+		//insertErtContents(par, pos, font, false);
+		//ert_stack.push(ert_comp);
+		//ert_comp = ErtComp();
+		
 		// This is the compability reader. It can be removed in
 		// LyX version 1.3.0. (Lgb)
 		lex.next();
-		string const tmptok = lex.GetString();
+		string const tmptok = lex.getString();
 		//lyxerr << "old float: " << tmptok << endl;
 		
 		Inset * inset = 0;
@@ -558,34 +575,41 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 		
 		if (tmptok == "footnote") {
 			inset = new InsetFoot;
+			old_float << "collapsed true\n";
 		} else if (tmptok == "margin") {
 			inset = new InsetMarginal;
+			old_float << "collapsed true\n";
 		} else if (tmptok == "fig") {
 			inset = new InsetFloat("figure");
 			old_float << "placement htbp\n"
-				  << "wide false\n";
+				  << "wide false\n"
+				  << "collapsed false\n";
 		} else if (tmptok == "tab") {
 			inset = new InsetFloat("table");
 			old_float << "placement htbp\n"
-				  << "wide false\n";
+				  << "wide false\n"
+				  << "collapsed false\n";
 		} else if (tmptok == "alg") {
 			inset = new InsetFloat("algorithm");
 			old_float << "placement htbp\n"
-				  << "wide false\n";
+				  << "wide false\n"
+				  << "collapsed false\n";
 		} else if (tmptok == "wide-fig") {
 			inset = new InsetFloat("figure");
 			//InsetFloat * tmp = new InsetFloat("figure");
 			//tmp->wide(true);
 			//inset = tmp;
 			old_float << "placement htbp\n"
-				  << "wide true\n";
+				  << "wide true\n"
+				  << "collapsed false\n";
 		} else if (tmptok == "wide-tab") {
 			inset = new InsetFloat("table");
 			//InsetFloat * tmp = new InsetFloat("table");
 			//tmp->wide(true);
 			//inset = tmp;
 			old_float << "placement htbp\n"
-				  << "wide true\n";
+				  << "wide true\n"
+				  << "collapsed false\n";
 		}
 
 		if (!inset) {
@@ -594,15 +618,13 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 #endif
 			return false; // no end read yet
 		}
-		
-		old_float << "collapsed true\n";
 
 		// Here we need to check for \end_deeper and handle that
 		// before we do the footnote parsing.
 		// This _is_ a hack! (Lgb)
 		while (true) {
 			lex.next();
-			string const tmp = lex.GetString();
+			string const tmp = lex.getString();
 			if (tmp == "\\end_deeper") {
 				//lyxerr << "\\end_deeper caught!" << endl;
 				if (!depth) {
@@ -628,6 +650,8 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 		inset->read(this, nylex);
 		par->insertInset(pos, inset, font);
 		++pos;
+		insertErtContents(par, pos, font);
+#endif
 	} else if (token == "\\begin_deeper") {
 		++depth;
 	} else if (token == "\\end_deeper") {
@@ -640,15 +664,15 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 	} else if (token == "\\begin_preamble") {
 		params.readPreamble(lex);
 	} else if (token == "\\textclass") {
-		lex.EatLine();
+		lex.eatLine();
 		pair<bool, LyXTextClassList::size_type> pp = 
-			textclasslist.NumberOfClass(lex.GetString());
+			textclasslist.NumberOfClass(lex.getString());
 		if (pp.first) {
 			params.textclass = pp.second;
 		} else {
 			WriteAlert(string(_("Textclass error")), 
 				string(_("The document uses an unknown textclass \"")) + 
-				lex.GetString() + string("\"."),
+				lex.getString() + string("\"."),
 				string(_("LyX will not be able to produce output correctly.")));
 			params.textclass = 0;
 		}
@@ -665,20 +689,20 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 			params.textclass = 0;
 		}
 	} else if (token == "\\options") {
-		lex.EatLine();
-		params.options = lex.GetString();
+		lex.eatLine();
+		params.options = lex.getString();
 	} else if (token == "\\language") {
 		params.readLanguage(lex);    
 	} else if (token == "\\fontencoding") {
-		lex.EatLine();
+		lex.eatLine();
 	} else if (token == "\\inputencoding") {
-		lex.EatLine();
-		params.inputenc = lex.GetString();
+		lex.eatLine();
+		params.inputenc = lex.getString();
 	} else if (token == "\\graphics") {
 		params.readGraphicsDriver(lex);
 	} else if (token == "\\fontscheme") {
-		lex.EatLine();
-		params.fonts = lex.GetString();
+		lex.eatLine();
+		params.fonts = lex.getString();
 	} else if (token == "\\noindent") {
 		par->params().noindent(true);
 	} else if (token == "\\fill_top") {
@@ -696,21 +720,21 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 	} else if (token == "\\start_of_appendix") {
 		par->params().startOfAppendix(true);
 	} else if (token == "\\paragraph_separation") {
-		int tmpret = lex.FindToken(string_paragraph_separation);
+		int tmpret = lex.findToken(string_paragraph_separation);
 		if (tmpret == -1) ++tmpret;
 		if (tmpret != LYX_LAYOUT_DEFAULT) 
 			params.paragraph_separation =
 				static_cast<BufferParams::PARSEP>(tmpret);
 	} else if (token == "\\defskip") {
 		lex.nextToken();
-		params.defskip = VSpace(lex.GetString());
+		params.defskip = VSpace(lex.getString());
 	} else if (token == "\\epsfig") { // obsolete
 		// Indeed it is obsolete, but we HAVE to be backwards
 		// compatible until 0.14, because otherwise all figures
 		// in existing documents are irretrivably lost. (Asger)
 		params.readGraphicsDriver(lex);
 	} else if (token == "\\quotes_language") {
-		int tmpret = lex.FindToken(string_quotes_language);
+		int tmpret = lex.findToken(string_quotes_language);
 		if (tmpret == -1) ++tmpret;
 		if (tmpret != LYX_LAYOUT_DEFAULT) {
 			InsetQuotes::quote_language tmpl = 
@@ -739,7 +763,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 		}
 	} else if (token == "\\quotes_times") {
 		lex.nextToken();
-		switch (lex.GetInteger()) {
+		switch (lex.getInteger()) {
 		case 1: 
 			params.quotes_times = InsetQuotes::SingleQ; 
 			break;
@@ -748,13 +772,13 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 			break;
 		}
 	} else if (token == "\\papersize") {
-		int tmpret = lex.FindToken(string_papersize);
+		int tmpret = lex.findToken(string_papersize);
 		if (tmpret == -1)
 			++tmpret;
 		else
 			params.papersize2 = tmpret;
 	} else if (token == "\\paperpackage") {
-		int tmpret = lex.FindToken(string_paperpackages);
+		int tmpret = lex.findToken(string_paperpackages);
 		if (tmpret == -1) {
 			++tmpret;
 			params.paperpackage = BufferParams::PACKAGE_NONE;
@@ -762,81 +786,81 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 			params.paperpackage = tmpret;
 	} else if (token == "\\use_geometry") {
 		lex.nextToken();
-		params.use_geometry = lex.GetInteger();
+		params.use_geometry = lex.getInteger();
 	} else if (token == "\\use_amsmath") {
 		lex.nextToken();
-		params.use_amsmath = lex.GetInteger();
+		params.use_amsmath = lex.getInteger();
 	} else if (token == "\\use_natbib") {
 		lex.nextToken();
-		params.use_natbib = lex.GetInteger();
+		params.use_natbib = lex.getInteger();
 	} else if (token == "\\use_numerical_citations") {
 		lex.nextToken();
-		params.use_numerical_citations = lex.GetInteger();
+		params.use_numerical_citations = lex.getInteger();
 	} else if (token == "\\paperorientation") {
-		int tmpret = lex.FindToken(string_orientation);
+		int tmpret = lex.findToken(string_orientation);
 		if (tmpret == -1) ++tmpret;
 		if (tmpret != LYX_LAYOUT_DEFAULT) 
 			params.orientation = static_cast<BufferParams::PAPER_ORIENTATION>(tmpret);
 	} else if (token == "\\paperwidth") {
 		lex.next();
-		params.paperwidth = lex.GetString();
+		params.paperwidth = lex.getString();
 	} else if (token == "\\paperheight") {
 		lex.next();
-		params.paperheight = lex.GetString();
+		params.paperheight = lex.getString();
 	} else if (token == "\\leftmargin") {
 		lex.next();
-		params.leftmargin = lex.GetString();
+		params.leftmargin = lex.getString();
 	} else if (token == "\\topmargin") {
 		lex.next();
-		params.topmargin = lex.GetString();
+		params.topmargin = lex.getString();
 	} else if (token == "\\rightmargin") {
 		lex.next();
-		params.rightmargin = lex.GetString();
+		params.rightmargin = lex.getString();
 	} else if (token == "\\bottommargin") {
 		lex.next();
-		params.bottommargin = lex.GetString();
+		params.bottommargin = lex.getString();
 	} else if (token == "\\headheight") {
 		lex.next();
-		params.headheight = lex.GetString();
+		params.headheight = lex.getString();
 	} else if (token == "\\headsep") {
 		lex.next();
-		params.headsep = lex.GetString();
+		params.headsep = lex.getString();
 	} else if (token == "\\footskip") {
 		lex.next();
-		params.footskip = lex.GetString();
+		params.footskip = lex.getString();
 	} else if (token == "\\paperfontsize") {
 		lex.nextToken();
-		params.fontsize = strip(lex.GetString());
+		params.fontsize = strip(lex.getString());
 	} else if (token == "\\papercolumns") {
 		lex.nextToken();
-		params.columns = lex.GetInteger();
+		params.columns = lex.getInteger();
 	} else if (token == "\\papersides") {
 		lex.nextToken();
-		switch (lex.GetInteger()) {
+		switch (lex.getInteger()) {
 		default:
 		case 1: params.sides = LyXTextClass::OneSide; break;
 		case 2: params.sides = LyXTextClass::TwoSides; break;
 		}
 	} else if (token == "\\paperpagestyle") {
 		lex.nextToken();
-		params.pagestyle = strip(lex.GetString());
+		params.pagestyle = strip(lex.getString());
 	} else if (token == "\\bullet") {
 		lex.nextToken();
-		int const index = lex.GetInteger();
+		int const index = lex.getInteger();
 		lex.nextToken();
-		int temp_int = lex.GetInteger();
+		int temp_int = lex.getInteger();
 		params.user_defined_bullets[index].setFont(temp_int);
 		params.temp_bullets[index].setFont(temp_int);
 		lex.nextToken();
-		temp_int = lex.GetInteger();
+		temp_int = lex.getInteger();
 		params.user_defined_bullets[index].setCharacter(temp_int);
 		params.temp_bullets[index].setCharacter(temp_int);
 		lex.nextToken();
-		temp_int = lex.GetInteger();
+		temp_int = lex.getInteger();
 		params.user_defined_bullets[index].setSize(temp_int);
 		params.temp_bullets[index].setSize(temp_int);
 		lex.nextToken();
-		string const temp_str = lex.GetString();
+		string const temp_str = lex.getString();
 		if (temp_str != "\\end_bullet") {
 				// this element isn't really necessary for
 				// parsing but is easier for humans
@@ -847,9 +871,9 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 		}
 	} else if (token == "\\bulletLaTeX") {
 		lex.nextToken();
-		int const index = lex.GetInteger();
+		int const index = lex.getInteger();
 		lex.next();
-		string temp_str = lex.GetString();
+		string temp_str = lex.getString();
 		string sum_str;
 		while (temp_str != "\\end_bullet") {
 				// this loop structure is needed when user
@@ -860,19 +884,19 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 				// therefore needs to be read in turn
 			sum_str += temp_str;
 			lex.next();
-			temp_str = lex.GetString();
+			temp_str = lex.getString();
 		}
 		params.user_defined_bullets[index].setText(sum_str);
 		params.temp_bullets[index].setText(sum_str);
 	} else if (token == "\\secnumdepth") {
 		lex.nextToken();
-		params.secnumdepth = lex.GetInteger();
+		params.secnumdepth = lex.getInteger();
 	} else if (token == "\\tocdepth") {
 		lex.nextToken();
-		params.tocdepth = lex.GetInteger();
+		params.tocdepth = lex.getInteger();
 	} else if (token == "\\spacing") {
 		lex.next();
-		string const tmp = strip(lex.GetString());
+		string const tmp = strip(lex.getString());
 		Spacing::Space tmp_space = Spacing::Default;
 		float tmp_val = 0.0;
 		if (tmp == "single") {
@@ -884,7 +908,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 		} else if (tmp == "other") {
 			lex.next();
 			tmp_space = Spacing::Other;
-			tmp_val = lex.GetFloat();
+			tmp_val = lex.getFloat();
 		} else {
 			lex.printError("Unknown spacing token: '$$Token'");
 		}
@@ -897,7 +921,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 		}
 	} else if (token == "\\paragraph_spacing") {
 		lex.next();
-		string const tmp = strip(lex.GetString());
+		string const tmp = strip(lex.getString());
 		if (tmp == "single") {
 			par->params().spacing(Spacing(Spacing::Single));
 		} else if (tmp == "onehalf") {
@@ -907,46 +931,29 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 		} else if (tmp == "other") {
 			lex.next();
 			par->params().spacing(Spacing(Spacing::Other,
-					 lex.GetFloat()));
+					 lex.getFloat()));
 		} else {
 			lex.printError("Unknown spacing token: '$$Token'");
 		}
 	} else if (token == "\\float_placement") {
 		lex.nextToken();
-		params.float_placement = lex.GetString();
+		params.float_placement = lex.getString();
 	} else if (token == "\\family") { 
 		lex.next();
-		font.setLyXFamily(lex.GetString());
+		font.setLyXFamily(lex.getString());
 	} else if (token == "\\series") {
 		lex.next();
-		font.setLyXSeries(lex.GetString());
+		font.setLyXSeries(lex.getString());
 	} else if (token == "\\shape") {
 		lex.next();
-		font.setLyXShape(lex.GetString());
+		font.setLyXShape(lex.getString());
 	} else if (token == "\\size") {
 		lex.next();
-		font.setLyXSize(lex.GetString());
-#ifndef NO_LATEX
-#ifdef WITH_WARNINGS
-#warning compatability hack needed
-#endif
+		font.setLyXSize(lex.getString());
+#ifndef NO_COMPABILITY
 	} else if (token == "\\latex") {
 		lex.next();
-		string const tok = lex.GetString();
-		// This is dirty, but gone with LyX3. (Asger)
-		if (tok == "no_latex")
-			font.setLatex(LyXFont::OFF);
-		else if (tok == "latex")
-			font.setLatex(LyXFont::ON);
-		else if (tok == "default")
-			font.setLatex(LyXFont::INHERIT);
-		else
-			lex.printError("Unknown LaTeX font flag "
-				       "`$$Token'");
-#else
-	} else if (token == "\\latex") {
-		lex.next();
-		string const tok = lex.GetString();
+		string const tok = lex.getString();
 		if (tok == "no_latex") {
 			// Do the insetert.
 			insertErtContents(par, pos, font);
@@ -962,7 +969,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 #endif
 	} else if (token == "\\lang") {
 		lex.next();
-		string const tok = lex.GetString();
+		string const tok = lex.getString();
 		Language const * lang = languages.getLanguage(tok);
 		if (lang) {
 			font.setLanguage(lang);
@@ -972,13 +979,13 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 		}
 	} else if (token == "\\numeric") {
 		lex.next();
-		font.setNumber(font.setLyXMisc(lex.GetString()));
+		font.setNumber(font.setLyXMisc(lex.getString()));
 	} else if (token == "\\emph") {
 		lex.next();
-		font.setEmph(font.setLyXMisc(lex.GetString()));
+		font.setEmph(font.setLyXMisc(lex.getString()));
 	} else if (token == "\\bar") {
 		lex.next();
-		string const tok = lex.GetString();
+		string const tok = lex.getString();
 		// This is dirty, but gone with LyX3. (Asger)
 		if (tok == "under")
 			font.setUnderbar(LyXFont::ON);
@@ -991,12 +998,12 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 				       "`$$Token'");
 	} else if (token == "\\noun") {
 		lex.next();
-		font.setNoun(font.setLyXMisc(lex.GetString()));
+		font.setNoun(font.setLyXMisc(lex.getString()));
 	} else if (token == "\\color") {
 		lex.next();
-		font.setLyXColor(lex.GetString());
+		font.setLyXColor(lex.getString());
 	} else if (token == "\\align") {
-		int tmpret = lex.FindToken(string_align);
+		int tmpret = lex.findToken(string_align);
 		if (tmpret == -1) ++tmpret;
 		if (tmpret != LYX_LAYOUT_DEFAULT) { // tmpret != 99 ???
 			int const tmpret2 = int(pow(2.0, tmpret));
@@ -1005,33 +1012,35 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 		}
 	} else if (token == "\\added_space_top") {
 		lex.nextToken();
-		par->params().spaceTop(VSpace(lex.GetString()));
+		par->params().spaceTop(VSpace(lex.getString()));
 	} else if (token == "\\added_space_bottom") {
 		lex.nextToken();
-		par->params().spaceBottom(VSpace(lex.GetString()));
+		par->params().spaceBottom(VSpace(lex.getString()));
+#ifndef NO_COMPABILITY
 #ifndef NO_PEXTRA_REALLY
 	} else if (token == "\\pextra_type") {
 		lex.nextToken();
-		par->params().pextraType(lex.GetInteger());
+		par->params().pextraType(lex.getInteger());
 	} else if (token == "\\pextra_width") {
 		lex.nextToken();
-		par->params().pextraWidth(lex.GetString());
+		par->params().pextraWidth(lex.getString());
 	} else if (token == "\\pextra_widthp") {
 		lex.nextToken();
-		par->params().pextraWidthp(lex.GetString());
+		par->params().pextraWidthp(lex.getString());
 	} else if (token == "\\pextra_alignment") {
 		lex.nextToken();
-		par->params().pextraAlignment(lex.GetInteger());
+		par->params().pextraAlignment(lex.getInteger());
 	} else if (token == "\\pextra_hfill") {
 		lex.nextToken();
-		par->params().pextraHfill(lex.GetInteger());
+		par->params().pextraHfill(lex.getInteger());
 	} else if (token == "\\pextra_start_minipage") {
 		lex.nextToken();
-		par->params().pextraStartMinipage(lex.GetInteger());
+		par->params().pextraStartMinipage(lex.getInteger());
+#endif
 #endif
 	} else if (token == "\\labelwidthstring") {
-		lex.EatLine();
-		par->params().labelWidthString(lex.GetString());
+		lex.eatLine();
+		par->params().labelWidthString(lex.getString());
 		// do not delete this token, it is still needed!
 	} else if (token == "\\end_inset") {
 		lyxerr << "Solitary \\end_inset. Missing \\begin_inset?.\n"
@@ -1042,15 +1051,16 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 		// But insets should read it, it is a part of
 		// the inset isn't it? Lgb.
 	} else if (token == "\\begin_inset") {
-#ifdef NO_LATEX
+#ifndef NO_COMPABILITY
 		insertErtContents(par, pos, font, false);
 		ert_stack.push(ert_comp);
 		ert_comp = ErtComp();
 #endif
 		readInset(lex, par, pos, font);
-#ifdef NO_LATEX
+#ifndef NO_COMPABILITY
 		ert_comp = ert_stack.top();
 		ert_stack.pop();
+		insertErtContents(par, pos, font);
 #endif
 	} else if (token == "\\SpecialChar") {
 		LyXLayout const & layout =
@@ -1059,9 +1069,9 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 
 		// Insets don't make sense in a free-spacing context! ---Kayvan
 		if (layout.free_spacing) {
-			if (lex.IsOK()) {
+			if (lex.isOK()) {
 				lex.next();
-				string next_token = lex.GetString();
+				string next_token = lex.getString();
 				if (next_token == "\\-") {
 					par->insertChar(pos, '-', font);
 				} else if (next_token == "\\protected_separator"
@@ -1081,8 +1091,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 		}
 		++pos;
 	} else if (token == "\\newline") {
-#ifdef NO_LATEX
-
+#ifndef NO_COMPABILITY
 		if (!ert_comp.in_tabular && ert_comp.active) {
 			ert_comp.contents += char(Paragraph::META_NEWLINE);
 		} else {
@@ -1099,7 +1108,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 		++pos;
 #endif
 	} else if (token == "\\LyXTable") {
-#ifdef NO_LATEX
+#ifndef NO_COMPABILITY
 		ert_comp.in_tabular = true;
 #endif
 		Inset * inset = new InsetTabular(*this);
@@ -1131,28 +1140,30 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 		}
 		par->bibkey->read(this, lex);		        
 	} else if (token == "\\backslash") {
-#ifdef NO_LATEX
+#ifndef NO_COMPABILITY
 		if (ert_comp.active) {
 			ert_comp.contents += "\\";
 		} else {
 #endif
 		par->insertChar(pos, '\\', font);
 		++pos;
-#ifdef NO_LATEX
+#ifndef NO_COMPABILITY
 		}
 #endif
 	} else if (token == "\\the_end") {
-#ifdef NO_LATEX
+#ifndef NO_COMPABILITY
 		// If we still have some ert active here we have to insert
 		// it so we don't loose it. (Lgb)
 		insertErtContents(par, pos, font);
 #endif
 		the_end_read = true;
+#ifndef NO_COMPABILITY
 #ifndef NO_PEXTRA_REALLY
 		minipar = parBeforeMinipage = 0;
+#endif
 #endif
 	} else {
-#ifdef NO_LATEX
+#ifndef NO_COMPABILITY
 		if (ert_comp.active) {
 			ert_comp.contents += token;
 		} else {
@@ -1166,11 +1177,12 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 			par->insertChar(pos, (*cit), font);
 			++pos;
 		}
-#ifdef NO_LATEX
+#ifndef NO_COMPABILITY
 		}
 #endif
 	}
 
+#ifndef NO_COMPABILITY
 #ifndef NO_PEXTRA_REALLY
 	// I wonder if we could use this blanket fix for all the
 	// checkminipage cases...
@@ -1323,6 +1335,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 	}
 	// End of pextra_minipage compability
 	--call_depth;
+#endif
 #endif
 	return the_end_read;
 }
@@ -1385,7 +1398,7 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par,
 		       int & pos, LyXFont & font)
 {
 	// consistency check
-	if (lex.GetString() != "\\begin_inset") {
+	if (lex.getString() != "\\begin_inset") {
 		lyxerr << "Buffer::readInset: Consistency check failed."
 		       << endl;
 	}
@@ -1393,7 +1406,7 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par,
 	Inset * inset = 0;
 
 	lex.next();
-	string const tmptok = lex.GetString();
+	string const tmptok = lex.getString();
 	last_inset_read = tmptok;
 
 	// test the different insets
@@ -1453,8 +1466,11 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par,
 			inset = new InsetFormulaMacro;
 		} else if (tmptok == "Formula") {
 			inset = new InsetFormula;
-		} else if (tmptok == "Figure") {
+		} else if (tmptok == "Figure") { // Backward compatibility
 			inset = new InsetFig(100, 100, *this);
+			//inset = new InsetGraphics;
+		} else if (tmptok == "Graphics") {
+			inset = new InsetGraphics;
 		} else if (tmptok == "Info") {// backwards compatibility
 			inset = new InsetNote(this,
 					      lex.getLongString("\\end_inset"),
@@ -1479,7 +1495,7 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par,
 			inset = new InsetMinipage;
 		} else if (tmptok == "Float") {
 			lex.next();
-			string tmptok = lex.GetString();
+			string tmptok = lex.getString();
 			inset = new InsetFloat(tmptok);
 #if 0
 		} else if (tmptok == "List") {
@@ -1489,8 +1505,6 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par,
 #endif
 		} else if (tmptok == "Caption") {
 			inset = new InsetCaption;
-		} else if (tmptok == "GRAPHICS") {
-			inset = new InsetGraphics;
 		} else if (tmptok == "FloatList") {
 			inset = new InsetFloatList;
 		}
@@ -1507,12 +1521,12 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par,
 
 bool Buffer::readFile(LyXLex & lex, Paragraph * par)
 {
-	if (lex.IsOK()) {
+	if (lex.isOK()) {
 		lex.next();
-		string const token(lex.GetString());
+		string const token(lex.getString());
 		if (token == "\\lyxformat") { // the first token _must_ be...
-			lex.EatLine();
-			string tmp_format = lex.GetString();
+			lex.eatLine();
+			string tmp_format = lex.getString();
 			//lyxerr << "LyX Format: `" << tmp_format << "'" << endl;
 			// if present remove ".," from string.
 			string::size_type dot = tmp_format.find_first_of(".,");
@@ -1797,9 +1811,6 @@ string const Buffer::asciiParagraph(Paragraph const * par,
 		lyxerr << "Should this ever happen?" << endl;
 	}
 
-#ifndef NO_LATEX
-	LyXFont const font1 = LyXFont(LyXFont::ALL_INHERIT, params.language);
-#endif
 	for (Paragraph::size_type i = 0; i < par->size(); ++i) {
 		if (!i && !noparbreak) {
 			if (linelen > 0)
@@ -1838,17 +1849,6 @@ string const Buffer::asciiParagraph(Paragraph const * par,
 				currlinelen += (ltype_depth-depth)*2;
 			}
 		}
-#ifndef NO_LATEX
-		LyXFont const font2 = par->getFontSettings(params, i);
-		if (font1.latex() != font2.latex()) {
-			if (font2.latex() == LyXFont::OFF)
-				islatex = 0;
-			else
-				islatex = 1;
-		} else {
-			islatex = 0;
-		}
-#endif
 		
 		char c = par->getUChar(params, i);
 		if (islatex)
@@ -2827,7 +2827,7 @@ void Buffer::simpleLinuxDocOnePar(ostream & os,
 	LyXFont::FONT_SHAPE  shape_type  = LyXFont::UP_SHAPE;
 	bool is_em = false;
 
-	stack < PAR_TAG > tag_state;
+	stack<PAR_TAG> tag_state;
 	// parsing main loop
 	for (Paragraph::size_type i = 0; i < par->size(); ++i) {
 
@@ -2952,11 +2952,7 @@ void Buffer::simpleLinuxDocOnePar(ostream & os,
 			continue;
 		}
 
-		if (
-#ifndef NO_LATEX
-			font.latex() == LyXFont::ON ||
-#endif
-		    style.latexparam() == "CDATA") {
+		if (style.latexparam() == "CDATA") {
 			// "TeX"-Mode on == > SGML-Mode on.
 			if (c != '\0')
 				os << c;
@@ -3369,13 +3365,6 @@ void Buffer::simpleDocBookOnePar(ostream & os, string & extra,
 				else
 					os << tmp_out;
 			}
-#ifndef NO_LATEX
-		} else if (font.latex() == LyXFont::ON) {
-			// "TeX"-Mode on ==> SGML-Mode on.
-			if (c != '\0')
-				os << c;
-			++char_line_count;
-#endif
 		} else {
 			string sgml_string;
 			if (par->linuxDocConvertChar(c, sgml_string)
@@ -3424,7 +3413,7 @@ int Buffer::runChktex()
 	string path = OnlyPath(filename);
 
 	string const org_path = path;
-	if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) {
+	if (lyxrc.use_tempdir || !IsDirWriteable(path)) {
 		path = tmppath;	 
 	}
 
@@ -3453,7 +3442,7 @@ int Buffer::runChktex()
 	// error insets after we ran chktex, this must be run:
 	if (removedErrorInsets || res){
 		users->redraw();
-		users->fitCursor(users->text);
+		users->fitCursor();
 	}
 	users->owner()->allowInput();
 
@@ -3760,29 +3749,26 @@ void Buffer::resizeInsets(BufferView * bv)
 void Buffer::redraw()
 {
 	users->redraw(); 
-	users->fitCursor(users->text); 
+	users->fitCursor(); 
 }
 
 
 void Buffer::changeLanguage(Language const * from, Language const * to)
 {
 
-	Paragraph * par = paragraph;
-	while (par) {
-		par->changeLanguage(params, from, to);
-		par = par->next();
-	}
+	ParIterator end = par_iterator_end();
+	for (ParIterator it = par_iterator_begin(); it != end; ++it)
+		(*it)->changeLanguage(params, from, to);
 }
 
 
 bool Buffer::isMultiLingual()
 {
-	Paragraph * par = paragraph;
-	while (par) {
-		if (par->isMultiLingual(params))
+	ParIterator end = par_iterator_end();
+	for (ParIterator it = par_iterator_begin(); it != end; ++it)
+		if ((*it)->isMultiLingual(params))
 			return true;
-		par = par->next();
-	}
+
 	return false;
 }
 
@@ -3843,3 +3829,15 @@ Paragraph * Buffer::getParFromID(int id) const
 	}
 	return 0;
 }
+
+
+ParIterator Buffer::par_iterator_begin()
+{
+        return ParIterator(paragraph);
+}
+
+
+ParIterator Buffer::par_iterator_end()
+{
+        return ParIterator();
+}