X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontInfo.cpp;h=251e509d6b3cb645fda739c9b6f156b6b0b85d19;hb=f51636b547b87b710f6a22e067e94f96d41c740f;hp=27b6a51ba37a03c28c3fc375d22125a0fe06acdc;hpb=72292b98a64c152c3b8862456c49067f74449cef;p=lyx.git

diff --git a/src/FontInfo.cpp b/src/FontInfo.cpp
index 27b6a51ba3..251e509d6b 100644
--- a/src/FontInfo.cpp
+++ b/src/FontInfo.cpp
@@ -32,16 +32,16 @@ namespace lyx {
 //
 char const * LyXFamilyNames[NUM_FAMILIES + 2 /* default & error */] =
 { "roman", "sans", "typewriter", "symbol",
-  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "rsfs", "wasy",
-  "esint", "default", "error" };
+  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "rsfs", "stmry",
+  "wasy", "esint", "default", "error" };
 
-char const * LyXSeriesNames[4] =
+char const * LyXSeriesNames[NUM_SERIES + 2 /* default & error */] =
 { "medium", "bold", "default", "error" };
 
-char const * LyXShapeNames[6] =
+char const * LyXShapeNames[NUM_SHAPE + 2 /* default & error */] =
 { "up", "italic", "slanted", "smallcaps", "default", "error" };
 
-char const * LyXSizeNames[14] =
+char const * LyXSizeNames[NUM_SIZE + 4 /* increase, decrease, default & error */] =
 { "tiny", "scriptsize", "footnotesize", "small", "normal", "large",
   "larger", "largest", "huge", "giant",
   "increase", "decrease", "default", "error" };
@@ -101,6 +101,7 @@ FontInfo::FontInfo()
 	*this = sane_font;
 }
 
