X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFont.cpp;h=e84b66b0c89b41fdfe5fb445151a47d090378d1e;hb=19bec6e8bc13c00c528392cb77826dc7de3f68e8;hp=cf716d273bb44020b95f2242d8abcf3f6f3ada41;hpb=6fde8f806778ab5bcc146f17169119af516a97cd;p=lyx.git

diff --git a/src/Font.cpp b/src/Font.cpp
index cf716d273b..e84b66b0c8 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -39,6 +39,16 @@ using namespace lyx::support;
 
 namespace lyx {
 
+//
+// Strings used to read and write .lyx format files
+//
+// These are defined in FontInfo.cpp
+extern char const * LyXFamilyNames[NUM_FAMILIES + 2];
+extern char const * LyXSeriesNames[4];
+extern char const * LyXShapeNames[6];
+extern char const * LyXSizeNames[14];
+extern char const * LyXMiscNames[5];
+
 //
 // Names for the GUI
 //
@@ -65,29 +75,6 @@ char const * GUISizeNames[14] =
 char const * GUIMiscNames[5] =
 { N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("Ignore") };
 
-
-//
-// Strings used to read and write .lyx format files
-//
-char const * LyXFamilyNames[NUM_FAMILIES + 2 /* default & error */] =
-{ "roman", "sans", "typewriter", "symbol",
-  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", "esint",
-  "default", "error" };
-
-char const * LyXSeriesNames[4] =
-{ "medium", "bold", "default", "error" };
-
-char const * LyXShapeNames[6] =
-{ "up", "italic", "slanted", "smallcaps", "default", "error" };
-
-char const * LyXSizeNames[14] =
-{ "tiny", "scriptsize", "footnotesize", "small", "normal", "large",
-  "larger", "largest", "huge", "giant",
-  "increase", "decrease", "default", "error" };
-
-char const * LyXMiscNames[5] =
-{ "off", "on", "toggle", "default", "error" };
-
 //
 // Strings used to write LaTeX files
 //
@@ -177,13 +164,13 @@ docstring const stateText(FontInfo const & f)
 			      _(GUIMiscNames[f.underbar()]));
 	if (f.strikeout() != FONT_INHERIT)
 		os << bformat(_("Strikeout %1$s, "),
-			      _(GUIMiscNames[f.uuline()]));
+			      _(GUIMiscNames[f.strikeout()]));
 	if (f.uuline() != FONT_INHERIT)
 		os << bformat(_("Double underline %1$s, "),
-			      _(GUIMiscNames[f.uwave()]));
+			      _(GUIMiscNames[f.uuline()]));
 	if (f.uwave() != FONT_INHERIT)
 		os << bformat(_("Wavy underline %1$s, "),
-			      _(GUIMiscNames[f.strikeout()]));
+			      _(GUIMiscNames[f.uwave()]));
 	if (f.noun() != FONT_INHERIT)
 		os << bformat(_("Noun %1$s, "),
 			      _(GUIMiscNames[f.noun()]));
@@ -208,92 +195,6 @@ docstring const Font::stateText(BufferParams * params) const
 }
 
 
-// Set family according to lyx format string
-void setLyXFamily(string const & fam, FontInfo & f)
-{
-	string const s = ascii_lowercase(fam);
-
-	int i = 0;
-	while (LyXFamilyNames[i] != s &&
-	       LyXFamilyNames[i] != string("error"))
-		++i;
-	if (s == LyXFamilyNames[i])
-		f.setFamily(FontFamily(i));
-	else
-		lyxerr << "setLyXFamily: Unknown family `"
-		       << s << '\'' << endl;
-}
-
-
-// Set series according to lyx format string
-void setLyXSeries(string const & ser, FontInfo & f)
-{
-	string const s = ascii_lowercase(ser);
-
-	int i = 0;
-	while (LyXSeriesNames[i] != s &&
-	       LyXSeriesNames[i] != string("error")) ++i;
-	if (s == LyXSeriesNames[i]) {
-		f.setSeries(FontSeries(i));
-	} else
-		lyxerr << "setLyXSeries: Unknown series `"
-		       << s << '\'' << endl;
-}
-
-
-// Set shape according to lyx format string
-void setLyXShape(string const & sha, FontInfo & f)
-{
-	string const s = ascii_lowercase(sha);
-
-	int i = 0;
-	while (LyXShapeNames[i] != s && LyXShapeNames[i] != string("error"))
-			++i;
-	if (s == LyXShapeNames[i])
-		f.setShape(FontShape(i));
-	else
-		lyxerr << "Font::setLyXShape: Unknown shape `"
-		       << s << '\'' << endl;
-}
-
-
-// Set size according to lyx format string
-void setLyXSize(string const & siz, FontInfo & f)
-{
-	string const s = ascii_lowercase(siz);
-	int i = 0;
-	while (LyXSizeNames[i] != s && LyXSizeNames[i] != string("error"))
-		++i;
-	if (s == LyXSizeNames[i]) {
-		f.setSize(FontSize(i));
-	} else
-		lyxerr << "Font::setLyXSize: Unknown size `"
-		       << s << '\'' << endl;
-}
-
-
-// Set size according to lyx format string
-FontState Font::setLyXMisc(string const & siz)
-{
-	string const s = ascii_lowercase(siz);
-	int i = 0;
-	while (LyXMiscNames[i] != s &&
-	       LyXMiscNames[i] != string("error")) ++i;
-	if (s == LyXMiscNames[i])
-		return FontState(i);
-	lyxerr << "Font::setLyXMisc: Unknown misc flag `"
-	       << s << '\'' << endl;
-	return FONT_OFF;
-}
-
-
-/// Sets color after LyX text format
-void setLyXColor(string const & col, FontInfo & f)
-{
-	f.setColor(lcolor.getFromLyXName(col));
-}
-
-
 // Returns size in latex format
 string const Font::latexSize() const
 {
@@ -301,81 +202,6 @@ string const Font::latexSize() const
 }
 
 
