X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_charinset.C;h=8f2674bba30fc1e90ddb6f247783962f919b2afe;hb=701b99ecd70ac472aa53c8b2317af44def4f9670;hp=e87f902c42df1f03e5501c3ba96494a61d5a2bdb;hpb=2dabaa33dec0a1fa17c9309e3d6cf029d6a76509;p=lyx.git diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C index e87f902c42..8f2674bba3 100644 --- a/src/mathed/math_charinset.C +++ b/src/mathed/math_charinset.C @@ -1,90 +1,120 @@ -#include +/** + * \file math_charinset.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * + * \author Alejandro Aguilar Sierra + * \author André Pönitz + * + * Full author contact details are available in file CREDITS. + */ -#ifdef __GNUG__ -#pragma implementation -#endif +#include #include "math_charinset.h" -#include "LColor.h" -#include "frontends/Painter.h" -#include "frontends/font_metrics.h" -#include "support/LOstream.h" -#include "debug.h" #include "math_support.h" #include "math_mathmlstream.h" -#include "LaTeXFeatures.h" + +#include "debug.h" +#include "dimension.h" +#include "support/lstrings.h" #include "textpainter.h" -#include -#include +using std::auto_ptr; +extern bool has_math_fonts; -using std::ostream; -using std::endl; +namespace { -#ifndef CXX_GLOBAL_CSTD -using std::strchr; -#endif + bool isBinaryOp(char c) + { + return lyx::support::contains("+-<>=/*", c); + } -bool isBinaryOp(char c, MathTextCodes type) -{ - return type < LM_TC_SYMB && strchr("+-<>=/*", c); -} - + bool slanted(char c) + { + return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z'); + } -MathCharInset::MathCharInset(char c) - : char_(c), code_(nativeCode(c)) -{ -//lyxerr << "creating char '" << char_ << "' with code " << int(code_) << endl; } -MathCharInset::MathCharInset(char c, MathTextCodes t) - : char_(c), code_((t == LM_TC_MIN) ? nativeCode(c) : t) -{ -//lyxerr << "creating char '" << char_ << "' with code " << int(code_) << endl; -} - +MathCharInset::MathCharInset(char c) + : char_(c) +{} -MathTextCodes MathCharInset::nativeCode(char c) -{ - if (isalpha(c)) - return LM_TC_VAR; - //if (strchr("0123456789;:!|[]().,?+/-*<>=", c) - return LM_TC_CONST; -} -MathInset * MathCharInset::clone() const +auto_ptr MathCharInset::doClone() const { - return new MathCharInset(*this); + return auto_ptr(new MathCharInset(*this)); } -void MathCharInset::metrics(MathMetricsInfo const & mi) const +void MathCharInset::metrics(MetricsInfo & mi, Dimension & dim) const { +#if 1 + if (char_ == '=' && has_math_fonts) { + FontSetChanger dummy(mi.base, "cmr"); + mathed_char_dim(mi.base.font, char_, dim); + } else if ((char_ == '>' || char_ == '<') && has_math_fonts) { + FontSetChanger dummy(mi.base, "cmm"); + mathed_char_dim(mi.base.font, char_, dim); + } else if (!slanted(char_) && mi.base.fontname == "mathnormal") { + ShapeChanger dummy(mi.base.font, LyXFont::UP_SHAPE); + mathed_char_dim(mi.base.font, char_, dim); + } else { + mathed_char_dim(mi.base.font, char_, dim); + } + int const em = mathed_char_width(mi.base.font, 'M'); + if (isBinaryOp(char_)) + dim.wid += static_cast(0.5*em+0.5); + else if (char_ == '\'') + dim.wid += static_cast(0.1667*em+0.5); +#else whichFont(font_, code_, mi); - mathed_char_dim(font_, char_, ascent_, descent_, width_); + mathed_char_dim(font_, char_, dim_); if (isBinaryOp(char_, code_)) width_ += 2 * font_metrics::width(' ', font_); -} - - -void MathCharInset::draw(Painter & pain, int x, int y) const -{ - //lyxerr << "drawing '" << char_ << "' code: " << code_ << endl; - if (isBinaryOp(char_, code_)) - x += font_metrics::width(' ', font_); + lyxerr << "MathCharInset::metrics: " << dim << endl; +#endif + width_ = dim.wid; +} + + +void MathCharInset::draw(PainterInfo & pi, int x, int y) const +{ + //lyxerr << "drawing '" << char_ << "' font: " << pi.base.fontname << endl; + int const em = mathed_char_width(pi.base.font, 'M'); + if (isBinaryOp(char_)) + x += static_cast(0.25*em+0.5); + else if (char_ == '\'') + x += static_cast(0.0833*em+0.5); +#if 1 + if (char_ == '=' && has_math_fonts) { + FontSetChanger dummy(pi.base, "cmr"); + pi.draw(x, y, char_); + } else if ((char_ == '>' || char_ == '<') && has_math_fonts) { + FontSetChanger dummy(pi.base, "cmm"); + pi.draw(x, y, char_); + } else if (!slanted(char_) && pi.base.fontname == "mathnormal") { + ShapeChanger dummy(pi.base.font, LyXFont::UP_SHAPE); + pi.draw(x, y, char_); + } else { + pi.draw(x, y, char_); + } +#else drawChar(pain, font_, x, y, char_); +#endif } -void MathCharInset::metricsT(TextMetricsInfo const &) const +void MathCharInset::metricsT(TextMetricsInfo const &, Dimension & dim) const { - width_ = 1; - ascent_ = 1; - descent_ = 0; + dim.wid = 1; + dim.asc = 1; + dim.des = 0; } @@ -95,37 +125,21 @@ void MathCharInset::drawT(TextPainter & pain, int x, int y) const } -void MathCharInset::writeHeader(ostream & os) const -{ - if (math_font_name(code_)) - os << '\\' << math_font_name(code_) << '{'; -} - - -void MathCharInset::writeTrailer(ostream & os) const -{ - if (math_font_name(code_)) - os << '}'; -} - - -void MathCharInset::writeRaw(ostream & os) const +void MathCharInset::write(WriteStream & os) const { os << char_; } -void MathCharInset::write(WriteStream & os) const +void MathCharInset::normalize(NormalStream & os) const { - writeHeader(os.os()); - writeRaw(os.os()); - writeTrailer(os.os()); + os << "[char " << char_ << ' ' << "mathalpha]"; } -void MathCharInset::normalize(NormalStream & os) const +void MathCharInset::octave(OctaveStream & os) const { - os << "[char " << char_ << " " << "mathalpha" << "]"; + os << char_; } @@ -133,25 +147,3 @@ bool MathCharInset::isRelOp() const { return char_ == '=' || char_ == '<' || char_ == '>'; } - - -void MathCharInset::handleFont(MathTextCodes t) -{ - code_ = (code_ == t) ? LM_TC_VAR : t; -} - - -void MathCharInset::validate(LaTeXFeatures & features) const -{ - // Make sure amssymb is put in preamble if Blackboard Bold or - // Fraktur used: - if ((code_ == LM_TC_BB) || (code_ == LM_TC_EUFRAK)) - features.require("amssymb"); -} - - -bool MathCharInset::match(MathInset * p) const -{ - MathCharInset const * q = p->asCharInset(); - return q && char_ == q->char_ && code_ == q->code_; -}