#include "InsetMathXYMatrix.h"
#include "InsetMathDiagram.h"
#include "MacroTable.h"
-#include "MathMacro.h"
-#include "MathMacroArgument.h"
+#include "InsetMathMacro.h"
+#include "InsetMathMacroArgument.h"
#include "MathParser.h"
#include "MathStream.h"
#include "MathSupport.h"
#include "Buffer.h"
#include "BufferParams.h"
#include "Encoding.h"
+#include "FontInfo.h"
#include "LyX.h" // use_gui
-#include "OutputParams.h"
#include <iomanip>
}
ifstream fs(filename.toFilesystemEncoding().c_str());
+ // limit the size of strings we read to avoid memory problems
+ fs >> setw(65636);
string line;
bool skip = false;
while (getline(fs, line)) {
int charid = 0;
+ int dsp_charid = 0;
int fallbackid = 0;
if (line.empty() || line[0] == '#')
continue;
// special case of iffont/else/endif
if (line.size() >= 7 && line.substr(0, 6) == "iffont") {
istringstream is(line);
+ // limit the size of strings we read to avoid memory problems
+ is >> setw(65636);
string tmp;
is >> tmp;
is >> tmp;
// or
// \def\macroname{definition} requires
// or
- // \def\macroname{definition} extra xmlname requires
+ // \def\macroname{definition} extra htmlname xmlname requires
istringstream is(line);
string macro;
- string requires;
+ string required;
string extra;
+ string htmlname;
string xmlname;
bool hidden = false;
- is >> setw(65536) >> macro >> requires;
- if ((is >> xmlname)) {
- extra = requires;
- if (!(is >> requires))
- requires = "";
+ is >> setw(65536) >> macro >> required;
+ if ((is >> htmlname >> xmlname)) {
+ extra = required;
+ if (!(is >> required))
+ required = "";
} else
- xmlname = "";
+ htmlname = xmlname = "";
MacroTable::iterator it = MacroTable::globalMacros().insert(
- 0, from_utf8(macro));
- if (!extra.empty() || !xmlname.empty() || !requires.empty()) {
+ nullptr, from_utf8(macro));
+ if (!extra.empty() || !htmlname.empty() || !xmlname.empty() || !required.empty()) {
MathWordList::iterator wit = theMathWordList.find(it->first);
if (wit != theMathWordList.end())
LYXERR(Debug::MATHED, "readSymbols: inset "
tmp.inset = "macro";
tmp.name = it->first;
tmp.extra = from_utf8(extra);
+ tmp.htmlname = from_utf8(htmlname);
tmp.xmlname = from_utf8(xmlname);
- if (requires == "hiddensymbol") {
- requires = "";
+ if (required == "hiddensymbol") {
+ required = "";
tmp.hidden = hidden = true;
} else
- tmp.requires = requires;
+ tmp.required = required;
theMathWordList[it->first] = tmp;
wit = theMathWordList.find(it->first);
it->second.setSymbol(&(wit->second));
// If you change the following output, please adjust
// development/tools/generate_symbols_images.py.
LYXERR(Debug::MATHED, "read symbol '" << to_utf8(it->first)
- << " inset: macro"
- << " draw: 0"
- << " extra: " << extra
- << " xml: " << xmlname
- << " requires: " << requires
+ << " inset: macro"
+ << " draw: 0"
+ << " extra: " << extra
+ << " html: " << htmlname
+ << " xml: " << xmlname
+ << " requires: " << required
<< " hidden: " << hidden << '\'');
continue;
}
docstring help;
is >> tmp.name >> help;
tmp.inset = to_ascii(help);
- if (isFontName(tmp.inset))
- is >> charid >> fallbackid >> tmp.extra >> tmp.xmlname;
- else
+ if (isFontName(tmp.inset)) {
+ is >> help >> fallbackid >> tmp.extra >> tmp.htmlname >> tmp.xmlname;
+ docstring cid, dsp_cid;
+ idocstringstream is2(subst(help, '|', ' '));
+ is2 >> charid >> dsp_charid;
+ } else
is >> tmp.extra;
// requires is optional
if (is) {
if ((is >> help)) {
// backward compatibility
if (help == "esintoramsmath")
- tmp.requires = "esint|amsmath";
+ tmp.required = "esint|amsmath";
else
- tmp.requires = to_ascii(help);
+ tmp.required = to_ascii(help);
}
} else {
LYXERR(Debug::MATHED, "skipping line '" << line << "'\n"
// create fallbacks if necessary
// store requirements as long as we can
- if (tmp.requires.empty()) {
+ if (tmp.required.empty()) {
if (tmp.inset == "msa" || tmp.inset == "msb")
- tmp.requires = "amssymb";
+ tmp.required = "amssymb";
else if (tmp.inset == "wasy")
- tmp.requires = "wasysym";
+ tmp.required = "wasysym";
else if (tmp.inset == "mathscr")
- tmp.requires = "mathrsfs";
+ tmp.required = "mathrsfs";
+ else if (tmp.inset == "mathds")
+ tmp.required = "dsfont";
}
// symbol font is not available sometimes
} else if (isMathFontAvailable(tmp.inset) && canBeDisplayed(charid)) {
LYXERR(Debug::MATHED, "symbol available for " << to_utf8(tmp.name));
tmp.draw.push_back(char_type(charid));
+ if (dsp_charid && canBeDisplayed(dsp_charid)) {
+ LYXERR(Debug::MATHED, "large symbol available for " << to_utf8(tmp.name));
+ tmp.dsp_draw.push_back(char_type(dsp_charid));
+ }
} else if (fallbackid && isMathFontAvailable(symbol_font) &&
canBeDisplayed(fallbackid)) {
if (tmp.inset == "cmex")
<< " used for " << to_utf8(tmp.name));
}
- if (tmp.requires == "hiddensymbol")
+ if (tmp.required == "hiddensymbol")
{
- tmp.requires = "";
+ tmp.required = "";
tmp.hidden = true;
}
<< " inset: " << tmp.inset
<< " draw: " << int(tmp.draw.empty() ? 0 : tmp.draw[0])
<< " extra: " << to_utf8(tmp.extra)
+ << " html: " << to_utf8(tmp.htmlname)
<< " xml: " << to_utf8(tmp.xmlname)
- << " requires: " << tmp.requires
+ << " requires: " << tmp.required
<< " hidden: " << tmp.hidden << '\'');
}
string tmp = "cmm";
}
-} // namespace anon
+} // namespace
MathWordList const & mathedWordList()
{
}
-bool ensureMath(WriteStream & os, bool needs_mathmode, bool macro,
+bool ensureMath(TeXMathStream & os, bool needs_mathmode, bool macro,
bool textmode_macro)
{
bool brace = os.pendingBrace();
}
os.textMode(true);
} else if (macro && brace && !needs_mathmode && !textmode_macro) {
- // This is a user defined macro, not a MathMacro, so we
+ // This is a user defined macro, not a InsetMathMacro, so we
// cannot be sure what mode is needed. We leave it in the
// same environment it was entered by closing either \lyxmathsym
// or \ensuremath, whichever was opened.
}
-int ensureMode(WriteStream & os, InsetMath::mode_type mode,
- bool locked, bool ascii)
+int ensureMode(TeXMathStream & os, InsetMath::mode_type mode,
+ bool locked, bool ascii)
{
bool textmode = mode == InsetMath::TEXT_MODE;
if (os.latex() && textmode && os.pendingBrace()) {
{
MathWordList::iterator it = theMathWordList.find(str);
if (it == theMathWordList.end())
- return 0;
+ return nullptr;
if (it->second.inset == "macro")
- return 0;
+ return nullptr;
return &(it->second);
}
//lyxerr << "creating inset with name: '" << to_utf8(s) << '\'' << endl;
if ((s == "ce" || s == "cf") && buf
&& buf->params().use_package("mhchem") == BufferParams::package_off)
- return MathAtom(new MathMacro(buf, s));
+ return MathAtom(new InsetMathMacro(buf, s));
latexkeys const * l = in_word_set(s);
if (l) {
}
if (s.size() == 2 && s[0] == '#' && s[1] >= '1' && s[1] <= '9')
- return MathAtom(new MathMacroArgument(s[1] - '0'));
+ return MathAtom(new InsetMathMacroArgument(s[1] - '0'));
if (s.size() == 3 && s[0] == '\\' && s[1] == '#'
&& s[2] >= '1' && s[2] <= '9')
- return MathAtom(new MathMacroArgument(s[2] - '0'));
+ return MathAtom(new InsetMathMacroArgument(s[2] - '0'));
if (s == "boxed")
return MathAtom(new InsetMathBoxed(buf));
if (s == "fbox")
return MathAtom(new InsetMathFrac(buf, InsetMathFrac::CFRACLEFT));
if (s == "cfracright")
return MathAtom(new InsetMathFrac(buf, InsetMathFrac::CFRACRIGHT));
+ if (s == "case") // TODO: only if class is aastex(6|62)
+ return MathAtom(new InsetMathFrac(buf, InsetMathFrac::AASTEX_CASE));
//if (s == "infer")
// return MathAtom(new MathInferInset);
if (s == "atop")
if (s == "regexp")
return MathAtom(new InsetMathHull(buf, hullRegexp));
- return MathAtom(new MathMacro(buf, s));
+ return MathAtom(new InsetMathMacro(buf, s));
}
}
-bool isAsciiOrMathAlpha(char_type c)
-{
- return isASCII(c) || Encodings::isMathAlpha(c);
-}
-
-
} // namespace lyx
projects / lyx.git / blobdiff