:\n \\image html jkqtmathtext/symbols/"<"<:\n ";
+ for (int i=0; i< listsymbolsfonts.size(); i++) {
+ if (i>0) fileList<<" ";
+
+ fileList<<"\\image html jkqtmathtext/symbols/"<\n \n";
//}
@@ -202,10 +222,20 @@ int main(int argc, char* argv[])
if (ch.isUpper()) symbol_lower+=QString(2, ch).toLower();
else symbol_lower+=ch;
}
- latex.append("\\"+symbol+"\\vphantom{Iq}");
- outputFilename.append("jkqtmathtext_symbols_"+symbol_lower+".png");
- cmdoptions.append(QMap());
- fileList<<" \\\\"<:\n \\image html jkqtmathtext/symbols/"< localoptions;
+ localoptions["fontmathroman"]=fnt;
+ cmdoptions.append(localoptions);
+ }
+ fileList<<" \\\\"<:\n";
+ fileList<<" ";
+ for (int i=0; i< listsymbolsfonts.size(); i++) {
+ if (i>0) fileList<<" ";
+
+ fileList<<"\\image html jkqtmathtext/symbols/"<\n \n";
}
@@ -232,18 +262,30 @@ int main(int argc, char* argv[])
else symbol_lower+=ch;
}
static QSet specialSymbols=QSet()<<"lim"<<"liminf"<<"limsup"<<"arg"<<"argmin"<<"argmax";
+ QString code="";
if (JKQTMathTextSymbolNode::getSymbolLength(symbol)>1 && !specialSymbols.contains(symbol)) {
- latex.append("$\\"+symbol+"(\\cdot)$\\vphantom{Iq}");
+ code="$\\"+symbol+"(\\cdot)$";
} else {
if (JKQTMathTextSymbolNode::getSymbolLength(symbol)>1) {
- latex.append("$\\"+symbol+"\\limits_{x\\rightarrow\\infty}f(x)$\\vphantom{Iq}");
+ code="$\\"+symbol+"\\limits_{x\\rightarrow\\infty}f(x)$";
} else {
- latex.append("$\\"+symbol+"\\limits_{x=0}^\\infty f(x)$\\vphantom{Iq}");
+ code="$\\"+symbol+"\\limits_{x=0}^\\infty f(x)$";
}
}
- outputFilename.append("jkqtmathtext_symbols_"+symbol_lower+".png");
- cmdoptions.append(QMap());
- fileList<<" \\\\"<:\n \\image html jkqtmathtext/symbols/"< localoptions;
+ localoptions["fontmathroman"]=fnt;
+ cmdoptions.append(localoptions);
+ }
+ fileList<<" \\\\"<:\n";
+ fileList<<" ";
+ for (int i=0; i< listsymbolsfonts.size(); i++) {
+ if (i>0) fileList<<" ";
+
+ fileList<<"\\image html jkqtmathtext/symbols/"<\n \n";
}
@@ -269,10 +311,20 @@ int main(int argc, char* argv[])
if (ch.isUpper()) symbol_lower+=QString(2, ch).toLower();
else symbol_lower+=ch;
}
- latex.append("$\\"+symbol+"(\\cdot)$\\vphantom{Iq}");
- outputFilename.append("jkqtmathtext_symbols_"+symbol_lower+".png");
- cmdoptions.append(QMap());
- fileList<<" \\\\"<:\n \\image html jkqtmathtext/symbols/"< localoptions;
+ localoptions["fontmathroman"]=fnt;
+ cmdoptions.append(localoptions);
+ }
+ fileList<<" \\\\"<:\n";
+ fileList<<" ";
+ for (int i=0; i< listsymbolsfonts.size(); i++) {
+ if (i>0) fileList<<" ";
+
+ fileList<<"\\image html jkqtmathtext/symbols/"<\n \n";
}
@@ -301,13 +353,20 @@ int main(int argc, char* argv[])
else symbol_lower+=ch;
}
const QString code="\\"+symbol+"\\vphantom{Iq}";
- const QString filename="jkqtmathtext_symbols_"+symbol_lower+".png";
- if (!latex.contains(code) || !outputFilename.contains(filename)) {
- latex.append(code);
- outputFilename.append(filename);
- cmdoptions.append(QMap());
+ for (const QString& fnt: listsymbolsfonts) {
+ latex.append(code+"\\vphantom{Iq}");
+ outputFilename.append("jkqtmathtext_greek_"+symbol_lower+"_"+fnt+".png");
+ QMap localoptions;
+ localoptions["fontmathroman"]=fnt;
+ cmdoptions.append(localoptions);
+ }
+ fileList<<" \\\\"<:\n";
+ fileList<<" ";
+ for (int i=0; i< listsymbolsfonts.size(); i++) {
+ if (i>0) fileList<<" ";
+
+ fileList<<"\\image html jkqtmathtext/symbols/"<\\\\"<:\n \\image html jkqtmathtext/symbols/"<\n \n";
}
@@ -434,10 +493,14 @@ int main(int argc, char* argv[])
QString fontFraktur=parser.value(fontFrakturOption);
QString fontCaligraphic=parser.value(fontcaligraphicOption);
JKQTMathTextBlackboradDrawingMode fontBlackboardMode=String2JKQTMathTextBlackboradDrawingMode(parser.value(fontblackboardmodeOption));
+ bool guiFonts=parser.isSet(guifontsOption);
if (cmdoptions[i].size()>0) {
for (const QString& key: cmdoptions[i].keys()) {
if (key=="drawboxes" || key=="showboxes") drawBoxes=true;
+ else if (key=="nodrawboxes" || key=="noshowboxes") drawBoxes=false;
+ else if (key=="guifonts") guiFonts=true;
+ else if (key=="noguifonts") guiFonts=false;
else if (key=="fontsize") fontsize=cmdoptions[i].value(key).toDouble();
else if (key=="sizeincrease") sizeincrease=cmdoptions[i].value(key).toInt();
else if (key=="background") backgroundColor=jkqtp_String2QColor(cmdoptions[i].value(key));
@@ -477,12 +540,19 @@ int main(int argc, char* argv[])
else if (mathFont.toUpper() == "STIX_MATHANDTEXT") mathText.useSTIX(false);
if (mathFont.toUpper() == "ASANA") mathText.useASANA(true);
else if (mathFont.toUpper() == "ASANA_MATHANDTEXT") mathText.useASANA(false);
+ if (mathFont.toUpper() == "FIRA") mathText.useFiraMath(true);
+ else if (mathFont.toUpper() == "FIRA_MATHANDTEXT") mathText.useFiraMath(false);
if (fontRoman.size()>0) mathText.setFontRoman(fontRoman, MTFEUnicode);
if (fontSans.size()>0) mathText.setFontSans(fontSans, MTFEUnicode);
if (fontMathRoman.size()>0) {
if (fontMathRoman.toUpper()=="XITS") mathText.useXITS(true);
else if (fontMathRoman.toUpper()=="STIX") mathText.useSTIX(true);
else if (fontMathRoman.toUpper()=="ASANA") mathText.useASANA(true);
+ else if (fontMathRoman.toUpper()=="FIRA") mathText.useFiraMath(true);
+ else if (fontMathRoman.toUpper()=="XITS_MATHANDTEXT") mathText.useXITS(false);
+ else if (fontMathRoman.toUpper()=="STIX_MATHANDTEXT") mathText.useSTIX(false);
+ else if (fontMathRoman.toUpper()=="ASANA_MATHANDTEXT") mathText.useASANA(false);
+ else if (fontMathRoman.toUpper()=="FIRA_MATHANDTEXT") mathText.useFiraMath(false);
else mathText.setFontMathRoman(fontMathRoman, MTFEUnicode);
}
if (fontMathSans.size()>0) mathText.setFontMathSans(fontMathSans, MTFEUnicode);
@@ -499,6 +569,9 @@ int main(int argc, char* argv[])
mathText.setFontBlackboradMode(fontBlackboardMode);
mathText.setFontSize(fontsize);
mathText.setFontColor(textColor);
+ if (guiFonts) {
+ mathText.useGuiFonts();
+ }
// 3. now we parse some LaTeX code
QElapsedTimer timer;
| | | | | | | | | | | | | | | | | 
+ 
+ 
+ 
+