-// Read a font definition from given file in lyx format
-// Used for layouts
-FontInfo lyxRead(Lexer & lex, FontInfo const & fi)
-{
-	FontInfo f = fi;
-	bool error = false;
-	bool finished = false;
-	while (!finished && lex.isOK() && !error) {
-		lex.next();
-		string const tok = ascii_lowercase(lex.getString());
-
-		if (tok.empty()) {
-			continue;
-		} else if (tok == "endfont") {
-			finished = true;
-		} else if (tok == "family") {
-			lex.next();
-			string const ttok = lex.getString();
-			setLyXFamily(ttok, f);
-		} else if (tok == "series") {
-			lex.next();
-			string const ttok = lex.getString();
-			setLyXSeries(ttok, f);
-		} else if (tok == "shape") {
-			lex.next();
-			string const ttok = lex.getString();
-			setLyXShape(ttok, f);
-		} else if (tok == "size") {
-			lex.next();
-			string const ttok = lex.getString();
-			setLyXSize(ttok, f);
-		} else if (tok == "misc") {
-			lex.next();
-			string const ttok = ascii_lowercase(lex.getString());
-
-			if (ttok == "no_bar") {
-				f.setUnderbar(FONT_OFF);
-			} else if (ttok == "no_strikeout") {
-				f.setStrikeout(FONT_OFF);
-			} else if (ttok == "no_uuline") {
-				f.setUuline(FONT_OFF);
-			} else if (ttok == "no_uwave") {
-				f.setUwave(FONT_OFF);
-			} else if (ttok == "no_emph") {
-				f.setEmph(FONT_OFF);
-			} else if (ttok == "no_noun") {
-				f.setNoun(FONT_OFF);
-			} else if (ttok == "emph") {
-				f.setEmph(FONT_ON);
-			} else if (ttok == "underbar") {
-				f.setUnderbar(FONT_ON);
-			} else if (ttok == "strikeout") {
-				f.setStrikeout(FONT_ON);
-			} else if (ttok == "uuline") {
-				f.setUuline(FONT_ON);
-			} else if (ttok == "uwave") {
-				f.setUwave(FONT_ON);
-			} else if (ttok == "noun") {
-				f.setNoun(FONT_ON);
-			} else {
-				lex.printError("Illegal misc type");
-			}
-		} else if (tok == "color") {
-			lex.next();
-			string const ttok = lex.getString();
-			setLyXColor(ttok, f);
-		} else {
-			lex.printError("Unknown tag");
-			error = true;
-		}
-	}
-	return f;
-}
-
-
 /// Writes the changes from this font to orgfont in .lyx format in file
 void Font::lyxWriteChanges(Font const & orgfont,
 			      ostream & os) const
@@ -552,23 +378,27 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 		env = true; //We have opened a new environment
 	}
 	if (f.underbar() == FONT_ON) {
-		os << "\\underbar{";
+		os << "\\uline{";
 		count += 10;
+		runparams.inulemcmd = true;
 		env = true; //We have opened a new environment
 	}
 	if (f.strikeout() == FONT_ON) {
 		os << "\\sout{";
-		count += 6;
+		count += 9;
+		runparams.inulemcmd = true;
 		env = true; //We have opened a new environment
 	}
 	if (f.uuline() == FONT_ON) {
 		os << "\\uuline{";
-		count += 8;
+		count += 11;
+		runparams.inulemcmd = true;
 		env = true; //We have opened a new environment
 	}
 	if (f.uwave() == FONT_ON) {
 		os << "\\uwave{";
-		count += 7;
+		count += 10;
+		runparams.inulemcmd = true;
 		env = true; //We have opened a new environment
 	}
 	// \noun{} is a LyX special macro
@@ -638,21 +468,25 @@ int Font::latexWriteEndChanges(odocstream & os, BufferParams const & bparams,
 	if (f.underbar() == FONT_ON) {
 		os << '}';
 		++count;
+		runparams.inulemcmd = false;
 		env = true; // Size change need not bother about closing env.
 	}
 	if (f.strikeout() == FONT_ON) {
 		os << '}';
 		++count;
+		runparams.inulemcmd = false;
 		env = true; // Size change need not bother about closing env.
 	}
 	if (f.uuline() == FONT_ON) {
 		os << '}';
 		++count;
+		runparams.inulemcmd = false;
 		env = true; // Size change need not bother about closing env.
 	}
 	if (f.uwave() == FONT_ON) {
 		os << '}';
 		++count;
+		runparams.inulemcmd = false;
 		env = true; // Size change need not bother about closing env.
 	}
 	if (f.noun() == FONT_ON) {
@@ -818,6 +652,11 @@ void Font::validate(LaTeXFeatures & features) const
 		features.require("noun");
 		LYXERR(Debug::LATEX, "Noun enabled. Font: " << to_utf8(stateText(0)));
 	}
+	if (bits_.underbar() == FONT_ON) {
+		LYXERR(Debug::LATEX, "font.underline: " << bits_.underbar());
+		features.require("ulem");
+		LYXERR(Debug::LATEX, "Underline enabled. Font: " << to_utf8(stateText(0)));
+	}
 	if (bits_.strikeout() == FONT_ON) {
 		LYXERR(Debug::LATEX, "font.strikeout: " << bits_.strikeout());
 		features.require("ulem");