litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

Bugfixes + XHTML 1.1 + table improvements

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@25 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2009-06-11 08:29:21 +00:00
parent 839483be11
commit 574e550311
11 changed files with 448 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/distro/changelog.txt
View file

@ -2,6 +2,16 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
---------- version 1.1.1 ----------
[w2l] Allow additional characters in bibliography keys (_, - and :)
[w2l] Bugfix: Fixed crash when using the option external_bibtex_files
[w2l] New options: table_first_head_style, table_head_style, table_foot_style and
table_last_foot_style. These can be used to access the advanced table head/table foot
features of supertabular and longtable: If the first paragraph in the first cell in
a row uses one of the styles given by these optons, the row is exported as part of the
first head, head, foot or last foot.
[w2x] Added XHTML 1.1 (without MathML) as target format. Internally Writer2xhtml uses
the non-existing MIME type application/xhtml11 for this

49
source/java/org/openoffice/da/comp/w2lcommon/tex/tokenizer/Catcode.java Normal file
View file

@ -0,0 +1,49 @@
/************************************************************************
*
* Catcode.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 TeX category codes (catcodes) for characters as defined in
* chapter 7 of "The TeXbook"
*/
public enum Catcode {
ESCAPE,
BEGIN_GROUP,
END_GROUP,
MATH_SHIFT,
ALIGNMENT_TAB,
END_OF_LINE,
PARAMETER,
SUPERSCRIPT,
SUBSCRIPT,
IGNORED,
SPACE,
LETTER,
OTHER,
ACTIVE,
COMMENT,
INVALID;
}

95
source/java/org/openoffice/da/comp/w2lcommon/tex/tokenizer/CatcodeTable.java Normal file
View file

@ -0,0 +1,95 @@
/************************************************************************
*
* CatcodeTable.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 class maintains a mapping from characters to catcodes.
* In this implementation, non-ascii characters always has the
* category Catcode.OTHER.
*/
public class CatcodeTable {
private Catcode[] catcodes;
/** Construct a new <code>CatcodeTable</code>, 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; }
}
}

50
source/java/org/openoffice/da/comp/w2lcommon/tex/tokenizer/TokenType.java Normal file
View file

@ -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;
}

4
source/java/writer2latex/Application.java
View file

@ -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; }

4
source/java/writer2latex/api/ConverterFactory.java
View file

@ -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

4
source/java/writer2latex/bibtex/BibTeXDocument.java
View file

@ -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 Hashtable<String, BibMark> entries = new Hashtable<String, BibMark>();
private ExportNameCollection exportNames = new ExportNameCollection(true);
private ExportNameCollection exportNames = new ExportNameCollection("",true,"_-:");
private I18n i18n;
/**

7
source/java/writer2latex/latex/BibConverter.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2008 by Henrik Just
* Copyright: 2002-2009 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.0 (2008-09-08)
* Version 1.2 (2009-06-05)
*
*/
@ -134,8 +134,9 @@ public class BibConverter extends ConverterHelper {
bibDoc.put(new BibMark(node));
}
}
// Insert citation: Original if using external files; stripped if exporting BibTeX
ldp.append("\\cite{")
.append(bibDoc.getExportName(sIdentifier))
.append(config.externalBibtexFiles().length()==0 ? bibDoc.getExportName(sIdentifier) : sIdentifier)
.append("}");
}
}

