X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.cpp;h=ec6e2dc5a5dfe760f5c931acea611e93f1635ddf;hb=8ea66efe16ad109a5c107716185fb82bbebca8c8;hp=7f4925a8c3798d55518d18e7da37eabd4f942973;hpb=01ec30ca8626323ef8888018a0150204915029f9;p=lyx.git

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 7f4925a8c3..ec6e2dc5a5 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -13,6 +13,7 @@
 #include <config.h>
 
 #include "Layout.h"
+#include "Encoding.h"
 #include "FontInfo.h"
 #include "Language.h"
 #include "Lexer.h"
@@ -23,8 +24,8 @@
 #include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/Messages.h"
+#include "support/textutils.h"
 
-#include "support/regex.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -46,18 +47,11 @@ enum LayoutTags {
 	LT_COPYSTYLE,
 	LT_DEPENDSON,
 	LT_OBSOLETEDBY,
-	//LT_EMPTY,
 	LT_END,
-	//LT_ENVIRONMENT_DEFAULT,
-	//LT_FANCYHDR,
-	LT_FILL_BOTTOM,
-	LT_FILL_TOP,
-	//LT_FIRST_COUNTER,
 	LT_FONT,
 	LT_FREE_SPACING,
 	LT_PASS_THRU,
 	LT_PARBREAK_IS_NEWLINE,
-	//LT_HEADINGS,
 	LT_ITEMSEP,
 	LT_KEEPEMPTY,
 	LT_LABEL_BOTTOMSEP,
