anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Since LyX uses "INHERIT" as a default, we do not want it for HTML.

Browse Source 
Also reformat things.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31764 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-10-27 13:27:26 +00:00
parent 66fb89d976
commit 1d9b4956c3
1 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/FontInfo.cpp
View File

@ -336,11 +336,25 @@ namespace {
string getFamilyCSS(FontFamily const & f)
{
switch (f) {
case ROMAN_FAMILY: return "serif";
case SANS_FAMILY: return "sans-serif";
case TYPEWRITER_FAMILY: return "monospace";
case INHERIT_FAMILY: return "inherit";
default: break;
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 WASY_FAMILY:
case ESINT_FAMILY:
case INHERIT_FAMILY:
case IGNORE_FAMILY:
break;
}
return "";
}
@ -349,10 +363,13 @@ namespace {
string getSeriesCSS(FontSeries const & s)
{
switch (s) {
case MEDIUM_SERIES: return "normal";
case BOLD_SERIES: return "bold";
case INHERIT_SERIES: return "inherit";
default: break;
case MEDIUM_SERIES:
return "normal";
case BOLD_SERIES:
return "bold";
case INHERIT_SERIES:
case IGNORE_SERIES:
break;
}
return "";
}
@ -367,8 +384,9 @@ namespace {
case ITALIC_SHAPE: fs = "italic"; break;
case SLANTED_SHAPE: fs = "oblique"; break;
case SMALLCAPS_SHAPE: fv = "small-caps"; break;
case INHERIT_SHAPE: fs = "inherit"; fv = "inherit"; break;
case IGNORE_SHAPE: fs = ""; fv = ""; break;
case IGNORE_SHAPE:
case INHERIT_SHAPE:
fs = ""; fv = ""; break;
}
string retval;
if (!fs.empty())
@ -382,22 +400,31 @@ namespace {
string getSizeCSS(FontSize const & s)
{
switch (s) {
case FONT_SIZE_TINY: return "xx-small";
case FONT_SIZE_SCRIPT: return "x-small";
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_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_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_INHERIT: return "inherit";
case FONT_SIZE_IGNORE: return "";
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;
}
// squash warning
return "";
}