mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-11-15 10:05:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed \min & \max + docfix

Browse Source
This commit is contained in:
jkriege2 2022-08-11 15:22:48 +02:00
parent e1341170a2
commit 05d791502b
3 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
doc/dox/jkqtmathtext_supportedlatexsymbols.dox
View File

@ -254,26 +254,20 @@
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_liminf.png
<td><code>\\limsup</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_limsup.png
<td><code>\\max</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_max.png
</tr>
<tr>
<td><code>\\min</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_min.png
<td><code>\\oiiint</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_oiiint.png
<td><code>\\oiint</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_oiint.png
</tr>
<tr>
<td><code>\\oiint</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_oiint.png
<td><code>\\oint</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_oint.png
<td><code>\\prod</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_prod.png
<td><code>\\sum</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_sum.png
</tr>
<tr>
<td><code>\\sum</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_sum.png
</tr> </table>
@ -337,32 +331,38 @@
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_log.png
</tr>
<tr>
<td><code>\\max</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_max.png
<td><code>\\median</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_median.png
<td><code>\\min</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_min.png
</tr>
<tr>
<td><code>\\mod</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_mod.png
<td><code>\\Pr</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_ppr.png
</tr>
<tr>
<td><code>\\sec</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_sec.png
</tr>
<tr>
<td><code>\\sgn</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_sgn.png
<td><code>\\sign</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_sign.png
</tr>
<tr>
<td><code>\\sin</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_sin.png
</tr>
<tr>
<td><code>\\sinh</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_sinh.png
<td><code>\\tan</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_tan.png
</tr>
<tr>
<td><code>\\tanh</code>:
<td> \image html jkqtmathtext/symbols/jkqtmathtext_symbols_tanh.png
</tr>
<tr>
</tr> </table>

4
lib/jkqtmathtext/nodes/jkqtmathtextsymbolnode.cpp
View File

@ -671,9 +671,9 @@ void JKQTMathTextSymbolNode::fillSymbolTables()
symbols["limsup"] = MathOperatorText("lim sup", "lim&thinsp;sup").addGlobalFlags(SubSuperscriptBelowAboveSymbol);
symbols["ln"] = MathOperatorText("ln");
symbols["log"] = MathOperatorText("log");
symbols["max"] = MathOperatorText("max").addGlobalFlags(SubSuperscriptBelowAboveSymbol);
symbols["max"] = MathOperatorText("max");
symbols["median"] = MathOperatorText("median");
symbols["min"] = MathOperatorText("min").addGlobalFlags(SubSuperscriptBelowAboveSymbol);
symbols["min"] = MathOperatorText("min");
symbols["mod"] = MathOperatorText("mod");
symbols["sec"] = MathOperatorText("sec");
symbols["sgn"] = MathOperatorText("sgn");

11
tools/jkqtmathtext_render/jkqtmathtext_render.cpp
View File

@ -268,16 +268,7 @@ int main(int argc, char* argv[])
if (ch.isUpper()) symbol_lower+=QString(2, ch).toLower();
else symbol_lower+=ch;
}
static QSet<QString> specialSymbols=QSet<QString>()<<"lim"<<"liminf"<<"limsup"<<"arg"<<"argmin"<<"argmax";
if (JKQTMathTextSymbolNode::getSymbolLength(symbol)>1 && !specialSymbols.contains(symbol)) {
latex.append("$\\"+symbol+"(\\cdot)$\\vphantom{Iq}");
} else {
if (JKQTMathTextSymbolNode::getSymbolLength(symbol)>1) {
latex.append("$\\"+symbol+"\\limits_{x\\rightarrow\\infty}f(x)$\\vphantom{Iq}");
} else {
latex.append("$\\"+symbol+"\\limits_{x=0}^\\infty$\\vphantom{Iq}f(x)");
}
}
latex.append("$\\"+symbol+"(\\cdot)$\\vphantom{Iq}");
outputFilename.append("jkqtmathtext_symbols_"+symbol_lower+".png");
cmdoptions.append(QMap<QString,QString>());
fileList<<" <td><code>\\\\"<<symbol<<"</code>:\n <td> \\image html jkqtmathtext/symbols/"<<outputFilename.last()<<"\n";