@@ -82,7 +76,6 @@ enum LayoutTags {
 	LT_PARINDENT,
 	LT_PARSEP,
 	LT_PARSKIP,
-	//LT_PLAIN,
 	LT_PREAMBLE,
 	LT_LANGPREAMBLE,
 	LT_BABELPREAMBLE,
@@ -140,8 +133,6 @@ Layout::Layout()
 	endlabeltype = END_LABEL_NO_LABEL;
 	// Should or should not. That is the question.
 	// spacing.set(Spacing::OneHalf);
-	fill_top = false;
-	fill_bottom = false;
 	newline_allowed = true;
 	free_spacing = false;
 	pass_thru = false;
@@ -172,8 +163,6 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 		{ "end",            LT_END },
 		{ "endlabelstring", LT_ENDLABELSTRING },
 		{ "endlabeltype",   LT_ENDLABELTYPE },
-		{ "fill_bottom",    LT_FILL_BOTTOM },
-		{ "fill_top",       LT_FILL_TOP },
 		{ "font",           LT_FONT },
 		{ "freespacing",    LT_FREE_SPACING },
 		{ "htmlattr",       LT_HTMLATTR },
@@ -183,7 +172,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 		{ "htmllabel",      LT_HTMLLABEL },
 		{ "htmllabelattr",  LT_HTMLLABELATTR },
 		{ "htmllabelfirst", LT_HTMLLABELFIRST },
-		{ "htmlpremable",   LT_HTMLPREAMBLE },
+		{ "htmlpreamble",   LT_HTMLPREAMBLE },
 		{ "htmlstyle",      LT_HTMLSTYLE },
 		{ "htmltag",        LT_HTMLTAG },
 		{ "htmltitle",      LT_HTMLTITLE },
@@ -233,6 +222,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 	bool error = false;
 	bool finished = false;
 	lex.pushTable(layoutTags);
+
 	// parse style section
 	while (!finished && lex.isOK() && !error) {
 		int le = lex.lex();
@@ -241,7 +231,8 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 		case Lexer::LEX_FEOF:
 			continue;
 
-		case Lexer::LEX_UNDEF:		// parse error
+		case Lexer::LEX_UNDEF:
+			// parse error
 			lex.printError("Unknown layout tag `$$Token'");
 			error = true;
 			continue;
@@ -250,7 +241,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 			break;
 		}
 		switch (static_cast<LayoutTags>(le)) {
-		case LT_END:		// end of structure
+		case LT_END:
 			finished = true;
 			break;
 
@@ -258,7 +249,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 			lex >> category_;
 			break;
 
-		case LT_COPYSTYLE: {     // initialize with a known style
+		case LT_COPYSTYLE: {
 			docstring style;
 			lex >> style;
 			style = subst(style, '_', ' ');
@@ -279,7 +270,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 			break;
 			}
 
-		case LT_OBSOLETEDBY: {   // replace with a known style
+		case LT_OBSOLETEDBY: {
 			docstring style;
 			lex >> style;
 			style = subst(style, '_', ' ');
@@ -306,11 +297,11 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 			depends_on_ = subst(depends_on_, '_', ' ');
 			break;
 
-		case LT_MARGIN:		// margin style definition.
+		case LT_MARGIN:
 			readMargin(lex);
 			break;
 
-		case LT_LATEXTYPE:	// LaTeX style definition.
+		case LT_LATEXTYPE:
 			readLatexType(lex);
 			break;
 
@@ -355,7 +346,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 			labelfont = lyxRead(lex, labelfont);
 			break;
 
-		case LT_NEXTNOINDENT:	// Indent next paragraph?
+		case LT_NEXTNOINDENT:
 			lex >> nextnoindent;
 			break;
 
@@ -404,71 +395,64 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 			readEndLabelType(lex);
 			break;
 
-		case LT_LEFTMARGIN:	// left margin type
+		case LT_LEFTMARGIN:
 			lex >> leftmargin;
 			break;
 
-		case LT_RIGHTMARGIN:	// right margin type
+		case LT_RIGHTMARGIN:
 			lex >> rightmargin;
 			break;
 
-		case LT_LABELINDENT:	// label indenting flag
+		case LT_LABELINDENT:
 			lex >> labelindent;
 			break;
 
-		case LT_PARINDENT:	// paragraph indent. flag
+		case LT_PARINDENT:
 			lex >> parindent;
 			break;
 
-		case LT_PARSKIP:	// paragraph skip size
+		case LT_PARSKIP:
 			lex >> parskip;
 			break;
 
-		case LT_ITEMSEP:	// item separation size
+		case LT_ITEMSEP:
 			lex >> itemsep;
 			break;
 
-		case LT_TOPSEP:		// top separation size
+		case LT_TOPSEP:
 			lex >> topsep;
 			break;
 
-		case LT_BOTTOMSEP:	// bottom separation size
+		case LT_BOTTOMSEP:
 			lex >> bottomsep;
 			break;
 
-		case LT_LABEL_BOTTOMSEP: // label bottom separation size
+		case LT_LABEL_BOTTOMSEP:
 			lex >> labelbottomsep;
 			break;
 
-		case LT_LABELSEP:	// label separator
+		case LT_LABELSEP:
 			lex >> labelsep;
 			labelsep = subst(labelsep, 'x', ' ');
 			break;
 
-		case LT_PARSEP:		// par. separation size
+		case LT_PARSEP:
 			lex >> parsep;
 			break;
 
-		case LT_FILL_TOP:	// fill top flag
-			lex >> fill_top;
-			break;
-
-		case LT_FILL_BOTTOM:	// fill bottom flag
-			lex >> fill_bottom;
-			break;
-
-		case LT_NEWLINE:	// newlines allowed?
+		case LT_NEWLINE:
 			lex >> newline_allowed;
 			break;
 
-		case LT_ALIGN:		// paragraph align
+		case LT_ALIGN:
 			readAlign(lex);
 			break;
-		case LT_ALIGNPOSSIBLE:	// paragraph allowed align
+	
+		case LT_ALIGNPOSSIBLE:
 			readAlignPossible(lex);
 			break;
 
-		case LT_LABELSTRING:	// label string definition
+		case LT_LABELSTRING:
 			// FIXME: this means LT_ENDLABELSTRING may only
 			// occur after LT_LABELSTRING
 			lex >> labelstring_;
@@ -476,26 +460,26 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 			labelstring_appendix_ = labelstring_;
 			break;
 
-		case LT_ENDLABELSTRING:	// endlabel string definition
+		case LT_ENDLABELSTRING:
 			lex >> endlabelstring_;	
 			endlabelstring_ = trim(endlabelstring_);
 			break;
 
-		case LT_LABELSTRING_APPENDIX: // label string appendix definition
+		case LT_LABELSTRING_APPENDIX:
 			lex >> labelstring_appendix_;	
 			labelstring_appendix_ = trim(labelstring_appendix_);
 			break;
 
-		case LT_LABELCOUNTER: // name of counter to use
+		case LT_LABELCOUNTER:
 			lex >> counter;	
 			counter = trim(counter);
 			break;
 
-		case LT_FREE_SPACING:	// Allow for free spacing.
+		case LT_FREE_SPACING:
 			lex >> free_spacing;
 			break;
 
-		case LT_PASS_THRU:	// Allow for pass thru.
+		case LT_PASS_THRU:
 			lex >> pass_thru;
 			break;
 
@@ -503,7 +487,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 			lex >> parbreak_is_newline;
 			break;
 
-		case LT_SPACING: // setspace.sty
+		case LT_SPACING:
 			readSpacing(lex);
 			break;
 
@@ -576,8 +560,8 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 	}
 	lex.popTable();
 	// make sure we only have inpreamble = true for commands
-	if (inpreamble && latextype != LATEX_COMMAND) {
-		LYXERR0("InPreamble not permitted except with Command-type layouts.");
+	if (inpreamble && latextype != LATEX_COMMAND && latextype != LATEX_PARAGRAPH) {
+		LYXERR0("InPreamble not permitted except with command and paragraph layouts.");
 		LYXERR0("Layout name: " << name());
 		inpreamble = false;
 	}
@@ -874,55 +858,6 @@ void Layout::readSpacing(Lexer & lex)
 }
 
 
-namespace {
-
-docstring const i18npreamble(Language const * lang, docstring const & templ)
-{
-	if (templ.empty())
-		return templ;
-
-	string preamble = subst(to_utf8(templ), "$$lang", lang->babel());
-
-#ifdef TEX2LYX
-	// tex2lyx does not have getMessages()
-	LASSERT(false, /**/);
-#else
-	// FIXME UNICODE
-	// lyx::regex is not unicode-safe.
-	// Should use QRegExp or (boost::u32regex, but that requires ICU)
-	static regex const reg("_\\(([^\\)]+)\\)");
-	smatch sub;
-	while (regex_search(preamble, sub, reg)) {
-		string const key = sub.str(1);
-		string translated;
-		if (isAscii(key))
-			translated = to_utf8(getMessages(lang->code()).get(key));
-		else {
-			lyxerr << "Warning: not translating `" << key
-			       << "' because it is not pure ASCII." << endl;
-			translated = key;
-		}
-		preamble = subst(preamble, sub.str(), translated);
-	}
-#endif
-	return from_utf8(preamble);
-}
-
-}
-
-
-docstring const Layout::langpreamble(Language const * lang) const
-{
-	return i18npreamble(lang, langpreamble_);
-}
-
-
-docstring const Layout::babelpreamble(Language const * lang) const
-{
-	return i18npreamble(lang, babelpreamble_);
-}
-
-
 string const & Layout::htmltag() const 
 { 
 	if (htmltag_.empty())
@@ -997,7 +932,7 @@ string Layout::defaultCSSClass() const
 	docstring::const_iterator en = name().end();
 	for (; it != en; ++it) {
 		char_type const c = *it;
-		if (c >= 0x80 || !isalnum(c)) {
+		if (!isAlphaASCII(c)) {
 			if (d.empty())
 				// make sure we don't start with an underscore,
 				// as that sometimes causes problems.