#include "Buffer.h"
#include "BufferParams.h"
#include "Encoding.h"
+#include "FontInfo.h"
#include "LyX.h" // use_gui
-#include "OutputParams.h"
#include <iomanip>
bool skip = false;
while (getline(fs, line)) {
int charid = 0;
+ int dsp_charid = 0;
int fallbackid = 0;
if (line.empty() || line[0] == '#')
continue;
// or
// \def\macroname{definition} requires
// or
- // \def\macroname{definition} extra htmlname requires
+ // \def\macroname{definition} extra htmlname xmlname requires
istringstream is(line);
string macro;
string required;
string extra;
string htmlname;
+ string xmlname;
bool hidden = false;
is >> setw(65536) >> macro >> required;
- if ((is >> htmlname)) {
+ if ((is >> htmlname >> xmlname)) {
extra = required;
if (!(is >> required))
required = "";
} else
- htmlname = "";
+ htmlname = xmlname = "";
MacroTable::iterator it = MacroTable::globalMacros().insert(
- 0, from_utf8(macro));
- if (!extra.empty() || !htmlname.empty() || !required.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.name = it->first;
tmp.extra = from_utf8(extra);
tmp.htmlname = from_utf8(htmlname);
+ tmp.xmlname = from_utf8(xmlname);
if (required == "hiddensymbol") {
required = "";
tmp.hidden = hidden = true;
<< " 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.htmlname >> 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) {
} 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")
}
-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();
}
-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);
}
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")