+
 /// Decreases font size_ by one
 FontInfo & FontInfo::decSize()
 {
@@ -346,115 +347,117 @@ Color FontInfo::realColor() const
 
 namespace {
 
-	void appendSep(string & s1, string const & s2) {
-		if (s2.empty()) 
-			return;
-		s1 += s1.empty() ? "" : "\n";
-		s1 += s2;
-	}
+void appendSep(string & s1, string const & s2)
+{
+	if (s2.empty())
+		return;
+	s1 += s1.empty() ? "" : "\n";
+	s1 += s2;
+}
 
 
-	string makeCSSTag(string const & key, string const & val)
-	{
-		return key + ": " + val + ";";
-	}
+string makeCSSTag(string const & key, string const & val)
+{
+	return key + ": " + val + ";";
+}
 
 
-	string getFamilyCSS(FontFamily const & f)
-	{
-		switch (f) {
-		case ROMAN_FAMILY: 
-			return "serif";
-		case SANS_FAMILY: 
-			return "sans-serif";
-		case TYPEWRITER_FAMILY: 
-			return "monospace";
-		case SYMBOL_FAMILY:
-		case CMR_FAMILY:
-		case CMSY_FAMILY:
-		case CMM_FAMILY:
-		case CMEX_FAMILY:
-		case MSA_FAMILY:
-		case MSB_FAMILY:
-		case EUFRAK_FAMILY:
-		case RSFS_FAMILY:
-		case WASY_FAMILY:
-		case ESINT_FAMILY:
-		case INHERIT_FAMILY:
-		case IGNORE_FAMILY:
-			break;
-		}
-		return "";
+string getFamilyCSS(FontFamily const & f)
+{
+	switch (f) {
+	case ROMAN_FAMILY:
+		return "serif";
+	case SANS_FAMILY:
+		return "sans-serif";
+	case TYPEWRITER_FAMILY:
+		return "monospace";
+	case SYMBOL_FAMILY:
+	case CMR_FAMILY:
+	case CMSY_FAMILY:
+	case CMM_FAMILY:
+	case CMEX_FAMILY:
+	case MSA_FAMILY:
+	case MSB_FAMILY:
+	case EUFRAK_FAMILY:
+	case RSFS_FAMILY:
+	case STMARY_FAMILY:
+	case WASY_FAMILY:
+	case ESINT_FAMILY:
+	case INHERIT_FAMILY:
+	case IGNORE_FAMILY:
+		break;
 	}
+	return "";
+}
 
 
-	string getSeriesCSS(FontSeries const & s)
-	{
-		switch (s) {
-		case MEDIUM_SERIES: 
-			return "normal";
-		case BOLD_SERIES: 
-			return "bold";
-		case INHERIT_SERIES:
-		case IGNORE_SERIES:
-		  break;
-		}
-		return "";
+string getSeriesCSS(FontSeries const & s)
+{
+	switch (s) {
+	case MEDIUM_SERIES:
+		return "normal";
+	case BOLD_SERIES:
+		return "bold";
+	case INHERIT_SERIES:
+	case IGNORE_SERIES:
+		break;
 	}
+	return "";
+}
 
 
-	string getShapeCSS(FontShape const & s)
-	{
-		string fs = "normal";
-		string fv = "normal";
-		switch (s) {
-		case UP_SHAPE: break;
-		case ITALIC_SHAPE: fs = "italic"; break;
-		case SLANTED_SHAPE: fs = "oblique"; break;
-		case SMALLCAPS_SHAPE: fv = "small-caps"; break;
-		case IGNORE_SHAPE: 
-		case INHERIT_SHAPE:
-			fs = ""; fv = ""; break;
-		}
-		string retval;
-		if (!fs.empty())
-			appendSep(retval, makeCSSTag("font-style", fs));
-		if (!fv.empty())
-			appendSep(retval, makeCSSTag("font-variant", fv));
-		return retval;
+string getShapeCSS(FontShape const & s)
+{
+	string fs = "normal";
+	string fv = "normal";
+	switch (s) {
+	case UP_SHAPE: break;
+	case ITALIC_SHAPE: fs = "italic"; break;
+	case SLANTED_SHAPE: fs = "oblique"; break;
+	case SMALLCAPS_SHAPE: fv = "small-caps"; break;
+	case IGNORE_SHAPE:
+	case INHERIT_SHAPE:
+		fs = ""; fv = ""; break;
 	}
+	string retval;
+	if (!fs.empty())
+		appendSep(retval, makeCSSTag("font-style", fs));
+	if (!fv.empty())
+		appendSep(retval, makeCSSTag("font-variant", fv));
+	return retval;
+}
 
 
-	string getSizeCSS(FontSize const & s)
-	{
-		switch (s) {
-		case FONT_SIZE_TINY: 
-			return "xx-small";
-		case FONT_SIZE_SCRIPT: 
-			return "x-small";
-		case FONT_SIZE_FOOTNOTE: 
-		case FONT_SIZE_SMALL: 
-			return "small";
-		case FONT_SIZE_NORMAL: 
-			return "medium";
-		case FONT_SIZE_LARGE: 
-			return "large";
-		case FONT_SIZE_LARGER: 
-		case FONT_SIZE_LARGEST: 
-			return "x-large";
-		case FONT_SIZE_HUGE: 
-		case FONT_SIZE_HUGER: 
-			return "xx-large";
-		case FONT_SIZE_INCREASE: 
-			return "larger";
-		case FONT_SIZE_DECREASE: 
-			return "smaller";
-		case FONT_SIZE_IGNORE: 
-		case FONT_SIZE_INHERIT: 
-				break;
-		}	
-		return "";
+string getSizeCSS(FontSize const & s)
+{
+	switch (s) {
+	case FONT_SIZE_TINY:
+		return "xx-small";
+	case FONT_SIZE_SCRIPT:
+		return "x-small";
+	case FONT_SIZE_FOOTNOTE:
+	case FONT_SIZE_SMALL:
+		return "small";
+	case FONT_SIZE_NORMAL:
+		return "medium";
+	case FONT_SIZE_LARGE:
+		return "large";
+	case FONT_SIZE_LARGER:
+	case FONT_SIZE_LARGEST:
+		return "x-large";
+	case FONT_SIZE_HUGE:
+	case FONT_SIZE_HUGER:
+		return "xx-large";
+	case FONT_SIZE_INCREASE:
+		return "larger";
+	case FONT_SIZE_DECREASE:
+		return "smaller";
+	case FONT_SIZE_IGNORE:
+	case FONT_SIZE_INHERIT:
+		break;
 	}
+	return "";
+}
 	
 } // namespace anonymous