* 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.
*/
#include "InsetMathColor.h"
#include "InsetMathDecoration.h"
#include "InsetMathDots.h"
+#include "InsetMathEnsureMath.h"
#include "InsetMathFont.h"
#include "InsetMathFontOld.h"
#include "InsetMathFrac.h"
#include "InsetMathRoot.h"
#include "InsetMathSize.h"
#include "InsetMathSpace.h"
+#include "InsetMathSpecialChar.h"
#include "InsetMathSplit.h"
#include "InsetMathSqrt.h"
#include "InsetMathStackrel.h"
#include "InsetMathTabular.h"
#include "InsetMathUnderset.h"
#include "InsetMathUnknown.h"
+#include "InsetMathHull.h"
#include "InsetMathXArrow.h"
#include "InsetMathXYMatrix.h"
#include "MacroTable.h"
#include "MathMacro.h"
#include "MathMacroArgument.h"
#include "MathParser.h"
+#include "MathStream.h"
#include "MathSupport.h"
#include "insets/InsetCommand.h"
+#include "insets/InsetSpace.h"
#include "support/debug.h"
#include "support/docstream.h"
#include "frontends/FontLoader.h"
+#include "Encoding.h"
#include "LyX.h" // use_gui
+#include "OutputParams.h"
using namespace std;
using namespace lyx::support;
MathWordList theWordList;
-bool math_font_available(docstring & name)
+bool isMathFontAvailable(docstring & name)
{
+ if (!use_gui)
+ return false;
+
FontInfo f;
augmentFont(f, name);
void initSymbols()
{
- if (!use_gui)
- return;
-
FileName const filename = libFileSearch(string(), "symbols");
LYXERR(Debug::MATHED, "read symbols from " << filename);
if (filename.empty()) {
is >> tmp;
is >> tmp;
docstring t = from_utf8(tmp);
- skip = !math_font_available(t);
+ skip = !isMathFontAvailable(t);
continue;
} else if (line.size() >= 4 && line.substr(0, 4) == "else") {
skip = !skip;
if (tmp.extra == "func" || tmp.extra == "funclim" || tmp.extra == "special") {
LYXERR(Debug::MATHED, "symbol abuse for " << to_utf8(tmp.name));
tmp.draw = tmp.name;
- } else if (math_font_available(tmp.inset)) {
+ } else if (isMathFontAvailable(tmp.inset)) {
LYXERR(Debug::MATHED, "symbol available for " << to_utf8(tmp.name));
tmp.draw.push_back(char_type(charid));
- } else if (fallbackid && math_font_available(symbol_font)) {
+ } else if (fallbackid && isMathFontAvailable(symbol_font)) {
if (tmp.inset == "cmex")
tmp.inset = from_ascii("lyxsymbol");
else
}
docstring tmp = from_ascii("cmm");
docstring tmp2 = from_ascii("cmsy");
- has_math_fonts = math_font_available(tmp) && math_font_available(tmp2);
+ has_math_fonts = isMathFontAvailable(tmp) && isMathFontAvailable(tmp2);
+}
+
+
+bool isSpecialChar(docstring const & name)
+{
+ if (name.size() != 1)
+ return name == "textasciicircum" || name == "mathcircumflex" ||
+ name == "textasciitilde" || name == "textbackslash";
+
+ char_type const c = name.at(0);
+ return c == '{' || c == '}' || c == '&' || c == '$' ||
+ c == '#' || c == '%' || c == '_' || c == ' ';
}
}
+bool ensureMath(WriteStream & os, bool needs_math_mode, bool macro)
+{
+ bool brace = os.pendingBrace();
+ os.pendingBrace(false);
+ if (!os.latex())
+ return brace;
+ if (os.textMode() && needs_math_mode) {
+ os << "\\ensuremath{";
+ os.textMode(false);
+ brace = true;
+ } else if (macro && brace && !needs_math_mode) {
+ // This is a user defined macro, but not a MathMacro, so we
+ // cannot be sure what mode is needed. As it was entered in
+ // a text box, we restore the text mode.
+ os << '}';
+ os.textMode(true);
+ brace = false;
+ }
+ return brace;
+}
+
+
+bool ensureMode(WriteStream & os, InsetMath::mode_type mode)
+{
+ bool textmode = mode == InsetMath::TEXT_MODE;
+ if (os.latex() && textmode && os.pendingBrace()) {
+ os.os() << '}';
+ os.pendingBrace(false);
+ os.pendingSpace(false);
+ os.textMode(true);
+ }
+ bool oldmode = os.textMode();
+ os.textMode(textmode);
+ return oldmode;
+}
+
+
latexkeys const * in_word_set(docstring const & str)
{
MathWordList::iterator it = theWordList.find(str);
if (inset == "decoration")
return MathAtom(new InsetMathDecoration(l));
if (inset == "space")
- return MathAtom(new InsetMathSpace(l->name));
+ return MathAtom(new InsetMathSpace(to_ascii(l->name), ""));
if (inset == "dots")
return MathAtom(new InsetMathDots(l));
if (inset == "mbox")
if (s == "fbox")
return MathAtom(new InsetMathFBox());
if (s == "framebox")
- return MathAtom(new InsetMathFrameBox);
+ return MathAtom(new InsetMathMakebox(true));
if (s == "makebox")
- return MathAtom(new InsetMathMakebox);
+ return MathAtom(new InsetMathMakebox(false));
if (s == "kern")
return MathAtom(new InsetMathKern);
if (s.substr(0, 8) == "xymatrix") {
return MathAtom(new InsetMathTabular(s, 1, 1));
if (s == "stackrel")
return MathAtom(new InsetMathStackrel);
- if (s == "binom" || s == "choose")
- return MathAtom(new InsetMathBinom(s == "choose"));
+ if (s == "binom")
+ return MathAtom(new InsetMathBinom(InsetMathBinom::BINOM));
+ if (s == "choose")
+ return MathAtom(new InsetMathBinom(InsetMathBinom::CHOOSE));
+ if (s == "brace")
+ return MathAtom(new InsetMathBinom(InsetMathBinom::BRACE));
+ if (s == "brack")
+ return MathAtom(new InsetMathBinom(InsetMathBinom::BRACK));
if (s == "frac")
return MathAtom(new InsetMathFrac);
if (s == "over")
if (s == "lefteqn")
return MathAtom(new InsetMathLefteqn);
if (s == "boldsymbol")
- return MathAtom(new InsetMathBoldSymbol);
+ return MathAtom(new InsetMathBoldSymbol(InsetMathBoldSymbol::AMS_BOLD));
+ if (s == "bm")
+ return MathAtom(new InsetMathBoldSymbol(InsetMathBoldSymbol::BM_BOLD));
+ if (s == "heavysymbol" || s == "hm")
+ return MathAtom(new InsetMathBoldSymbol(InsetMathBoldSymbol::BM_HEAVY));
if (s == "color" || s == "normalcolor")
return MathAtom(new InsetMathColor(true));
if (s == "textcolor")
return MathAtom(new InsetMathColor(false));
+ if (s == "cfrac")
+ return MathAtom(new InsetMathCFrac);
if (s == "dfrac")
return MathAtom(new InsetMathDFrac);
if (s == "tfrac")
return MathAtom(new InsetMathPhantom(InsetMathPhantom::phantom));
if (s == "vphantom")
return MathAtom(new InsetMathPhantom(InsetMathPhantom::vphantom));
+ if (s == "ensuremath")
+ return MathAtom(new InsetMathEnsureMath);
+ if (isSpecialChar(s))
+ return MathAtom(new InsetMathSpecialChar(s));
+
+ if (s == "regexp")
+ return MathAtom(new InsetMathHull(hullRegexp));
return MathAtom(new MathMacro(s));
}
docstring name;
docstring body = split(str, name, ' ');
- if (name != "ref" )
+ if (name == "ref") {
+ InsetCommandParams icp(REF_CODE);
+ // FIXME UNICODE
+ InsetCommand::string2params("ref", to_utf8(str), icp);
+ mathed_parse_cell(ar, icp.getCommand());
+ } else if (name == "mathspace") {
+ InsetSpaceParams isp(true);
+ InsetSpace::string2params(to_utf8(str), isp);
+ InsetSpace is(isp);
+ odocstringstream os;
+ Encoding const * const ascii = encodings.fromLyXName("ascii");
+ OutputParams op(ascii);
+ is.latex(os, op);
+ mathed_parse_cell(ar, os.str());
+ if (ar.size() == 2) {
+ // remove "{}"
+ if (ar[1].nucleus()->asBraceInset())
+ ar.pop_back();
+ }
+ } else
return false;
- InsetCommandParams icp(REF_CODE);
- // FIXME UNICODE
- InsetCommandMailer::string2params("ref", to_utf8(str), icp);
- mathed_parse_cell(ar, icp.getCommand());
if (ar.size() != 1)
return false;
projects / lyx.git / blobdiff