62
source/java/writer2latex/latex/LaTeXConfig.java
View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.0 (2009-02-17)
* Version 1.2 (2009-05-31)
*
*/
@ -44,7 +44,7 @@ import writer2latex.latex.util.StyleMap;
import writer2latex.util.Misc;
public class LaTeXConfig extends writer2latex.base.ConfigBase {
protected int getOptionCount() { return 59; }
protected int getOptionCount() { return 63; }
protected String getDefaultConfigPath() { return "/writer2latex/latex/config/"; }
// Override setOption to be backwards compatible
@ -83,7 +83,7 @@ public class LaTeXConfig extends writer2latex.base.ConfigBase {
public static final int CUSTOM = 4;
// Options
protected int OPTION_COUNT = 59;
protected int OPTION_COUNT = 63;
private static final int BACKEND = 0;
private static final int NO_PREAMBLE = 1;
@ -122,28 +122,32 @@ public class LaTeXConfig extends writer2latex.base.ConfigBase {
private static final int OTHER_STYLES = 34;
private static final int IMAGE_CONTENT = 35;
private static final int TABLE_CONTENT = 36;
private static final int IGNORE_HARD_PAGE_BREAKS = 37;
private static final int IGNORE_HARD_LINE_BREAKS = 38;
private static final int IGNORE_EMPTY_PARAGRAPHS = 39;
private static final int IGNORE_DOUBLE_SPACES = 40;
private static final int ALIGN_FRAMES = 41;
private static final int FLOAT_FIGURES = 42;
private static final int FLOAT_TABLES = 43;
private static final int FLOAT_OPTIONS = 44;
private static final int FIGURE_SEQUENCE_NAME = 45;
private static final int TABLE_SEQUENCE_NAME = 46;
private static final int IMAGE_OPTIONS = 47;
private static final int REMOVE_GRAPHICS_EXTENSION = 48;
private static final int ORIGINAL_IMAGE_SIZE = 49;
private static final int SIMPLE_TABLE_LIMIT = 50;
private static final int NOTES = 51;
private static final int METADATA = 52;
private static final int TABSTOP = 53;
private static final int WRAP_LINES_AFTER = 54;
private static final int SPLIT_LINKED_SECTIONS = 55;
private static final int SPLIT_TOPLEVEL_SECTIONS = 56;
private static final int SAVE_IMAGES_IN_SUBDIR = 57;
private static final int DEBUG = 58;
private static final int TABLE_FIRST_HEAD_STYLE = 37;
private static final int TABLE_HEAD_STYLE = 38;
private static final int TABLE_FOOT_STYLE = 39;
private static final int TABLE_LAST_FOOT_STYLE = 40;
private static final int IGNORE_HARD_PAGE_BREAKS = 41;
private static final int IGNORE_HARD_LINE_BREAKS = 42;
private static final int IGNORE_EMPTY_PARAGRAPHS = 43;
private static final int IGNORE_DOUBLE_SPACES = 44;
private static final int ALIGN_FRAMES = 45;
private static final int FLOAT_FIGURES = 46;
private static final int FLOAT_TABLES = 47;
private static final int FLOAT_OPTIONS = 48;
private static final int FIGURE_SEQUENCE_NAME = 49;
private static final int TABLE_SEQUENCE_NAME = 50;
private static final int IMAGE_OPTIONS = 51;
private static final int REMOVE_GRAPHICS_EXTENSION = 52;
private static final int ORIGINAL_IMAGE_SIZE = 53;
private static final int SIMPLE_TABLE_LIMIT = 54;
private static final int NOTES = 55;
private static final int METADATA = 56;
private static final int TABSTOP = 57;
private static final int WRAP_LINES_AFTER = 58;
private static final int SPLIT_LINKED_SECTIONS = 59;
private static final int SPLIT_TOPLEVEL_SECTIONS = 60;
private static final int SAVE_IMAGES_IN_SUBDIR = 61;
private static final int DEBUG = 62;
protected LinkedList<String> customPreamble = new LinkedList<String>();
protected StyleMap par = new StyleMap();
@ -226,6 +230,10 @@ public class LaTeXConfig extends writer2latex.base.ConfigBase {
options[OTHER_STYLES] = new ContentHandlingOption("other_styles","accept");
options[IMAGE_CONTENT] = new ContentHandlingOption("image_content","accept");
options[TABLE_CONTENT] = new ContentHandlingOption("table_content","accept");
options[TABLE_FIRST_HEAD_STYLE] = new Option("table_first_head_style","");
options[TABLE_HEAD_STYLE] = new Option("table_head_style","");
options[TABLE_FOOT_STYLE] = new Option("table_foot_style","");
options[TABLE_LAST_FOOT_STYLE] = new Option("table_last_foot_style","");
options[IGNORE_HARD_PAGE_BREAKS] = new BooleanOption("ignore_hard_page_breaks","false");
options[IGNORE_HARD_LINE_BREAKS] = new BooleanOption("ignore_hard_line_breaks","false");
options[IGNORE_EMPTY_PARAGRAPHS] = new BooleanOption("ignore_empty_paragraphs","false");
@ -493,6 +501,10 @@ public class LaTeXConfig extends writer2latex.base.ConfigBase {
public int otherStyles() { return ((IntegerOption) options[OTHER_STYLES]).getValue(); }
public int imageContent() { return ((IntegerOption) options[IMAGE_CONTENT]).getValue(); }
public int tableContent() { return ((IntegerOption) options[TABLE_CONTENT]).getValue(); }
public String getTableFirstHeadStyle() { return options[TABLE_FIRST_HEAD_STYLE].getString(); }
public String getTableHeadStyle() { return options[TABLE_HEAD_STYLE].getString(); }
public String getTableFootStyle() { return options[TABLE_FOOT_STYLE].getString(); }
public String getTableLastFootStyle() { return options[TABLE_LAST_FOOT_STYLE].getString(); }
public boolean ignoreHardPageBreaks() { return ((BooleanOption) options[IGNORE_HARD_PAGE_BREAKS]).getValue(); }
public boolean ignoreHardLineBreaks() { return ((BooleanOption) options[IGNORE_HARD_LINE_BREAKS]).getValue(); }
public boolean ignoreEmptyParagraphs() { return ((BooleanOption) options[IGNORE_EMPTY_PARAGRAPHS]).getValue(); }

263
source/java/writer2latex/latex/TableConverter.java
View file

@ -20,18 +20,23 @@
*
* All Rights Reserved.
*
* Version 1.0 (2009-05-22)
* Version 1.2 (2009-06-11)
*
*/
package writer2latex.latex;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import writer2latex.util.*;
import writer2latex.office.*;
import writer2latex.latex.util.BeforeAfter;
import writer2latex.latex.util.Context;
enum RowType {
FIRST_HEAD, HEAD, BODY, FOOT, LAST_FOOT;
}
/** <p>This class converts OpenDocument tables to LaTeX.</p>
* <p>The following LaTeX packages are used; some of them are optional</p>
* <p>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<table.getRowCount(); nRow++) {
// First collect the row type as defined in the document
if (nRow<table.getFirstBodyRow()) {
rowTypes[nRow] = RowType.HEAD;
}
else {
rowTypes[nRow] = RowType.BODY;
}
if (formatter.isLongtable() || formatter.isSupertabular()) {
// Then override with user defined row types where applicable
// (but only for multipage tables)
// The row type is determined from the first paragraph in the first cell
String sStyleName = getFirstParStyle(table.getCell(nRow, 0));
if (sStyleName!=null) {
if (sStyleName.equals(config.getTableFirstHeadStyle())) {
rowTypes[nRow] = RowType.FIRST_HEAD;
}
else if (sStyleName.equals(config.getTableHeadStyle())) {
rowTypes[nRow] = RowType.HEAD;
}
else if (sStyleName.equals(config.getTableFootStyle())) {
rowTypes[nRow] = RowType.FOOT;
}
else if (sStyleName.equals(config.getTableLastFootStyle())) {
rowTypes[nRow] = RowType.LAST_FOOT;
}
}
}
}
// Convert table
if (formatter.isSupertabular()) {
@ -174,19 +243,29 @@ public class TableConverter extends ConverterHelper {
// Caption
if (caption!=null) {
handleCaption(bCaptionAbove ? "\\topcaption" : "\\bottomcaption",
ldp,oc);
handleCaption(bCaptionAbove ? "\\topcaption" : "\\bottomcaption", ldp, oc);
}
// Table head
ldp.append("\\tablefirsthead{");
handleRows(ldp,oc,RowType.FIRST_HEAD);
ldp.append("}\n");
ldp.append("\\tablehead{");
handleHeaderRows(ldp,oc);
handleRows(ldp,oc,RowType.HEAD);
ldp.append("}\n");
// Table foot
ldp.append("\\tabletail{");
handleRows(ldp,oc,RowType.FOOT);
ldp.append("}\n");
ldp.append("\\tablelasttail{");
handleRows(ldp,oc,RowType.LAST_FOOT);
ldp.append("}\n");
// The table
// The table body
handleHyperTarget(ldp);
ldp.append(baTable.getBefore()).nl();
handleBodyRows(ldp,oc);
handleRows(ldp,oc,RowType.BODY);
ldp.append(baTable.getAfter()).nl();
ldp.append(baTableAlign.getAfter());
@ -196,28 +275,57 @@ public class TableConverter extends ConverterHelper {
handleHyperTarget(ldp);
ldp.append(baTable.getBefore()).nl();
// Caption above
// First head
if (caption!=null && bCaptionAbove) {
// If there's a caption above, we must use \endfirsthead
// and have to repeat the head if there's no first head
handleCaption("\\caption",ldp,oc);
ldp.append("\\\\").nl();
handleHeaderRows(ldp,oc);
if (hasRowType(RowType.FIRST_HEAD)) {
handleRows(ldp,oc,RowType.FIRST_HEAD);
}
else {
handleRows(ldp,oc,RowType.HEAD);
}
ldp.nl().append("\\endfirsthead").nl();
}
// Table head
if (table.getFirstBodyRow()>0) {
handleHeaderRows(ldp,oc);
ldp.nl().append("\\endhead").nl();
else if (hasRowType(RowType.FIRST_HEAD)) {
// Otherwise we only need it if the table contains a first head
handleRows(ldp,oc,RowType.FIRST_HEAD);
ldp.nl().append("\\endfirsthead").nl();
}
// Caption below
// Head
handleRows(ldp,oc,RowType.HEAD);
ldp.nl().append("\\endhead").nl();
// Foot
handleRows(ldp,oc,RowType.FOOT);
ldp.nl().append("\\endfoot").nl();
// Last foot
if (caption!=null && !bCaptionAbove) {
// If there's a caption below, we must use \endlastfoot
// and have to repeat the foot if there's no last foot
if (hasRowType(RowType.LAST_FOOT)) {
handleRows(ldp,oc,RowType.LAST_FOOT);
ldp.nl();
}
else if (hasRowType(RowType.FOOT)){
handleRows(ldp,oc,RowType.FOOT);
ldp.nl();
}
handleCaption("\\caption",ldp,oc);
ldp.append("\\endlastfoot").nl();
ldp.nl().append("\\endlastfoot").nl();
}
else if (hasRowType(RowType.LAST_FOOT)) {
// Otherwise we only need it if the table contains a last foot
handleRows(ldp,oc,RowType.LAST_FOOT);
ldp.nl().append("\\endlastfoot").nl();
}
// Table body
handleBodyRows(ldp,oc);
// Body
handleRows(ldp,oc,RowType.BODY);
ldp.append(baTable.getAfter()).nl();
}
@ -239,9 +347,9 @@ public class TableConverter extends ConverterHelper {
// The table
handleHyperTarget(ldp);
ldp.append(baTable.getBefore()).nl();
handleHeaderRows(ldp,oc);
handleRows(ldp,oc,RowType.HEAD);
ldp.nl();
handleBodyRows(ldp,oc);
handleRows(ldp,oc,RowType.BODY);
ldp.append(baTable.getAfter()).nl();
// Caption below
@ -266,10 +374,10 @@ public class TableConverter extends ConverterHelper {
handleHyperTarget(ldp);
ldp.append(baTable.getBefore()).nl();
if (table.getFirstBodyRow()>0) {
handleHeaderRows(ldp,oc);
handleRows(ldp,oc,RowType.HEAD);
ldp.nl();
}
handleBodyRows(ldp,oc);
handleRows(ldp,oc,RowType.BODY);
ldp.append(baTable.getAfter()).nl();
// Caption below
@ -292,71 +400,54 @@ public class TableConverter extends ConverterHelper {
}
}
private void handleHeaderRows(LaTeXDocumentPortion ldp, Context oc) {
// Note: does *not* add newline after last row
if (table.getFirstBodyRow()>0) {
// Add interrow material before first row:
String sInter = formatter.getInterrowMaterial(0);
if (sInter.length()>0) {
ldp.append(sInter).nl();
}
// Add header rows
handleRows(0,table.getFirstBodyRow(),ldp,oc);
}
}
private void handleBodyRows(LaTeXDocumentPortion ldp, Context oc) {
if (table.getFirstBodyRow()==0) {
// No head, add interrow material before first row:
String sInter = formatter.getInterrowMaterial(0);
if (sInter.length()>0) {
ldp.append(sInter).nl();
}
}
// Add body rows
handleRows(table.getFirstBodyRow(),table.getRowCount(),ldp,oc);
ldp.nl();
}
private void handleRows(int nStart, int nEnd, LaTeXDocumentPortion ldp, Context oc) {
private void handleRows(LaTeXDocumentPortion ldp, Context oc, RowType rowType) {
int nRowCount = table.getRowCount();
int nColCount = table.getColCount();
for (int nRow=nStart; nRow<nEnd; nRow++) {
// Export columns in this row
Context icRow = (Context) oc.clone();
BeforeAfter baRow = new BeforeAfter();
formatter.applyRowStyle(nRow,baRow,icRow);
if (!baRow.isEmpty()) {
ldp.append(baRow.getBefore());
if (!formatter.isSimple()) { ldp.nl(); }
}
int nCol = 0;
while (nCol<nColCount) {
Element cell = (Element) table.getCell(nRow,nCol);
if (XMLString.TABLE_TABLE_CELL.equals(cell.getNodeName())) {
Context icCell = (Context) icRow.clone();
BeforeAfter baCell = new BeforeAfter();
formatter.applyCellStyle(nRow,nCol,baCell,icCell);
ldp.append(baCell.getBefore());
if (nCol==nColCount-1) { icCell.setInLastTableColumn(true); }
palette.getBlockCv().traverseBlockText(cell,ldp,icCell);
ldp.append(baCell.getAfter());
}
// Otherwise ignore; the cell is covered by a \multicolumn entry.
// (table:covered-table-cell)
int nColSpan = Misc.getPosInteger(cell.getAttribute(
XMLString.TABLE_NUMBER_COLUMNS_SPANNED),1);
if (nCol+nColSpan<nColCount) {
if (formatter.isSimple()) { ldp.append(" & "); }
else { ldp.append(" &").nl(); }
}
nCol+=nColSpan;
}
ldp.append("\\\\").append(formatter.getInterrowMaterial(nRow+1));
// Add newline, except after last row
if (nRow<nEnd-1) { ldp.nl(); }
boolean bFirst = true;
for (int nRow=0; nRow<nRowCount; nRow++) {
if (rowTypes[nRow]==rowType) {
// If it's the first row, add top interrow material
if (bFirst) {
String sInter = formatter.getInterrowMaterial(nRow);
if (sInter.length()>0) { ldp.append(sInter).nl(); }
bFirst=false;
}
else {
// If it's not the first row in this row portion, separate with a newline
ldp.nl();
}
// Export columns in this row
Context icRow = (Context) oc.clone();
BeforeAfter baRow = new BeforeAfter();
formatter.applyRowStyle(nRow,baRow,icRow);
if (!baRow.isEmpty()) {
ldp.append(baRow.getBefore());
if (!formatter.isSimple()) { ldp.nl(); }
}
int nCol = 0;
while (nCol<nColCount) {
Element cell = (Element) table.getCell(nRow,nCol);
if (XMLString.TABLE_TABLE_CELL.equals(cell.getNodeName())) {
Context icCell = (Context) icRow.clone();
BeforeAfter baCell = new BeforeAfter();
formatter.applyCellStyle(nRow,nCol,baCell,icCell);
ldp.append(baCell.getBefore());
if (nCol==nColCount-1) { icCell.setInLastTableColumn(true); }
palette.getBlockCv().traverseBlockText(cell,ldp,icCell);
ldp.append(baCell.getAfter());
}
// Otherwise ignore; the cell is covered by a \multicolumn entry.
// (table:covered-table-cell)
int nColSpan = Misc.getPosInteger(cell.getAttribute(
XMLString.TABLE_NUMBER_COLUMNS_SPANNED),1);
if (nCol+nColSpan<nColCount) {
if (formatter.isSimple()) { ldp.append(" & "); }
else { ldp.append(" &").nl(); }
}
nCol+=nColSpan;
}
ldp.append("\\\\").append(formatter.getInterrowMaterial(nRow+1));
}
}
}

28
source/java/writer2latex/util/ExportNameCollection.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2007 by Henrik Just
* Copyright: 2002-2009 by Henrik Just
*
* All Rights Reserved.
*
* Version 0.5 (2007-02-25)
* Version 1.2 (2009-06-05)
*
*/
@ -29,20 +29,27 @@ package writer2latex.util;
import java.util.Enumeration;
import java.util.Hashtable;
// Collection of export names
// Used for mapping named collections to simpler names (only A-Z, a-z and 0-9)
/** Maintain a collection of export names.
* This is used to map named collections to simpler names (only A-Z, a-z and 0-9, and possibly additional characters)
*/
public class ExportNameCollection{
private Hashtable<String, String> exportNames = new Hashtable<String, String>();
private String sPrefix;
private String sAdditionalChars;
private boolean bAcceptNumbers;
public ExportNameCollection(String sPrefix, boolean b) {
public ExportNameCollection(String sPrefix, boolean bAcceptNumbers, String sAdditionalChars) {
this.sPrefix=sPrefix;
bAcceptNumbers = b;
this.bAcceptNumbers = bAcceptNumbers;
this.sAdditionalChars = sAdditionalChars;
}
public ExportNameCollection(String sPrefix, boolean bAcceptNumbers) {
this(sPrefix,bAcceptNumbers,"");
}
public ExportNameCollection(boolean b) {
this("",b);
public ExportNameCollection(boolean bAcceptNumbers) {
this("",bAcceptNumbers,"");
}
public Enumeration<String> keys() {
@ -74,6 +81,9 @@ public class ExportNameCollection{
Integer.parseInt(inbuf.getInteger())));
}
}
else if (sAdditionalChars.indexOf(c)>-1) {
outbuf.append(inbuf.getChar());
}
else {
inbuf.getChar(); // ignore this character
}