X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathBig.cpp;h=969dd472c72fd5e512df6675cd30cda043952037;hb=61448d8cb2e922a9a891817a114c76c687be4811;hp=3c5950b69ced2c96e2a306d2e301df0aba9f4f5b;hpb=897436efbb9bd641b61467d185a2dfae9839e575;p=lyx.git diff --git a/src/mathed/InsetMathBig.cpp b/src/mathed/InsetMathBig.cpp index 3c5950b69c..969dd472c7 100644 --- a/src/mathed/InsetMathBig.cpp +++ b/src/mathed/InsetMathBig.cpp @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author André Pönitz + * \author André Pönitz * * Full author contact details are available in file CREDITS. */ @@ -11,19 +11,20 @@ #include #include "InsetMathBig.h" + +#include "LaTeXFeatures.h" #include "MathSupport.h" #include "MathStream.h" -#include "MathStream.h" +#include "MetricsInfo.h" #include "frontends/FontMetrics.h" +#include "support/docstream.h" #include "support/lstrings.h" namespace lyx { -using std::auto_ptr; - InsetMathBig::InsetMathBig(docstring const & name, docstring const & delim) : name_(name), delim_(delim) @@ -36,9 +37,9 @@ docstring InsetMathBig::name() const } -auto_ptr InsetMathBig::doClone() const +Inset * InsetMathBig::clone() const { - return auto_ptr(new InsetMathBig(*this)); + return new InsetMathBig(*this); } @@ -46,9 +47,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); } @@ -62,29 +65,26 @@ double InsetMathBig::increase() const } -bool InsetMathBig::metrics(MetricsInfo & mi, Dimension & dim) const +void InsetMathBig::metrics(MetricsInfo & mi, Dimension & dim) const { double const h = theFontMetrics(mi.base.font).ascent('I'); double const f = increase(); dim.wid = 6; dim.asc = int(h + f * h); dim.des = int(f * h); - if (dim_ == dim) - return false; - dim_ = dim; - return true; } void InsetMathBig::draw(PainterInfo & pi, int x, int y) const { + 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). // Replace \| by \Vert (equivalent in LaTeX), since mathed_draw_deco // would treat it as |. docstring const delim = (delim_ == "\\|") ? from_ascii("Vert") : (delim_ == "\\\\") ? from_ascii("\\") : support::ltrim(delim_, "\\"); - mathed_draw_deco(pi, x + 1, y - dim_.ascent(), 4, dim_.height(), + mathed_draw_deco(pi, x + 1, y - dim.ascent(), 4, dim.height(), delim); setPosCache(pi, x, y); } @@ -92,6 +92,7 @@ void InsetMathBig::draw(PainterInfo & pi, int x, int y) const void InsetMathBig::write(WriteStream & os) const { + MathEnsurer ensurer(os); os << '\\' << name_ << delim_; if (delim_[0] == '\\') os.pendingSpace(true); @@ -104,6 +105,107 @@ 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 << ""; +} + + +void InsetMathBig::htmlize(HtmlStream & os) const +{ + std::string name; + switch (size()) { + case 0: case 1: name = "big"; break; + case 2: case 3: name = "bigg"; break; + 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"); +} + + void InsetMathBig::infoize2(odocstream & os) const { os << name_; @@ -116,7 +218,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", @@ -127,4 +229,14 @@ bool InsetMathBig::isBigInsetDelim(docstring const & delim) } +void InsetMathBig::validate(LaTeXFeatures & features) const +{ + if (features.runparams().math_flavor == OutputParams::MathAsHTML) + features.addCSSSnippet( + "span.bigsymbol{font-size: 150%;}\n" + "span.biggsymbol{font-size: 200%;}\n" + "span.bigggsymbol{font-size: 225%;}"); +} + + } // namespace lyx