Refactoring image conversion + some math bugfixes
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@168 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust
parent
9babea1b6c
commit
74d7599b11
19 changed files with 533 additions and 369 deletions
|
|
@ -20,7 +20,7 @@
|
|||
*
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* Version 1.4 (2014-08-26)
|
||||
* Version 1.4 (2014-09-03)
|
||||
*
|
||||
*/
|
||||
|
||||
|
|
@ -166,6 +166,7 @@ public class DrawConverter extends ConverterHelper {
|
|||
}
|
||||
}
|
||||
else { // unsupported object
|
||||
System.out.println("Unsupported "+sHref);
|
||||
boolean bIgnore = true;
|
||||
if (ofr.isOpenDocument()) { // look for replacement image
|
||||
Element replacementImage = Misc.getChildByTagName(getFrame(node),XMLString.DRAW_IMAGE);
|
||||
|
|
@ -292,31 +293,13 @@ public class DrawConverter extends ConverterHelper {
|
|||
private void includeGraphics(Element node, LaTeXDocumentPortion ldp, Context oc) {
|
||||
String sFileName = null;
|
||||
boolean bCommentOut = true;
|
||||
String sHref = node.getAttribute(XMLString.XLINK_HREF);
|
||||
|
||||
if (sHref.length()>0 && !ofr.isInPackage(sHref)) {
|
||||
// Linked image is not yet handled by ImageLoader. This is a temp.
|
||||
// solution (will go away when ImageLoader is finished)
|
||||
sFileName = ofr.fixRelativeLink(sHref);
|
||||
int nExtStart = sHref.lastIndexOf(".");
|
||||
String sExt = nExtStart>=0 ? sHref.substring(nExtStart).toLowerCase() : "";
|
||||
// Accept only relative filenames and supported filetypes:
|
||||
bCommentOut = sFileName.indexOf(":")>-1 || !(
|
||||
config.getBackend()==LaTeXConfig.UNSPECIFIED ||
|
||||
(config.getBackend()==LaTeXConfig.PDFTEX && MIMETypes.JPEG_EXT.equals(sExt)) ||
|
||||
(config.getBackend()==LaTeXConfig.PDFTEX && MIMETypes.PNG_EXT.equals(sExt)) ||
|
||||
(config.getBackend()==LaTeXConfig.PDFTEX && MIMETypes.PDF_EXT.equals(sExt)) ||
|
||||
(config.getBackend()==LaTeXConfig.XETEX && MIMETypes.JPEG_EXT.equals(sExt)) ||
|
||||
(config.getBackend()==LaTeXConfig.XETEX && MIMETypes.PNG_EXT.equals(sExt)) ||
|
||||
(config.getBackend()==LaTeXConfig.XETEX && MIMETypes.PDF_EXT.equals(sExt)) ||
|
||||
(config.getBackend()==LaTeXConfig.DVIPS && MIMETypes.EPS_EXT.equals(sExt)));
|
||||
}
|
||||
else { // embedded or base64 encoded image
|
||||
BinaryGraphicsDocument bgd = palette.getImageCv().getImage(node);
|
||||
if (bgd!=null) {
|
||||
|
||||
BinaryGraphicsDocument bgd = palette.getImageCv().getImage(node);
|
||||
if (bgd!=null) {
|
||||
if (!bgd.isLinked()) { // embedded image
|
||||
palette.addDocument(bgd);
|
||||
sFileName = bgd.getFileName();
|
||||
String sMIME = bgd.getDocumentMIMEType();
|
||||
String sMIME = bgd.getMIMEType();
|
||||
bCommentOut = !(
|
||||
config.getBackend()==LaTeXConfig.UNSPECIFIED ||
|
||||
(config.getBackend()==LaTeXConfig.PDFTEX && MIMETypes.JPEG.equals(sMIME)) ||
|
||||
|
|
@ -326,10 +309,23 @@ public class DrawConverter extends ConverterHelper {
|
|||
(config.getBackend()==LaTeXConfig.XETEX && MIMETypes.PNG.equals(sMIME)) ||
|
||||
(config.getBackend()==LaTeXConfig.XETEX && MIMETypes.PDF.equals(sMIME)) ||
|
||||
(config.getBackend()==LaTeXConfig.DVIPS && MIMETypes.EPS.equals(sMIME)));
|
||||
}
|
||||
}
|
||||
else { // linked image
|
||||
sFileName = bgd.getURL();
|
||||
String sExt = bgd.getFileExtension().toLowerCase();
|
||||
// Accept only relative filenames and supported filetypes:
|
||||
bCommentOut = sFileName.indexOf(":")>-1 || !(
|
||||
config.getBackend()==LaTeXConfig.UNSPECIFIED ||
|
||||
(config.getBackend()==LaTeXConfig.PDFTEX && MIMETypes.JPEG_EXT.equals(sExt)) ||
|
||||
(config.getBackend()==LaTeXConfig.PDFTEX && MIMETypes.PNG_EXT.equals(sExt)) ||
|
||||
(config.getBackend()==LaTeXConfig.PDFTEX && MIMETypes.PDF_EXT.equals(sExt)) ||
|
||||
(config.getBackend()==LaTeXConfig.XETEX && MIMETypes.JPEG_EXT.equals(sExt)) ||
|
||||
(config.getBackend()==LaTeXConfig.XETEX && MIMETypes.PNG_EXT.equals(sExt)) ||
|
||||
(config.getBackend()==LaTeXConfig.XETEX && MIMETypes.PDF_EXT.equals(sExt)) ||
|
||||
(config.getBackend()==LaTeXConfig.DVIPS && MIMETypes.EPS_EXT.equals(sExt)));
|
||||
}
|
||||
}
|
||||
|
||||
if (sFileName==null) {
|
||||
else {
|
||||
ldp.append("[Warning: Image not found]");
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
*
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* Version 1.4 (2014-08-25)
|
||||
* Version 1.4 (2014-09-03)
|
||||
*
|
||||
*/
|
||||
|
||||
|
|
@ -73,12 +73,7 @@ public final class MathConverter extends ConverterHelper {
|
|||
|
||||
public void appendDeclarations(LaTeXDocumentPortion pack, LaTeXDocumentPortion decl) {
|
||||
if (bContainsFormulas) {
|
||||
if (config.useOoomath()) {
|
||||
pack.append("\\usepackage{ooomath}").nl();
|
||||
}
|
||||
else {
|
||||
smc.appendDeclarations(pack,decl);
|
||||
}
|
||||
smc.appendDeclarations(pack,decl);
|
||||
}
|
||||
if (bNeedTexMathsPreamble) {
|
||||
// The preamble may be stored as a user defined property (newline is represented as paragraph sign)
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@
|
|||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
* MA 02111-1307 USA
|
||||
*
|
||||
* Copyright: 2002-2011 by Henrik Just
|
||||
* Copyright: 2002-2014 by Henrik Just
|
||||
*
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* Version 1.2 (2011-03-30)
|
||||
* Version 1.4 (2014-09-02)
|
||||
*
|
||||
*/
|
||||
|
||||
|
|
@ -98,7 +98,8 @@ public class ParConverter extends StyleConverter {
|
|||
* \end{enumerate}).
|
||||
*/
|
||||
public void handleParagraph(Element node, LaTeXDocumentPortion ldp, Context oc, boolean bLastInBlock) {
|
||||
if (palette.getMathCv().handleDisplayEquation(node,ldp)) { return; }
|
||||
// Check for display equation (except in table cells)
|
||||
if ((!oc.isInTable()) && palette.getMathCv().handleDisplayEquation(node,ldp)) { return; }
|
||||
|
||||
// Get the style name for this paragraph
|
||||
String sStyleName = node.getAttribute(XMLString.TEXT_STYLE_NAME);
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
*
|
||||
* Copyright: 2002-2014 by Henrik Just
|
||||
*
|
||||
* Version 1.4 (2014-08-05)
|
||||
* Version 1.4 (2014-09-03)
|
||||
*
|
||||
* All Rights Reserved.
|
||||
*/
|
||||
|
|
@ -723,6 +723,7 @@ public final class StarMathConverter implements writer2latex.api.StarMathConvert
|
|||
private LaTeXConfig config;
|
||||
private Map<String, String> configSymbols;
|
||||
private boolean bUseColor;
|
||||
private int nMaxMatrixCols = 10; // trace the largest number of columns in a matrix
|
||||
private SmToken curToken=new SmToken(); // contains the data of the current token
|
||||
private SimpleInputBuffer buffer; // contains the starmath formula
|
||||
//private Float fBaseSize; // base size for the formula (usually 12pt)
|
||||
|
|
@ -771,67 +772,75 @@ public final class StarMathConverter implements writer2latex.api.StarMathConvert
|
|||
}
|
||||
|
||||
public void appendDeclarations(LaTeXDocumentPortion pack, LaTeXDocumentPortion decl) {
|
||||
if (bDefeq) {
|
||||
decl.append("\\newcommand\\defeq{\\stackrel{\\mathrm{def}}{=}}").nl();
|
||||
if (config.useOoomath()) {
|
||||
pack.append("\\usepackage{ooomath}").nl();
|
||||
}
|
||||
if (bLambdabar) {
|
||||
decl.append("\\newcommand\\lambdabar{\\mathchar'26\\mkern-10mu\\lambda}").nl();
|
||||
else {
|
||||
if (bDefeq) {
|
||||
decl.append("\\newcommand\\defeq{\\stackrel{\\mathrm{def}}{=}}").nl();
|
||||
}
|
||||
if (bLambdabar) {
|
||||
decl.append("\\newcommand\\lambdabar{\\mathchar'26\\mkern-10mu\\lambda}").nl();
|
||||
}
|
||||
if (bDdotsup) {
|
||||
decl.append("\\newcommand\\ddotsup{\\mathinner{\\mkern1mu\\raise1pt\\vbox{\\kern7pt\\hbox{.}}\\mkern2mu\\raise4pt\\hbox{.}\\mkern2mu\\raise7pt\\hbox{.}\\mkern1mu}}").nl();
|
||||
}
|
||||
if (bMultimapdotbothA) {
|
||||
decl.append("\\providecommand\\multimapdotbothA{\\bullet\\kern-0.4em-\\kern-0.4em\\circ}").nl();
|
||||
}
|
||||
if (bMultimapdotbothB) {
|
||||
decl.append("\\providecommand\\multimapdotbothB{\\circ\\kern-0.4em-\\kern-0.4em\\bullet}").nl();
|
||||
}
|
||||
if (bLlbracket) {
|
||||
decl.append("\\providecommand\\llbracket{[}").nl();
|
||||
}
|
||||
if (bRrbracket) {
|
||||
decl.append("\\providecommand\\rrbracket{]}").nl();
|
||||
}
|
||||
if (bOiint) {
|
||||
decl.append("\\providecommand\\oiint{\\oint}").nl();
|
||||
}
|
||||
if (bOiiint) {
|
||||
decl.append("\\providecommand\\oiiint{\\oint}").nl();
|
||||
}
|
||||
if (bWideslash) {
|
||||
decl.append("\\newcommand\\wideslash[2]{{}^{#1}/_{#2}}").nl();
|
||||
}
|
||||
if (bWidebslash) {
|
||||
decl.append("\\newcommand\\widebslash[2]{{}_{#1}\\backslash^{#2}}").nl();
|
||||
}
|
||||
if (bBoldsubformula) {
|
||||
decl.append("\\newcommand\\boldsubformula[1]{\\text{\\mathversion{bold}$#1$}}").nl();
|
||||
}
|
||||
if (bNormalsubformula) {
|
||||
decl.append("\\newcommand\\normalsubformula[1]{\\text{\\mathversion{normal}$#1$}}").nl();
|
||||
}
|
||||
if (bMultiscripts || bMathoverstrike) {
|
||||
decl.append("\\newlength{\\idxmathdepth}\\newlength{\\idxmathtotal}\\newlength{\\idxmathwidth}\\newlength{\\idxraiseme}").nl();
|
||||
decl.append("\\newcommand{\\idxdheight}[1]{\\protect\\settoheight{\\idxmathtotal}{\\(\\displaystyle#1\\)}\\protect\\settodepth{\\idxmathdepth}{\\(\\displaystyle#1\\)}\\protect\\settowidth{\\idxmathwidth}{\\(\\displaystyle#1\\)}\\protect\\addtolength{\\idxmathtotal}{\\idxmathdepth}\\protect\\setlength{\\idxraiseme}{\\idxmathtotal/2-\\idxmathdepth}}").nl();
|
||||
decl.append("\\newcommand{\\idxtheight}[1]{\\protect\\settoheight{\\idxmathtotal}{\\(\\textstyle #1\\)}\\protect\\settodepth{\\idxmathdepth}{\\(\\textstyle #1\\)}\\protect\\settowidth{\\idxmathwidth}{\\(\\textstyle#1\\)}\\protect\\addtolength{\\idxmathtotal}{\\idxmathdepth}\\protect\\setlength{\\idxraiseme}{\\idxmathtotal/2-\\idxmathdepth}}").nl();
|
||||
decl.append("\\newcommand{\\idxsheight}[1]{\\protect\\settoheight{\\idxmathtotal}{\\(\\scriptstyle #1\\)}\\protect\\settodepth{\\idxmathdepth}{\\(\\scriptstyle #1\\)}\\protect\\settowidth{\\idxmathwidth}{\\(\\scriptstyle#1\\)}\\protect\\addtolength{\\idxmathtotal}{\\idxmathdepth}\\protect\\setlength{\\idxraiseme}{\\idxmathtotal/2-\\idxmathdepth}}").nl();
|
||||
decl.append("\\newcommand{\\idxssheight}[1]{\\protect\\settoheight{\\idxmathtotal}{\\(\\scriptscriptstyle #1\\)}\\protect\\settodepth{\\idxmathdepth}{\\(\\scriptscriptstyle #1\\)}\\protect\\settowidth{\\idxmathwidth}{\\(\\scriptscriptstyle#1\\)}\\protect\\addtolength{\\idxmathtotal}{\\idxmathdepth}\\protect\\setlength{\\idxraiseme}{\\idxmathtotal/2-\\idxmathdepth}}").nl();
|
||||
}
|
||||
if (bMultiscripts) {
|
||||
decl.append("\\newcommand\\multiscripts[5]{\\mathchoice")
|
||||
.append("{\\idxdheight{#4}\\rule[-\\idxmathdepth]{0mm}{\\idxmathtotal}#1\\underset{#2}{\\overset{#3}{#4}}\\rule[-\\idxmathdepth]{0mm}{\\idxmathtotal}#5}")
|
||||
.append("{\\idxtheight{#4}\\rule[-\\idxmathdepth]{0mm}{\\idxmathtotal}#1\\underset{#2}{\\overset{#3}{#4}}\\rule[-\\idxmathdepth]{0mm}{\\idxmathtotal}#5}")
|
||||
.append("{\\idxsheight{#4}\\rule[-\\idxmathdepth]{0mm}{\\idxmathtotal}#1\\underset{#2}{\\overset{#3}{#4}}\\rule[-\\idxmathdepth]{0mm}{\\idxmathtotal}#5}")
|
||||
.append("{\\idxssheight{#4}\\rule[-\\idxmathdepth]{0mm}{\\idxmathtotal}#1\\underset{#2}{\\overset{#3}{#4}}\\rule[-\\idxmathdepth]{0mm}{\\idxmathtotal}#5}}")
|
||||
.nl();
|
||||
}
|
||||
if (bMathoverstrike) {
|
||||
decl.append("\\newcommand\\mathoverstrike[1]{\\mathchoice")
|
||||
.append("{\\idxdheight{#1}\\rlap{\\rule[\\idxraiseme]{\\idxmathwidth}{0.4pt}}{#1}}")
|
||||
.append("{\\idxtheight{#1}\\rlap{\\rule[\\idxraiseme]{\\idxmathwidth}{0.4pt}}{#1}}")
|
||||
.append("{\\idxsheight{#1}\\rlap{\\rule[\\idxraiseme]{\\idxmathwidth}{0.4pt}}{#1}}")
|
||||
.append("{\\idxssheight{#1}\\rlap{\\rule[\\idxraiseme]{\\idxmathwidth}{0.4pt}}{#1}}}")
|
||||
.nl();
|
||||
}
|
||||
}
|
||||
if (bDdotsup) {
|
||||
decl.append("\\newcommand\\ddotsup{\\mathinner{\\mkern1mu\\raise1pt\\vbox{\\kern7pt\\hbox{.}}\\mkern2mu\\raise4pt\\hbox{.}\\mkern2mu\\raise7pt\\hbox{.}\\mkern1mu}}").nl();
|
||||
}
|
||||
if (bMultimapdotbothA) {
|
||||
decl.append("\\providecommand\\multimapdotbothA{\\bullet\\kern-0.4em-\\kern-0.4em\\circ}").nl();
|
||||
}
|
||||
if (bMultimapdotbothB) {
|
||||
decl.append("\\providecommand\\multimapdotbothB{\\circ\\kern-0.4em-\\kern-0.4em\\bullet}").nl();
|
||||
}
|
||||
if (bLlbracket) {
|
||||
decl.append("\\providecommand\\llbracket{[}").nl();
|
||||
}
|
||||
if (bRrbracket) {
|
||||
decl.append("\\providecommand\\rrbracket{]}").nl();
|
||||
}
|
||||
if (bOiint) {
|
||||
decl.append("\\providecommand\\oiint{\\oint}").nl();
|
||||
}
|
||||
if (bOiiint) {
|
||||
decl.append("\\providecommand\\oiiint{\\oint}").nl();
|
||||
}
|
||||
if (bWideslash) {
|
||||
decl.append("\\newcommand\\wideslash[2]{{}^{#1}/_{#2}}").nl();
|
||||
}
|
||||
if (bWidebslash) {
|
||||
decl.append("\\newcommand\\widebslash[2]{{}_{#1}\\backslash^{#2}}").nl();
|
||||
}
|
||||
if (bBoldsubformula) {
|
||||
decl.append("\\newcommand\\boldsubformula[1]{\\text{\\mathversion{bold}$#1$}}").nl();
|
||||
}
|
||||
if (bNormalsubformula) {
|
||||
decl.append("\\newcommand\\normalsubformula[1]{\\text{\\mathversion{normal}$#1$}}").nl();
|
||||
}
|
||||
if (bMultiscripts || bMathoverstrike) {
|
||||
decl.append("\\newlength{\\idxmathdepth}\\newlength{\\idxmathtotal}\\newlength{\\idxmathwidth}\\newlength{\\idxraiseme}").nl();
|
||||
decl.append("\\newcommand{\\idxdheight}[1]{\\protect\\settoheight{\\idxmathtotal}{\\(\\displaystyle#1\\)}\\protect\\settodepth{\\idxmathdepth}{\\(\\displaystyle#1\\)}\\protect\\settowidth{\\idxmathwidth}{\\(\\displaystyle#1\\)}\\protect\\addtolength{\\idxmathtotal}{\\idxmathdepth}\\protect\\setlength{\\idxraiseme}{\\idxmathtotal/2-\\idxmathdepth}}").nl();
|
||||
decl.append("\\newcommand{\\idxtheight}[1]{\\protect\\settoheight{\\idxmathtotal}{\\(\\textstyle #1\\)}\\protect\\settodepth{\\idxmathdepth}{\\(\\textstyle #1\\)}\\protect\\settowidth{\\idxmathwidth}{\\(\\textstyle#1\\)}\\protect\\addtolength{\\idxmathtotal}{\\idxmathdepth}\\protect\\setlength{\\idxraiseme}{\\idxmathtotal/2-\\idxmathdepth}}").nl();
|
||||
decl.append("\\newcommand{\\idxsheight}[1]{\\protect\\settoheight{\\idxmathtotal}{\\(\\scriptstyle #1\\)}\\protect\\settodepth{\\idxmathdepth}{\\(\\scriptstyle #1\\)}\\protect\\settowidth{\\idxmathwidth}{\\(\\scriptstyle#1\\)}\\protect\\addtolength{\\idxmathtotal}{\\idxmathdepth}\\protect\\setlength{\\idxraiseme}{\\idxmathtotal/2-\\idxmathdepth}}").nl();
|
||||
decl.append("\\newcommand{\\idxssheight}[1]{\\protect\\settoheight{\\idxmathtotal}{\\(\\scriptscriptstyle #1\\)}\\protect\\settodepth{\\idxmathdepth}{\\(\\scriptscriptstyle #1\\)}\\protect\\settowidth{\\idxmathwidth}{\\(\\scriptscriptstyle#1\\)}\\protect\\addtolength{\\idxmathtotal}{\\idxmathdepth}\\protect\\setlength{\\idxraiseme}{\\idxmathtotal/2-\\idxmathdepth}}").nl();
|
||||
}
|
||||
if (bMultiscripts) {
|
||||
decl.append("\\newcommand\\multiscripts[5]{\\mathchoice")
|
||||
.append("{\\idxdheight{#4}\\rule[-\\idxmathdepth]{0mm}{\\idxmathtotal}#1\\underset{#2}{\\overset{#3}{#4}}\\rule[-\\idxmathdepth]{0mm}{\\idxmathtotal}#5}")
|
||||
.append("{\\idxtheight{#4}\\rule[-\\idxmathdepth]{0mm}{\\idxmathtotal}#1\\underset{#2}{\\overset{#3}{#4}}\\rule[-\\idxmathdepth]{0mm}{\\idxmathtotal}#5}")
|
||||
.append("{\\idxsheight{#4}\\rule[-\\idxmathdepth]{0mm}{\\idxmathtotal}#1\\underset{#2}{\\overset{#3}{#4}}\\rule[-\\idxmathdepth]{0mm}{\\idxmathtotal}#5}")
|
||||
.append("{\\idxssheight{#4}\\rule[-\\idxmathdepth]{0mm}{\\idxmathtotal}#1\\underset{#2}{\\overset{#3}{#4}}\\rule[-\\idxmathdepth]{0mm}{\\idxmathtotal}#5}}")
|
||||
.nl();
|
||||
}
|
||||
if (bMathoverstrike) {
|
||||
decl.append("\\newcommand\\mathoverstrike[1]{\\mathchoice")
|
||||
.append("{\\idxdheight{#1}\\rlap{\\rule[\\idxraiseme]{\\idxmathwidth}{0.4pt}}{#1}}")
|
||||
.append("{\\idxtheight{#1}\\rlap{\\rule[\\idxraiseme]{\\idxmathwidth}{0.4pt}}{#1}}")
|
||||
.append("{\\idxsheight{#1}\\rlap{\\rule[\\idxraiseme]{\\idxmathwidth}{0.4pt}}{#1}}")
|
||||
.append("{\\idxssheight{#1}\\rlap{\\rule[\\idxraiseme]{\\idxmathwidth}{0.4pt}}{#1}}}")
|
||||
.nl();
|
||||
if (nMaxMatrixCols>10) { // The default for the matrix environment is at most 10 columns
|
||||
decl.append("\\setcounter{MaxMatrixCols}{").append(Integer.toString(nMaxMatrixCols)).append("}").nl();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1606,14 +1615,23 @@ public final class StarMathConverter implements writer2latex.api.StarMathConvert
|
|||
private String matrix(float fSize, Token eAlign){
|
||||
nextToken();
|
||||
if (curToken.eType==Token.LGROUP){
|
||||
StringBuffer bufMatrix=new StringBuffer().append("\\begin{matrix}");
|
||||
StringBuffer bufMatrix = new StringBuffer().append("\\begin{matrix}");
|
||||
int nCols = 1;
|
||||
do {
|
||||
nextToken();
|
||||
bufMatrix.append(align(fSize,eAlign,true,true));
|
||||
if (curToken.eType==Token.POUND) bufMatrix.append("&");
|
||||
else if (curToken.eType==Token.DPOUND) bufMatrix.append("\\\\");
|
||||
if (curToken.eType==Token.POUND) {
|
||||
bufMatrix.append("&");
|
||||
nCols++;
|
||||
}
|
||||
else if (curToken.eType==Token.DPOUND) {
|
||||
bufMatrix.append("\\\\");
|
||||
nMaxMatrixCols = Math.max(nCols, nMaxMatrixCols);
|
||||
nCols = 1;
|
||||
}
|
||||
} while (curToken.eType==Token.POUND || curToken.eType==Token.DPOUND);
|
||||
if (curToken.eType==Token.RGROUP) nextToken(); // otherwise error in formula- ignore
|
||||
nMaxMatrixCols = Math.max(nCols, nMaxMatrixCols);
|
||||
return bufMatrix.append("\\end{matrix}").toString();
|
||||
}
|
||||
else { // error in formula
|
||||
|
|
@ -1637,10 +1655,10 @@ public final class StarMathConverter implements writer2latex.api.StarMathConvert
|
|||
}
|
||||
}
|
||||
|
||||
// Group a LaTeX string unless it consists of exactly one character
|
||||
// Group a LaTeX string unless it consists of exactly one character which is not a space
|
||||
// In the latter case, prepend a space character (because this string follows a command sequence)
|
||||
private String groupsp(String sLaTeX) {
|
||||
if (sLaTeX.length()!=1) {
|
||||
if (sLaTeX.length()!=1 || sLaTeX.charAt(0)==' ') {
|
||||
return "{"+sLaTeX+"}";
|
||||
}
|
||||
else {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue