CatcodeTable, defining catcodes
+ * as by INITeX plus the additional catcodes defined by plain TeX
+ */
+ public CatcodeTable() {
+ catcodes = new Catcode[128];
+
+ // First define all the catcodes from INITeX (Chapter 7 in "The TeXbook")
+ for (int i=0; i<128; i++) {
+ catcodes[i] = Catcode.OTHER;
+ }
+ for (char c='A'; c<='Z'; c++) {
+ catcodes[c] = Catcode.LETTER;
+ }
+ for (char c='a'; c<='z'; c++) {
+ catcodes[c] = Catcode.LETTER;
+ }
+ catcodes['\r']=Catcode.END_OF_LINE;
+ catcodes[' ']=Catcode.SPACE;
+ catcodes['\u0000']=Catcode.IGNORED; // ASCII NUL
+ catcodes['\u007F']=Catcode.INVALID; // ASCII DEL
+ catcodes['%']=Catcode.COMMENT;
+ catcodes['\\']=Catcode.ESCAPE;
+
+ // Then define all the catcodes from plain TeX (Appendix B in "The TeXbook")
+ catcodes['{']=Catcode.BEGIN_GROUP;
+ catcodes['}']=Catcode.END_GROUP;
+ catcodes['$']=Catcode.MATH_SHIFT;
+ catcodes['&']=Catcode.ALIGNMENT_TAB;
+ catcodes['#']=Catcode.PARAMETER;
+ catcodes['^']=Catcode.SUPERSCRIPT;
+ catcodes['\u000B']=Catcode.SUPERSCRIPT; // ASCII VT ("uparrow")
+ catcodes['_']=Catcode.SUBSCRIPT;
+ catcodes['\u0001']=Catcode.SUBSCRIPT; // ASCII SOH ("downarrow")
+ catcodes['\t']=Catcode.SPACE;
+ catcodes['~']=Catcode.ACTIVE;
+ catcodes['\u000C']=Catcode.ACTIVE; // ASCII FF
+ }
+
+ /** Set the catcode of a character. The request is silently ignored
+ * for all characters outside the ASCII character set
+ *
+ * @param c the character
+ * @param cc the desired catcode
+ */
+ public void set(char c, Catcode cc) {
+ if (c<128) { catcodes[c]=cc; }
+ }
+
+ /** Get the catcode of a character. Characters outside the ASCII character
+ * set always have the catcode Catcode.OTHER
+ *
+ * @param c the character
+ * @return the current catcode
+ */
+ public Catcode get(char c) {
+ if (c<128) { return catcodes[c]; }
+ else { return Catcode.OTHER; }
+ }
+
+}
diff --git a/source/java/org/openoffice/da/comp/w2lcommon/tex/tokenizer/TokenType.java b/source/java/org/openoffice/da/comp/w2lcommon/tex/tokenizer/TokenType.java
new file mode 100644
index 0000000..14f346e
--- /dev/null
+++ b/source/java/org/openoffice/da/comp/w2lcommon/tex/tokenizer/TokenType.java
@@ -0,0 +1,50 @@
+/************************************************************************
+ *
+ * TokenType.java
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ * Copyright: 2002-2009 by Henrik Just
+ *
+ * All Rights Reserved.
+ *
+ * Version 1.2 (2009-06-11)
+ *
+ */
+
+package org.openoffice.da.comp.w2lcommon.tex.tokenizer;
+
+/** This enumerates possible TeX tokens. According to chapter 7 in
+ * "The TeX book", a token is either a character with an associated
+ * catcode or a control sequence. We add "end of input" token as
+ * a convenience. Not all catcodes can actually end up in a token,
+ * so we only include the relevant ones.
+ */
+public enum TokenType {
+ ESCAPE,
+ BEGIN_GROUP,
+ END_GROUP,
+ MATH_SHIFT,
+ ALIGNMENT_TAB,
+ PARAMETER,
+ SUPERSCRIPT,
+ SUBSCRIPT,
+ SPACE,
+ LETTER,
+ OTHER,
+ ACTIVE,
+ COMMAND_SEQUENCE,
+ ENDINPUT;
+}
diff --git a/source/java/writer2latex/Application.java b/source/java/writer2latex/Application.java
index e1185e9..9b544f8 100644
--- a/source/java/writer2latex/Application.java
+++ b/source/java/writer2latex/Application.java
@@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
- * Version 1.2 (2009-03-26)
+ * Version 1.2 (2009-06-11)
*
*/
@@ -276,6 +276,7 @@ public final class Application {
System.out.println(" -latex");
System.out.println(" -bibtex");
System.out.println(" -xhtml");
+ System.out.println(" -xhtml11");
System.out.println(" -xhtml+mathml");
System.out.println(" -xhtml+mathml+xsl");
System.out.println(" -recurse");
@@ -308,6 +309,7 @@ public final class Application {
if ("-latex".equals(sArg)) { sTargetMIME = MIMETypes.LATEX; }
else if ("-bibtex".equals(sArg)) { sTargetMIME = MIMETypes.BIBTEX; }
else if ("-xhtml".equals(sArg)) { sTargetMIME = MIMETypes.XHTML; }
+ else if ("-xhtml11".equals(sArg)) { sTargetMIME = MIMETypes.XHTML11; }
else if ("-xhtml+mathml".equals(sArg)) { sTargetMIME = MIMETypes.XHTML_MATHML; }
else if ("-xhtml+mathml+xsl".equals(sArg)) { sTargetMIME = MIMETypes.XHTML_MATHML_XSL; }
else if ("-recurse".equals(sArg)) { bRecurse = true; }
diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java
index 34ee9d8..55cf2be 100644
--- a/source/java/writer2latex/api/ConverterFactory.java
+++ b/source/java/writer2latex/api/ConverterFactory.java
@@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
- * Version 1.2 (2009-05-29)
+ * Version 1.2 (2009-06-11)
*
*/
@@ -33,7 +33,7 @@ public class ConverterFactory {
// Version information
private static final String VERSION = "1.1.1";
- private static final String DATE = "2008-05-29";
+ private static final String DATE = "2008-06-11";
/** Return version information
* @return the Writer2LaTeX version in the form
diff --git a/source/java/writer2latex/bibtex/BibTeXDocument.java b/source/java/writer2latex/bibtex/BibTeXDocument.java
index 6625ad8..acb4ff0 100644
--- a/source/java/writer2latex/bibtex/BibTeXDocument.java
+++ b/source/java/writer2latex/bibtex/BibTeXDocument.java
@@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
- * Version 1.0 (2009-03-08)
+ * Version 1.2 (2009-06-05)
*
*/
@@ -52,7 +52,7 @@ public class BibTeXDocument implements Document {
private String sName;
private HashtableThis class converts OpenDocument tables to LaTeX.
*The following LaTeX packages are used; some of them are optional
*array.sty, longtable.sty, supertabular.sty, tabulary.sty, hhline.sty,
@@ -49,7 +54,6 @@ import writer2latex.latex.util.Context;
*
*/
public class TableConverter extends ConverterHelper {
-
private boolean bNeedLongtable = false;
private boolean bNeedSupertabular = false;
private boolean bNeedTabulary = false;
@@ -119,6 +123,39 @@ public class TableConverter extends ConverterHelper {
private boolean bCaptionAbove;
private BeforeAfter baTable;
private BeforeAfter baTableAlign;
+ private RowType[] rowTypes;
+
+ // Return the paragraph style of the first paragraph/heading within this block text
+ private String getFirstParStyle(Element node) {
+ Node child = node.getFirstChild();
+ while (child!=null) {
+ if (Misc.isElement(child, XMLString.TEXT_P) || Misc.isElement(child, XMLString.TEXT_H)) {
+ String sStyleName = Misc.getAttribute(child, XMLString.TEXT_STYLE_NAME);
+ if (sStyleName!=null) {
+ StyleWithProperties style = ofr.getParStyle(sStyleName);
+ if (style!=null) {
+ if (style.isAutomatic()) {
+ sStyleName = style.getParentName();
+ }
+ return ofr.getParStyles().getDisplayName(sStyleName);
+ }
+ }
+ return null;
+ }
+ else if (OfficeReader.isTextElement(child)) {
+ return getFirstParStyle((Element)child);
+ }
+ child = child.getNextSibling();
+ }
+ return null;
+ }
+
+ private boolean hasRowType(RowType test) {
+ for (RowType type : rowTypes) {
+ if (type==test) { return true; }
+ }
+ return false;
+ }
private void handleTable(Element node, Element caption, boolean bCaptionAbove,
LaTeXDocumentPortion ldp, Context oc) {
@@ -150,6 +187,38 @@ public class TableConverter extends ConverterHelper {
baTable = new BeforeAfter();
baTableAlign = new BeforeAfter();
formatter.applyTableStyle(baTable,baTableAlign,config.floatTables() && !ic.isInFrame() && !table.isSubTable());
+
+ // Identify the row types
+ rowTypes = new RowType[table.getRowCount()];
+ for (int nRow=0; nRow