anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix XHTML output for fractions and fix a crash reported on the list

Browse Source 
by Jan Paul Imhoff. The problem was that we were assuming (as we still
do in some places) that there are always at least two cells.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38717 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2011-05-12 13:16:36 +00:00
parent e6ad9489cf
commit d7de1f2a1e
1 changed files with 99 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/mathed/InsetMathFrac.cpp
View File

@ -366,18 +366,21 @@ bool InsetMathFrac::extraBraces() const
} }
// FIXME This will crash on unitone and is wrong in other cases.
void InsetMathFrac::maple(MapleStream & os) const void InsetMathFrac::maple(MapleStream & os) const
{ {
os << '(' << cell(0) << ")/(" << cell(1) << ')'; os << '(' << cell(0) << ")/(" << cell(1) << ')';
} }
// FIXME This will crash on unitone and is wrong in other cases.
void InsetMathFrac::mathematica(MathematicaStream & os) const void InsetMathFrac::mathematica(MathematicaStream & os) const
{ {
os << '(' << cell(0) << ")/(" << cell(1) << ')'; os << '(' << cell(0) << ")/(" << cell(1) << ')';
} }
// FIXME This will crash on unitone and is wrong in other cases.
void InsetMathFrac::octave(OctaveStream & os) const void InsetMathFrac::octave(OctaveStream & os) const
{ {
os << '(' << cell(0) << ")/(" << cell(1) << ')'; os << '(' << cell(0) << ")/(" << cell(1) << ')';
@ -386,19 +389,107 @@ void InsetMathFrac::octave(OctaveStream & os) const
void InsetMathFrac::mathmlize(MathStream & os) const void InsetMathFrac::mathmlize(MathStream & os) const
{ {
os << MTag("mfrac") switch (kind_) {
<< MTag("mrow") << cell(0) << ETag("mrow") case ATOP:
<< MTag("mrow") << cell(1) << ETag("mrow") os << MTag("mfrac", "linethickeness='0'")
<< ETag("mfrac"); << MTag("mrow") << cell(0) << ETag("mrow")
<< MTag("mrow") << cell(1) << ETag("mrow")
<< ETag("mfrac");
break;
// we do not presently distinguish these
case OVER:
case FRAC:
case DFRAC:
case TFRAC:
case CFRAC:
case CFRACLEFT:
case CFRACRIGHT:
os << MTag("mfrac")
<< MTag("mrow") << cell(0) << ETag("mrow")
<< MTag("mrow") << cell(1) << ETag("mrow")
<< ETag("mfrac");
break;
case NICEFRAC:
os << MTag("mfrac", "bevelled='true'")
<< MTag("mrow") << cell(0) << ETag("mrow")
<< MTag("mrow") << cell(1) << ETag("mrow")
<< ETag("mfrac");
break;
case UNITFRAC:
if (nargs() == 3)
os << cell(2);
os << MTag("mfrac", "bevelled='true'")
<< MTag("mrow") << cell(0) << ETag("mrow")
<< MTag("mrow") << cell(1) << ETag("mrow")
<< ETag("mfrac");
break;
case UNIT:
// FIXME This is not right, because we still output mi, etc,
// when we output the cell. So we need to prevent that somehow.
if (nargs() == 2)
os << cell(0)
<< MTag("mstyle mathvariant='normal'")
<< cell(1)
<< ETag("mstyle");
else
os << MTag("mstyle mathvariant='normal'")
<< cell(0)
<< ETag("mstyle");
}
} }
void InsetMathFrac::htmlize(HtmlStream & os) const void InsetMathFrac::htmlize(HtmlStream & os) const
{ {
os << MTag("span", "class='frac'") switch (kind_) {
<< MTag("span", "class='numer'") << cell(0) << ETag("span") case ATOP:
<< MTag("span", "class='denom'") << cell(1) << ETag("span") os << MTag("span", "class='frac'")
<< ETag("span"); << MTag("span", "class='numer'") << cell(0) << ETag("span")
<< MTag("span", "class='numer'") << cell(1) << ETag("span")
<< ETag("span");
break;
// we do not presently distinguish these
case OVER:
case FRAC:
case DFRAC:
case TFRAC:
case CFRAC:
case CFRACLEFT:
case CFRACRIGHT:
os << MTag("span", "class='frac'")
<< MTag("span", "class='numer'") << cell(0) << ETag("span")
<< MTag("span", "class='denom'") << cell(1) << ETag("span")
<< ETag("span");
break;
case NICEFRAC:
os << cell(0) << '/' << cell(1);
break;
case UNITFRAC:
if (nargs() == 3)
os << cell(2) << ' ';
os << cell(0) << '/' << cell(1);
break;
case UNIT:
// FIXME This is not right, because we still output i, etc,
// when we output the cell. So we need to prevent that somehow.
if (nargs() == 2)
os << cell(0)
<< MTag("span")
<< cell(1)
<< ETag("span");
else
os << MTag("span")
<< cell(0)
<< ETag("span");
}
} }