X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathBig.cpp;h=76efc571dbf853dcc03a56e10cc2568a1346a8da;hb=02e82157ec583c3900e359de86be79fac6512387;hp=68203fdf471d26b820675406503024c20943806d;hpb=e64be587367540488a28af59cf82a71cb724d68d;p=lyx.git
diff --git a/src/mathed/InsetMathBig.cpp b/src/mathed/InsetMathBig.cpp
index 68203fdf47..76efc571db 100644
--- a/src/mathed/InsetMathBig.cpp
+++ b/src/mathed/InsetMathBig.cpp
@@ -12,7 +12,9 @@
#include "InsetMathBig.h"
+#include "Dimension.h"
#include "LaTeXFeatures.h"
+
#include "MathSupport.h"
#include "MathStream.h"
#include "MetricsInfo.h"
@@ -47,9 +49,11 @@ InsetMathBig::size_type InsetMathBig::size() const
{
// order: big Big bigg Bigg biggg Biggg
// 0 1 2 3 4 5
+ char_type const c = name_[name_.size() - 1];
+ int const base_size = (c == 'l' || c == 'm' || c == 'r') ? 4 : 3;
return name_[0] == 'B' ?
- 2 * (name_.size() - 4) + 1:
- 2 * (name_.size() - 4);
+ 2 * (name_.size() - base_size) + 1:
+ 2 * (name_.size() - base_size);
}
@@ -65,6 +69,7 @@ double InsetMathBig::increase() const
void InsetMathBig::metrics(MetricsInfo & mi, Dimension & dim) const
{
+ Changer dummy = mi.base.changeEnsureMath();
double const h = theFontMetrics(mi.base.font).ascent('I');
double const f = increase();
dim.wid = 6;
@@ -75,6 +80,7 @@ void InsetMathBig::metrics(MetricsInfo & mi, Dimension & dim) const
void InsetMathBig::draw(PainterInfo & pi, int x, int y) const
{
+ Changer dummy = pi.base.changeEnsureMath();
Dimension const dim = dimension(*pi.base.bv);
// mathed_draw_deco does not use the leading backslash, so remove it
// (but don't use ltrim if this is the backslash delimiter).
@@ -84,7 +90,6 @@ void InsetMathBig::draw(PainterInfo & pi, int x, int y) const
(delim_ == "\\\\") ? from_ascii("\\") : support::ltrim(delim_, "\\");
mathed_draw_deco(pi, x + 1, y - dim.ascent(), 4, dim.height(),
delim);
- setPosCache(pi, x, y);
}
@@ -105,48 +110,9 @@ void InsetMathBig::normalize(NormalStream & os) const
void InsetMathBig::mathmlize(MathStream & os) const
{
- os << "";
- if (delim_ == "(" || delim_ == ")"
- || delim_ == "[" || delim_ == "]"
- || delim_ == "|" || delim_ == "/")
- os << delim_;
- else if (delim_ == "\\{" || delim_ == "\\lbrace")
- os << "{";
- else if (delim_ == "\\}" || delim_ == "\\rbrace")
- os << "}";
- else if (delim_ == "\\slash")
- os << "/";
- else if (delim_ == "\\|" || delim_ == "\\vert")
- os << "|";
- else if (delim_ == "\\Vert")
- os << "∥";
- else if (delim_ == "\\\\" || delim_ == "\\backslash")
- os <<" \\";
- else if (delim_ == "\\langle")
- os << "<";
- else if (delim_ == "\\rangle")
- os << ">";
- else if (delim_ == "\\lceil")
- os << "⌈";
- else if (delim_ == "\\rceil")
- os << "⌉";
- else if (delim_ == "\\lfloor")
- os << "⌊";
- else if (delim_ == "\\rfloor")
- os << "⌋";
- else if (delim_ == "\\downarrow")
- os << "↓";
- else if (delim_ == "\\uparrow")
- os << "↑";
- else if (delim_ == "\\Downarrow")
- os << "⇓";
- else if (delim_ == "\\Uparrow")
- os << "⇑";
- else if (delim_ == "\\updownarrow")
- os << "↕";
- else if (delim_ == "\\Updownarrow")
- os << "⇕";
- os << "";
+ os << ""
+ << convertDelimToXMLEscape(delim_)
+ << "";
}
@@ -159,48 +125,9 @@ void InsetMathBig::htmlize(HtmlStream & os) const
case 4: case 5: name = "biggg"; break;
default: name = "big"; break;
}
- os << MTag("span", "class='" + name + "symbol'");
- if (delim_ == "(" || delim_ == ")"
- || delim_ == "[" || delim_ == "]"
- || delim_ == "|" || delim_ == "/")
- os << delim_;
- else if (delim_ == "\\{" || delim_ == "\\lbrace")
- os << "{";
- else if (delim_ == "\\}" || delim_ == "\\rbrace")
- os << "}";
- else if (delim_ == "\\slash")
- os << "/";
- else if (delim_ == "\\|" || delim_ == "\\vert")
- os << "|";
- else if (delim_ == "\\Vert")
- os << "∥";
- else if (delim_ == "\\\\" || delim_ == "\\backslash")
- os <<" \\";
- else if (delim_ == "\\langle")
- os << "<";
- else if (delim_ == "\\rangle")
- os << ">";
- else if (delim_ == "\\lceil")
- os << "⌈";
- else if (delim_ == "\\rceil")
- os << "⌉";
- else if (delim_ == "\\lfloor")
- os << "⌊";
- else if (delim_ == "\\rfloor")
- os << "⌋";
- else if (delim_ == "\\downarrow")
- os << "↓";
- else if (delim_ == "\\uparrow")
- os << "↑";
- else if (delim_ == "\\Downarrow")
- os << "⇓";
- else if (delim_ == "\\Uparrow")
- os << "⇑";
- else if (delim_ == "\\updownarrow")
- os << "↕";
- else if (delim_ == "\\Updownarrow")
- os << "⇕";
- os << ETag("span");
+ os << MTag("span", "class='" + name + "symbol'")
+ << convertDelimToXMLEscape(delim_)
+ << ETag("span");
}
@@ -216,7 +143,7 @@ bool InsetMathBig::isBigInsetDelim(docstring const & delim)
static char const * const delimiters[] = {
"(", ")", "\\{", "\\}", "\\lbrace", "\\rbrace", "[", "]",
"|", "/", "\\slash", "\\|", "\\vert", "\\Vert", "'",
- "\\\\", "\\backslash",
+ "<", ">", "\\\\", "\\backslash",
"\\langle", "\\lceil", "\\lfloor",
"\\rangle", "\\rceil", "\\rfloor",
"\\downarrow", "\\Downarrow",
@@ -229,12 +156,11 @@ bool InsetMathBig::isBigInsetDelim(docstring const & delim)
void InsetMathBig::validate(LaTeXFeatures & features) const
{
- if (features.runparams().flavor == OutputParams::HTML)
- features.addPreambleSnippet("");
+ "span.bigggsymbol{font-size: 225%;}");
}