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

Various work on w2l 1.2

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@18 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2009-04-28 18:39:33 +00:00
parent c410adda52
commit 8a41806d02
11 changed files with 516 additions and 410 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/distro/changelog.txt
View file

@ -2,10 +2,12 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
---------- version 1.1.1 ---------- ---------- version 1.1.1 ----------
[w2l] Partial support for the new list formatting of ODT 1.2 (implemented in OOo 3.0)
[all] Filter: Filters out characters that are illegal in xml [all] Filter: Filters out characters that are illegal in xml
(this fixes a problem with rtf documents imported in OOo) (this fixes a problem with rtf documents imported in OOo)
[w2x] Introduced hack to set link attributes using the link name [w2x] Introduced hack to set link attributes using the link name:
accepts a semicolon separated list of name=value, for example accepts a semicolon separated list of name=value, for example
title=link to next page;rel=next title=link to next page;rel=next

14
source/java/org/openoffice/da/comp/w2lcommon/filter/ExportFilterBase.java
View file

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.2 (2009-04-23) * Version 1.2 (2009-04-25)
* *
*/ */
@ -137,16 +137,16 @@ public abstract class ExportFilterBase implements
int nLen = origString.length(); int nLen = origString.length();
for (int i=0; i<nLen; i++) { for (int i=0; i<nLen; i++) {
char c = origString.charAt(i); char c = origString.charAt(i);
if (c=='&'){ if (c=='&'){
buf.append("&amp;"); buf.append("&amp;");
} }
if (c=='\"'){ else if (c=='\"'){
buf.append("&quot;"); buf.append("&quot;");
} }
if (c=='<'){ else if (c=='<'){
buf.append("&lt;"); buf.append("&lt;");
} }
if (c=='>'){ else if (c=='>'){
buf.append("&gt;"); buf.append("&gt;");
} }
else if (c=='\u0009' || c=='\n' || c=='\r' || (c>='\u0020' && c<='\uD7FF') || (c>='\uE000' && c<'\uFFFD')) { else if (c=='\u0009' || c=='\n' || c=='\r' || (c>='\u0020' && c<='\uD7FF') || (c>='\uE000' && c<'\uFFFD')) {

39
source/java/org/openoffice/da/comp/writer4latex/ConfigurationDialog.java
View file

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.2 (2009-04-23) * Version 1.2 (2009-04-25)
* *
*/ */
@ -259,24 +259,8 @@ public final class ConfigurationDialog
// Configure the applications automatically (OS dependent) // Configure the applications automatically (OS dependent)
private boolean autoConfigure(XWindow xWindow) { private boolean autoConfigure(XWindow xWindow) {
String sOsName = System.getProperty("os.name"); String sOsName = System.getProperty("os.name");
if ("Linux".equals(sOsName)) { if (sOsName.startsWith("Windows")) {
configureApp(ExternalApps.LATEX, "latex", "--interaction=batchmode %s"); // TODO: Get information from the windows registry using unowinreg.dll from the SDK
configureApp(ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s");
configureApp(ExternalApps.XELATEX, "xelatex", "--interaction=batchmode %s");
configureApp(ExternalApps.DVIPS, "dvips", "%s");
configureApp(ExternalApps.BIBTEX, "bibtex", "%s");
configureApp(ExternalApps.MAKEINDEX, "makeindex", "%s");
configureApp(ExternalApps.OOLATEX, "oolatex", "%s");
// We have several possible viewers
String[] sDviViewers = {"evince", "okular", "xdvi"};
configureApp(ExternalApps.DVIVIEWER, sDviViewers, "%s");
String[] sPdfViewers = {"evince", "okular", "xpdf"};
configureApp(ExternalApps.PDFVIEWER, sPdfViewers, "%s");
String[] sPsViewers = {"evince", "okular", "ghostview"};
configureApp(ExternalApps.POSTSCRIPTVIEWER, sPsViewers, "%s");
}
else if ("Windows".equals(sOsName)) {
// TODO: Get information from the windows registry
// Assume MikTeX // Assume MikTeX
externalApps.setApplication(ExternalApps.LATEX, "latex", "--interaction=batchmode %s"); externalApps.setApplication(ExternalApps.LATEX, "latex", "--interaction=batchmode %s");
externalApps.setApplication(ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s"); externalApps.setApplication(ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s");
@ -291,8 +275,21 @@ public final class ConfigurationDialog
externalApps.setApplication(ExternalApps.PDFVIEWER, "gsview32.exe", "-e \"%s\""); externalApps.setApplication(ExternalApps.PDFVIEWER, "gsview32.exe", "-e \"%s\"");
externalApps.setApplication(ExternalApps.POSTSCRIPTVIEWER, "gsview32.exe", "-e \"%s\""); externalApps.setApplication(ExternalApps.POSTSCRIPTVIEWER, "gsview32.exe", "-e \"%s\"");
} }
else { else { // Assume a unix-like system supporting the "which" command
// Unsupported OS configureApp(ExternalApps.LATEX, "latex", "--interaction=batchmode %s");
configureApp(ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s");
configureApp(ExternalApps.XELATEX, "xelatex", "--interaction=batchmode %s");
configureApp(ExternalApps.DVIPS, "dvips", "%s");
configureApp(ExternalApps.BIBTEX, "bibtex", "%s");
configureApp(ExternalApps.MAKEINDEX, "makeindex", "%s");
configureApp(ExternalApps.OOLATEX, "oolatex", "%s");
// We have several possible viewers
String[] sDviViewers = {"evince", "okular", "xdvi"};
configureApp(ExternalApps.DVIVIEWER, sDviViewers, "%s");
String[] sPdfViewers = {"evince", "okular", "xpdf"};
configureApp(ExternalApps.PDFVIEWER, sPdfViewers, "%s");
String[] sPsViewers = {"evince", "okular", "ghostview"};
configureApp(ExternalApps.POSTSCRIPTVIEWER, sPsViewers, "%s");
} }
changeApplication(xWindow); changeApplication(xWindow);
return true; return true;

10
source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java
View file

@ -158,10 +158,6 @@ public final class Writer4LaTeX extends WeakBase
if (updateMediaProperties()) { if (updateMediaProperties()) {
process(); process();
} }
else {
MessageBox msgBox = new MessageBox(m_xContext, m_xFrame);
msgBox.showMessage("Writer4LaTeX Error","Please install Writer2LaTeX version 1.0 or later");
}
} }
else { else {
warnNotSaved(); warnNotSaved();
@ -173,10 +169,6 @@ public final class Writer4LaTeX extends WeakBase
if (mediaProps!=null || updateMediaProperties()) { if (mediaProps!=null || updateMediaProperties()) {
process(); process();
} }
else {
MessageBox msgBox = new MessageBox(m_xContext, m_xFrame);
msgBox.showMessage("Writer4LaTeX Error","Please install Writer2LaTeX version 1.0 or later");
}
} }
else { else {
warnNotSaved(); warnNotSaved();
@ -318,6 +310,8 @@ public final class Writer4LaTeX extends WeakBase
// If Writer2LaTeX is not installed, this will return null // If Writer2LaTeX is not installed, this will return null
if (dialog==null) { if (dialog==null) {
mediaProps = null; mediaProps = null;
MessageBox msgBox = new MessageBox(m_xContext, m_xFrame);
msgBox.showMessage("Writer4LaTeX Error","Please install Writer2LaTeX version 1.0 or later");
return false; return false;
} }

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

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.2 (2009-03-30) * Version 1.2 (2009-04-25)
* *
*/ */
@ -33,7 +33,7 @@ public class ConverterFactory {
// Version information // Version information
private static final String VERSION = "1.1.1"; private static final String VERSION = "1.1.1";
private static final String DATE = "2008-04-23"; private static final String DATE = "2008-04-25";
/** Return version information /** Return version information
* @return the Writer2LaTeX version in the form * @return the Writer2LaTeX version in the form

45
source/java/writer2latex/latex/HeadingConverter.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
* Copyright: 2002-2008 by Henrik Just * Copyright: 2002-2009 by Henrik Just
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.0 (2008-11-22) * Version 1.2 (2009-04-28)
* *
*/ */
@ -205,6 +205,12 @@ public class HeadingConverter extends ConverterHelper {
String sMarginTop = style.getAbsoluteLength(XMLString.FO_MARGIN_TOP); String sMarginTop = style.getAbsoluteLength(XMLString.FO_MARGIN_TOP);
String sMarginBottom = style.getAbsoluteLength(XMLString.FO_MARGIN_BOTTOM); String sMarginBottom = style.getAbsoluteLength(XMLString.FO_MARGIN_BOTTOM);
String sMarginLeft = style.getAbsoluteLength(XMLString.FO_MARGIN_LEFT); String sMarginLeft = style.getAbsoluteLength(XMLString.FO_MARGIN_LEFT);
ListStyle outline = ofr.getOutlineStyle();
if (outline.isNewType(i)) {
// Override left margin with the value from the outline
sMarginLeft = outline.getLevelStyleProperty(i, XMLString.FO_MARGIN_LEFT);
}
String sSecName = hm.getName(i); String sSecName = hm.getName(i);
if (!comm.isEmpty()) { // have to create a cs for this heading if (!comm.isEmpty()) { // have to create a cs for this heading
@ -264,15 +270,34 @@ public class HeadingConverter extends ConverterHelper {
else { else {
if (!bOnlyNum) { if (!bOnlyNum) {
// Distance between label and text: // Distance between label and text:
String sDistance = outline.getLevelStyleProperty(i,XMLString.TEXT_MIN_LABEL_DISTANCE); String sSpaceChar="";
String sDistance=null;
if (outline.isNewType(i)) {
String sFormat = outline.getLevelStyleProperty(i, XMLString.TEXT_LABEL_FOLLOWED_BY);
if ("listtab".equals(sFormat)) {
String sMarginLeft = outline.getLevelStyleProperty(i, XMLString.FO_MARGIN_LEFT);
if (sMarginLeft==null) { sMarginLeft = "0cm"; }
String sTextIndent = outline.getLevelStyleProperty(i, XMLString.FO_TEXT_INDENT);
if (sTextIndent==null) { sTextIndent = "0cm"; }
String sTabPos = outline.getLevelStyleProperty(i, XMLString.TEXT_LIST_TAB_STOP_POSITION);
if (sTabPos==null) { sTabPos = "0cm"; }
sDistance = Misc.sub(sTabPos, Misc.add(sMarginLeft, sTextIndent));
}
else if ("space".equals(sFormat)) {
sSpaceChar="\\ ";
}
}
else {
sDistance = outline.getLevelStyleProperty(i,XMLString.TEXT_MIN_LABEL_DISTANCE);
}
ldp.append("\\newcommand\\@distance") ldp.append("\\newcommand\\@distance")
.append(hm.getName(i)).append("{"); .append(hm.getName(i)).append("{");
if (sDistance!=null) { if (sDistance!=null) {
ldp.append("\\hspace{").append(sDistance).append("}"); ldp.append("\\hspace{").append(sDistance).append("}");
} }
ldp.append("}").nl(); ldp.append("}").nl();
// Label width and alignment // Label width and alignment
String sLabelWidth = outline.getLevelStyleProperty(i,XMLString.TEXT_MIN_LABEL_WIDTH);
String sTextAlign = outline.getLevelStyleProperty(i,XMLString.FO_TEXT_ALIGN); String sTextAlign = outline.getLevelStyleProperty(i,XMLString.FO_TEXT_ALIGN);
String sAlignmentChar = "l"; // start (or left) is default String sAlignmentChar = "l"; // start (or left) is default
if (sTextAlign!=null) { if (sTextAlign!=null) {
@ -280,6 +305,16 @@ public class HeadingConverter extends ConverterHelper {
else if ("right".equals(sTextAlign)) { sAlignmentChar="r"; } else if ("right".equals(sTextAlign)) { sAlignmentChar="r"; }
else if ("center".equals(sTextAlign)) { sAlignmentChar="c"; } else if ("center".equals(sTextAlign)) { sAlignmentChar="c"; }
} }
String sLabelWidth = null;
if (outline.isNewType(i)) {
String sFormat = outline.getLevelStyleProperty(i, XMLString.TEXT_LABEL_FOLLOWED_BY);
if ("listtab".equals(sFormat) || sAlignmentChar=="r") {
sLabelWidth="0cm";
}
}
else {
sLabelWidth = outline.getLevelStyleProperty(i,XMLString.TEXT_MIN_LABEL_WIDTH);
}
// Textstyle to use for label: // Textstyle to use for label:
String sStyleName = outline.getLevelProperty(i,XMLString.TEXT_STYLE_NAME); String sStyleName = outline.getLevelProperty(i,XMLString.TEXT_STYLE_NAME);
// Prefix and suffix text to decorate the label // Prefix and suffix text to decorate the label
@ -291,7 +326,7 @@ public class HeadingConverter extends ConverterHelper {
ldp.append("\\newcommand\\@textstyle") ldp.append("\\newcommand\\@textstyle")
.append(hm.getName(i)).append("[1]{"); .append(hm.getName(i)).append("[1]{");
if (!bOnlyNum && sLabelWidth!=null) { if (!bOnlyNum && sLabelWidth!=null) {
ldp.append("\\makebox[").append(sLabelWidth).append("][").append(sAlignmentChar).append("]{"); ldp.append("\\protect\\makebox[").append(sLabelWidth).append("][").append(sAlignmentChar).append("]{");
} }
ldp.append(baText.getBefore()) ldp.append(baText.getBefore())
.append(sPrefix!=null ? sPrefix : "") .append(sPrefix!=null ? sPrefix : "")

715
source/java/writer2latex/latex/ListStyleConverter.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
* Copyright: 2002-2008 by Henrik Just * Copyright: 2002-2009 by Henrik Just
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.0 (2008-09-08) * Version 1.2 (2009-04-28)
* *
*/ */
@ -36,349 +36,402 @@ import writer2latex.latex.util.Context;
/* This class creates LaTeX code from OOo list styles /* This class creates LaTeX code from OOo list styles
*/ */
public class ListStyleConverter extends StyleConverter { public class ListStyleConverter extends StyleConverter {
boolean bNeedSaveEnumCounter = false; boolean bNeedSaveEnumCounter = false;
private Hashtable<String, String[]> listStyleLevelNames = new Hashtable<String, String[]>(); private Hashtable<String, String[]> listStyleLevelNames = new Hashtable<String, String[]>();
/** <p>Constructs a new <code>ListStyleConverter</code>.</p> /** <p>Constructs a new <code>ListStyleConverter</code>.</p>
*/ */
public ListStyleConverter(OfficeReader ofr, LaTeXConfig config, public ListStyleConverter(OfficeReader ofr, LaTeXConfig config,
ConverterPalette palette) { ConverterPalette palette) {
super(ofr,config,palette); super(ofr,config,palette);
} }
public void appendDeclarations(LaTeXDocumentPortion pack, LaTeXDocumentPortion decl) {
if (config.formatting()>=LaTeXConfig.CONVERT_MOST || !styleNames.isEmpty()) {
decl.append("% List styles").nl();
// May need an extra counter to handle continued numbering in lists
if (bNeedSaveEnumCounter) {
decl.append("\\newcounter{saveenum}").nl();
}
// If we export formatting, we need some hooks from lists to paragraphs:
if (config.formatting()>=LaTeXConfig.CONVERT_MOST) {
decl.append("\\newcommand\\writerlistleftskip{}").nl()
.append("\\newcommand\\writerlistparindent{}").nl()
.append("\\newcommand\\writerlistlabel{}").nl()
.append("\\newcommand\\writerlistremovelabel{")
.append("\\aftergroup\\let\\aftergroup\\writerlistparindent\\aftergroup\\relax")
.append("\\aftergroup\\let\\aftergroup\\writerlistlabel\\aftergroup\\relax}").nl();
}
super.appendDeclarations(pack,decl);
}
}
/** <p>Apply a list style to an ordered or unordered list.</p> */ public void appendDeclarations(LaTeXDocumentPortion pack, LaTeXDocumentPortion decl) {
public void applyListStyle(String sStyleName, int nLevel, boolean bOrdered, if (config.formatting()>=LaTeXConfig.CONVERT_MOST || !styleNames.isEmpty()) {
boolean bContinue, BeforeAfter ba) { decl.append("% List styles").nl();
// Step 1. We may have a style map, this always takes precedence // May need an extra counter to handle continued numbering in lists
String sDisplayName = ofr.getListStyles().getDisplayName(sStyleName); if (bNeedSaveEnumCounter) {
if (config.getListStyleMap().contains(sDisplayName)) { decl.append("\\newcounter{saveenum}").nl();
ba.add(config.getListStyleMap().getBefore(sDisplayName), }
config.getListStyleMap().getAfter(sDisplayName)); // If we export formatting, we need some hooks from lists to paragraphs:
return; if (config.formatting()>=LaTeXConfig.CONVERT_MOST) {
} decl.append("\\newcommand\\writerlistleftskip{}").nl()
// Step 2: The list style may not exist, or the user wants to ignore it. .append("\\newcommand\\writerlistparindent{}").nl()
// In this case we create default lists .append("\\newcommand\\writerlistlabel{}").nl()
ListStyle style = ofr.getListStyle(sStyleName); .append("\\newcommand\\writerlistremovelabel{")
if (style==null || config.formatting()<=LaTeXConfig.IGNORE_MOST) { .append("\\aftergroup\\let\\aftergroup\\writerlistparindent\\aftergroup\\relax")
if (nLevel<=4) { .append("\\aftergroup\\let\\aftergroup\\writerlistlabel\\aftergroup\\relax}").nl();
if (bOrdered) { }
ba.add("\\begin{enumerate}","\\end{enumerate}"); super.appendDeclarations(pack,decl);
} }
else { }
ba.add("\\begin{itemize}","\\end{itemize}");
} /** <p>Apply a list style to an ordered or unordered list.</p> */
} public void applyListStyle(String sStyleName, int nLevel, boolean bOrdered,
return; boolean bContinue, BeforeAfter ba) {
} // Step 1. We may have a style map, this always takes precedence
// Step 3: Export as default lists, but redefine labels String sDisplayName = ofr.getListStyles().getDisplayName(sStyleName);
if (config.formatting()==LaTeXConfig.CONVERT_BASIC) { if (config.getListStyleMap().contains(sDisplayName)) {
if (nLevel==1) { ba.add(config.getListStyleMap().getBefore(sDisplayName),
if (!styleNames.containsName(getDisplayName(sStyleName))) { config.getListStyleMap().getAfter(sDisplayName));
createListStyleLabels(sStyleName); return;
} }
ba.add("\\liststyle"+styleNames.getExportName(getDisplayName(sStyleName))+"\n",""); // Step 2: The list style may not exist, or the user wants to ignore it.
} // In this case we create default lists
if (nLevel<=4) { ListStyle style = ofr.getListStyle(sStyleName);
String sCounterName = listStyleLevelNames.get(sStyleName)[nLevel]; if (style==null || config.formatting()<=LaTeXConfig.IGNORE_MOST) {
if (bContinue && style.isNumber(nLevel)) { if (nLevel<=4) {
bNeedSaveEnumCounter = true; if (bOrdered) {
ba.add("\\setcounter{saveenum}{\\value{"+sCounterName+"}}\n",""); ba.add("\\begin{enumerate}","\\end{enumerate}");
} }
if (bOrdered) { else {
ba.add("\\begin{enumerate}","\\end{enumerate}"); ba.add("\\begin{itemize}","\\end{itemize}");
} }
else { }
ba.add("\\begin{itemize}","\\end{itemize}"); return;
} }
if (bContinue && style.isNumber(nLevel)) { // Step 3: Export as default lists, but redefine labels
ba.add("\n\\setcounter{"+sCounterName+"}{\\value{saveenum}}",""); if (config.formatting()==LaTeXConfig.CONVERT_BASIC) {
} if (nLevel==1) {
} if (!styleNames.containsName(getDisplayName(sStyleName))) {
return; createListStyleLabels(sStyleName);
} }
// Step 4: Export with formatting, as "Writer style" custom lists ba.add("\\liststyle"+styleNames.getExportName(getDisplayName(sStyleName))+"\n","");
if (nLevel<=4) { // TODO: Max level should not be fixed }
if (!styleNames.containsName(getDisplayName(sStyleName))) { if (nLevel<=4) {
createListStyle(sStyleName); String sCounterName = listStyleLevelNames.get(sStyleName)[nLevel];
} if (bContinue && style.isNumber(nLevel)) {
String sTeXName="list"+styleNames.getExportName(getDisplayName(sStyleName)) bNeedSaveEnumCounter = true;
+"level"+Misc.int2roman(nLevel); ba.add("\\setcounter{saveenum}{\\value{"+sCounterName+"}}\n","");
if (!bContinue && style.isNumber(nLevel)) { }
int nStartValue = Misc.getPosInteger(style.getLevelProperty(nLevel,XMLString.TEXT_START_VALUE),1)-1; if (bOrdered) {
ba.add("\\setcounter{"+sTeXName+"}{"+Integer.toString(nStartValue)+"}\n",""); ba.add("\\begin{enumerate}","\\end{enumerate}");
} }
ba.add("\\begin{"+sTeXName+"}","\\end{"+sTeXName+"}"); else {
} ba.add("\\begin{itemize}","\\end{itemize}");
} }
if (bContinue && style.isNumber(nLevel)) {
/** <p>Apply a list style to a list item.</p> */ ba.add("\n\\setcounter{"+sCounterName+"}{\\value{saveenum}}","");
public void applyListItemStyle(String sStyleName, int nLevel, boolean bHeader, }
boolean bRestart, int nStartValue, BeforeAfter ba) { }
// Step 1. We may have a style map, this always takes precedence return;
String sDisplayName = ofr.getListStyles().getDisplayName(sStyleName); }
if (config.getListItemStyleMap().contains(sDisplayName)) { // Step 4: Export with formatting, as "Writer style" custom lists
ba.add(config.getListItemStyleMap().getBefore(sDisplayName), if (nLevel<=4) { // TODO: Max level should not be fixed
config.getListItemStyleMap().getAfter(sDisplayName)); if (!styleNames.containsName(getDisplayName(sStyleName))) {
return; createListStyle(sStyleName);
} }
// Step 2: The list style may not exist, or the user wants to ignore it. String sTeXName="list"+styleNames.getExportName(getDisplayName(sStyleName))
// In this case we create default lists +"level"+Misc.int2roman(nLevel);
ListStyle style = ofr.getListStyle(sStyleName); if (!bContinue && style.isNumber(nLevel)) {
if (style==null || config.formatting()<=LaTeXConfig.IGNORE_MOST) { int nStartValue = Misc.getPosInteger(style.getLevelProperty(nLevel,XMLString.TEXT_START_VALUE),1)-1;
if (nLevel<=4) { ba.add("\\setcounter{"+sTeXName+"}{"+Integer.toString(nStartValue)+"}\n","");
if (bHeader) { ba.add("\\item[] ",""); } }
else { ba.add("\\item ",""); } ba.add("\\begin{"+sTeXName+"}","\\end{"+sTeXName+"}");
} }
return; }
}
// Step 3: Export as default lists (with redefined labels) /** <p>Apply a list style to a list item.</p> */
if (config.formatting()==LaTeXConfig.CONVERT_BASIC) { public void applyListItemStyle(String sStyleName, int nLevel, boolean bHeader,
if (nLevel<=4) { boolean bRestart, int nStartValue, BeforeAfter ba) {
if (bHeader) { // Step 1. We may have a style map, this always takes precedence
ba.add("\\item[] ",""); String sDisplayName = ofr.getListStyles().getDisplayName(sStyleName);
} if (config.getListItemStyleMap().contains(sDisplayName)) {
else if (bRestart && style.isNumber(nLevel)) { ba.add(config.getListItemStyleMap().getBefore(sDisplayName),
ba.add("\n\\setcounter{enum"+Misc.int2roman(nLevel) config.getListItemStyleMap().getAfter(sDisplayName));
+"}{"+(nStartValue-1)+"}\n\\item ",""); return;
} }
else { // Step 2: The list style may not exist, or the user wants to ignore it.
ba.add("\\item ",""); // In this case we create default lists
} ListStyle style = ofr.getListStyle(sStyleName);
} if (style==null || config.formatting()<=LaTeXConfig.IGNORE_MOST) {
return; if (nLevel<=4) {
} if (bHeader) { ba.add("\\item[] ",""); }
// Step 4: Export with formatting, as "Writer style" custom lists else { ba.add("\\item ",""); }
if (nLevel<=4 && !bHeader) { // TODO: Max level should not be fixed }
String sTeXName="list"+styleNames.getExportName(getDisplayName(sStyleName)) return;
+"level"+Misc.int2roman(nLevel); }
if (bRestart && style.isNumber(nLevel)) { // Step 3: Export as default lists (with redefined labels)
ba.add("\\setcounter{"+sTeXName+"}{"+(nStartValue-1)+"}\n",""); if (config.formatting()==LaTeXConfig.CONVERT_BASIC) {
} if (nLevel<=4) {
ba.add("\\item ",""); if (bHeader) {
} ba.add("\\item[] ","");
} }
else if (bRestart && style.isNumber(nLevel)) {
ba.add("\n\\setcounter{enum"+Misc.int2roman(nLevel)
+"}{"+(nStartValue-1)+"}\n\\item ","");
}
else {
ba.add("\\item ","");
}
}
return;
}
// Step 4: Export with formatting, as "Writer style" custom lists
if (nLevel<=4 && !bHeader) { // TODO: Max level should not be fixed
String sTeXName="list"+styleNames.getExportName(getDisplayName(sStyleName))
+"level"+Misc.int2roman(nLevel);
if (bRestart && style.isNumber(nLevel)) {
ba.add("\\setcounter{"+sTeXName+"}{"+(nStartValue-1)+"}\n","");
}
ba.add("\\item ","");
}
}
/** <p>Create labels for default lists (enumerate/itemize) based on /** <p>Create labels for default lists (enumerate/itemize) based on
* a List Style * a List Style
*/ */
private void createListStyleLabels(String sStyleName) { private void createListStyleLabels(String sStyleName) {
String sTeXName = styleNames.getExportName(getDisplayName(sStyleName)); String sTeXName = styleNames.getExportName(getDisplayName(sStyleName));
declarations.append("\\newcommand\\liststyle") declarations.append("\\newcommand\\liststyle")
.append(sTeXName).append("{%").nl(); .append(sTeXName).append("{%").nl();
ListStyle style = ofr.getListStyle(sStyleName); ListStyle style = ofr.getListStyle(sStyleName);
int nEnum = 0; int nEnum = 0;
int nItem = 0; int nItem = 0;
String sName[] = new String[5]; String sName[] = new String[5];
for (int i=1; i<=4; i++) { for (int i=1; i<=4; i++) {
if (style.isNumber(i)) { sName[i]="enum"+Misc.int2roman(++nEnum); } if (style.isNumber(i)) { sName[i]="enum"+Misc.int2roman(++nEnum); }
else { sName[i]="item"+Misc.int2roman(++nItem); } else { sName[i]="item"+Misc.int2roman(++nItem); }
} }
listStyleLevelNames.put(sStyleName, sName); listStyleLevelNames.put(sStyleName, sName);
createLabels(style, sName, 4, false, true, false, declarations); createLabels(style, sName, 4, false, true, false, declarations);
declarations.append("}").nl(); declarations.append("}").nl();
} }
/** <p>Create "Writer style" lists based on a List Style. /** <p>Create "Writer style" lists based on a List Style.
<p>A list in writer is really a sequence of numbered paragraphs, so <p>A list in writer is really a sequence of numbered paragraphs, so
this is also how we implement it in LaTeX. this is also how we implement it in LaTeX.
The enivronment + redefined \item defines three hooks: The enivronment + redefined \item defines three hooks:
\writerlistleftskip, \writerlistparindent, \writerlistlabel \writerlistleftskip, \writerlistparindent, \writerlistlabel
which are used by exported paragraph styles to apply numbering. which are used by exported paragraph styles to apply numbering.
*/ */
private void createListStyle(String sStyleName) { private void createListStyle(String sStyleName) {
ListStyle style = ofr.getListStyle(sStyleName); ListStyle style = ofr.getListStyle(sStyleName);
// Create labels // Create labels
String sTeXName = styleNames.getExportName(getDisplayName(sStyleName)); String sTeXName = styleNames.getExportName(getDisplayName(sStyleName));
String[] sLevelName = new String[5]; String[] sLevelName = new String[5];
for (int i=1; i<=4; i++) { for (int i=1; i<=4; i++) {
sLevelName[i]="list"+sTeXName+"level"+Misc.int2roman(i); sLevelName[i]="list"+sTeXName+"level"+Misc.int2roman(i);
} }
createLabels(style,sLevelName,4,true,false,true,declarations); createLabels(style,sLevelName,4,true,false,true,declarations);
// Create environments // Create environments
for (int i=1; i<=4; i++) { for (int i=1; i<=4; i++) {
String sSpaceBefore = getLength(style,i,XMLString.TEXT_SPACE_BEFORE); // The alignment of the label works the same for old and new format
String sLabelWidth = getLength(style,i,XMLString.TEXT_MIN_LABEL_WIDTH); String sTextAlign = style.getLevelStyleProperty(i,XMLString.FO_TEXT_ALIGN);
String sLabelDistance = getLength(style,i,XMLString.TEXT_MIN_LABEL_DISTANCE); String sAlignmentChar = "l"; // start (or left) is default
String sTextAlign = style.getLevelStyleProperty(i,XMLString.FO_TEXT_ALIGN); if (sTextAlign!=null) {
String sAlignmentChar = "l"; // start (or left) is default if ("end".equals(sTextAlign)) { sAlignmentChar="r"; }
if (sTextAlign!=null) { else if ("right".equals(sTextAlign)) { sAlignmentChar="r"; }
if ("end".equals(sTextAlign)) { sAlignmentChar="r"; } else if ("center".equals(sTextAlign)) { sAlignmentChar="c"; }
else if ("right".equals(sTextAlign)) { sAlignmentChar="r"; } }
else if ("center".equals(sTextAlign)) { sAlignmentChar="c"; }
}
declarations
.append("\\newenvironment{")
.append(sLevelName[i]).append("}{")
.append("\\def\\writerlistleftskip{\\addtolength\\leftskip{")
.append(Misc.add(sSpaceBefore,sLabelWidth)).append("}}")
.append("\\def\\writerlistparindent{}")
.append("\\def\\writerlistlabel{}");
// Redefine \item
declarations
.append("\\def\\item{")
.append("\\def\\writerlistparindent{\\setlength\\parindent{")
.append("-").append(sLabelWidth).append("}}")
.append("\\def\\writerlistlabel{");
if (style.isNumber(i)) {
declarations.append("\\stepcounter{")
.append(sLevelName[i]).append("}");
}
declarations
.append("\\makebox[").append(sLabelWidth).append("][")
.append(sAlignmentChar).append("]{")
.append("\\label").append(sLevelName[i]).append("}")
.append("\\hspace{").append(sLabelDistance).append("}")
.append("\\writerlistremovelabel}}}{}").nl();
}
}
/** <p>Create LaTeX list labels from an OOo list style. Examples:</p>
* <p>Bullets:</p>
* <pre>\newcommand\labelliststylei{\textbullet}
* \newcommand\labelliststyleii{*}
* \newcommand\labelliststyleiii{\textstylebullet{>}}</pre>
* <p>Numbering:</p>
* <pre>\newcounter{liststylei}
* \newcounter{liststyleii}[liststylei]
* \newcounter{liststyleiii}[liststyleii]
* \renewcommand\theliststylei{\Roman{liststylei}}
* \renewcommand\theliststyleii{\Roman{liststylei}.\arabic{liststyleii}}
* \renewcommand\theliststyleiii{\alph{liststyleiii}}
* \newcommand\labelliststylei{\textstylelabel{\theliststylei .}}
* \newcommand\labelliststyleii{\textstylelabel{\theliststyleii .}}
* \newcommand\labelliststyleiii{\textstylelabel{\theliststyleiii )}}</pre>
*
* @param <code>style</code> the OOo list style to use
* @param <code>sName</code> an array of label basenames to use
* @param <code>nMaxLevel</code> the highest level in this numbering
* @param <code>bDeclareCounters</code> true if counters should be declared (they may
* exist already, eg. "section", "subsection"... or "enumi", "enumii"...
* @param <code>bRenewLabels</code> true if labels should be defined with \renewcommand
* @param <code>bUseTextStyle</code> true if labels should be formatted with the associated text style
* (rather than \newcommand).
* @param <code>ldp</code> the <code>LaTeXDocumentPortion</code> to add LaTeX code to.
*/
private void createLabels(ListStyle style, String[] sName, int nMaxLevel,
boolean bDeclareCounters, boolean bRenewLabels,
boolean bUseTextStyle, LaTeXDocumentPortion ldp) {
// Declare counters if required (eg. "\newcounter{countername1}[countername2]")
if (bDeclareCounters) {
int j = 0;
for (int i=1; i<=nMaxLevel; i++) {
if (style.isNumber(i)) {
ldp.append("\\newcounter{").append(sName[i]).append("}");
if (j>0) { ldp.append("[").append(sName[j]).append("]"); }
ldp.nl();
j = i;
}
}
}
// Create numbering for each level (eg. "\arabic{countername}")
String[] sNumFormat = new String[nMaxLevel+1];
for (int i=1; i<=nMaxLevel; i++) {
String s = numFormat(style.getLevelProperty(i,XMLString.STYLE_NUM_FORMAT));
if (s==null) { sNumFormat[i]=""; }
else { sNumFormat[i] = s + "{" + sName[i] + "}"; }
}
// Create numberings (ie. define "\thecountername"):
for (int i=1; i<=nMaxLevel; i++) {
if (style.isNumber(i)) {
ldp.append("\\renewcommand\\the").append(sName[i]).append("{");
int nLevels = Misc.getPosInteger(style.getLevelProperty(i,XMLString.TEXT_DISPLAY_LEVELS),1);
for (int j=i-nLevels+1; j<i; j++) {
if (style.isNumber(j)) {
ldp.append(sNumFormat[j]).append(".");
}
}
ldp.append(sNumFormat[i]);
ldp.append("}").nl();
}
}
// Create labels (ie. define "\labelcountername"):
for (int i=1; i<=nMaxLevel; i++) {
ldp.append(bRenewLabels ? "\\renewcommand" : "\\newcommand")
.append("\\label").append(sName[i]).append("{");
// Apply text style if required
BeforeAfter baText = new BeforeAfter();
if (bUseTextStyle) {
String sStyleName = style.getLevelProperty(i,XMLString.TEXT_STYLE_NAME);
palette.getCharSc().applyTextStyle(sStyleName,baText,new Context());
}
// Create label content if (style.isNewType(i)) {
if (style.isNumber(i)) { // The new type from ODT 1.2 is somewhat weird; we take it step by step
String sPrefix = style.getLevelProperty(i,XMLString.STYLE_NUM_PREFIX);
String sSuffix = style.getLevelProperty(i,XMLString.STYLE_NUM_SUFFIX); // Fist the list style defines a left margin (leftskip) and a first line indent (parindent)
// Apply style // to *replace* the values from the paragraph style
ldp.append(baText.getBefore()); String sMarginLeft = style.getLevelStyleProperty(i, XMLString.FO_MARGIN_LEFT);
if (sPrefix!=null) { ldp.append(sPrefix); } if (sMarginLeft==null) { sMarginLeft = "0cm"; }
ldp.append("\\the").append(sName[i]); String sTextIndent = style.getLevelStyleProperty(i, XMLString.FO_TEXT_INDENT);
if (sSuffix!=null) { ldp.append(sSuffix); } if (sTextIndent==null) { sTextIndent = "0cm"; }
ldp.append(baText.getAfter());
} // Generate the LaTeX code to replace these values
else if (style.isBullet(i)) { String sDefWriterlistleftskip = "\\def\\writerlistleftskip{\\setlength\\leftskip{"+sMarginLeft+"}}";
String sBullet = style.getLevelProperty(i,XMLString.TEXT_BULLET_CHAR); String sDefWriterlistparindent = "\\def\\writerlistparindent{\\setlength\\parindent{"+sTextIndent+"}}";
// Apply style
ldp.append(baText.getBefore()); // Next we have three types of label format: listtab, space, nothing
if (sBullet!=null) { String sFormat = style.getLevelStyleProperty(i, XMLString.TEXT_LABEL_FOLLOWED_BY);
// Bullets are usually symbols, so this should be OK:
ldp.append(palette.getI18n().convert(sBullet,false,"en")); // Generate LaTeX code to typeset the label, followed by a space character if required
} String sTheLabel = "\\label"+sLevelName[i]+("space".equals(sFormat) ? "\\ " : "");
ldp.append(baText.getAfter());
} if ("listtab".equals(sFormat) || sAlignmentChar=="r") {
else { // In these cases we typeset the label aligned at a zero width box (rather than as an integrated part of the text)
// TODO: Support images! sTheLabel = "\\makebox[0cm][" + sAlignmentChar + "]{"+sTheLabel+"}";
ldp.append("\\textbullet");
} if ("listtab".equals(sFormat)) {
// In the tab case we must the calculate the hspace to put *after* the zero width box
// This defines the position of an additional tab stop, which really means the start position of the text *after* the label
String sTabPos = style.getLevelStyleProperty(i, XMLString.TEXT_LIST_TAB_STOP_POSITION);
if (sTabPos==null) { sTabPos = "0cm"; }
sTheLabel += "\\hspace{"+Misc.sub(sTabPos, Misc.add(sMarginLeft, sTextIndent))+"}";
}
}
ldp.append("}").nl(); // We are now ready to declare the list style
} declarations.append("\\newenvironment{").append(sLevelName[i]).append("}{")
} // Initialize hooks
.append(sDefWriterlistleftskip)
/* Helper: Get a length property that defaults to 0cm. */ .append("\\def\\writerlistparindent{}")
private String getLength(ListStyle style,int nLevel,String sProperty) { .append("\\def\\writerlistlabel{}")
String s = style.getLevelStyleProperty(nLevel,sProperty); // Redefine \item
if (s==null) { return "0cm"; } .append("\\def\\item{")
else { return s; } // The new parindent is the position of the label
} .append(sDefWriterlistparindent)
.append("\\def\\writerlistlabel{");
/* Helper: Get display name, or original name if it doesn't exist */ if (style.isNumber(i)) {
private String getDisplayName(String sName) { declarations.append("\\stepcounter{").append(sLevelName[i]).append("}");
String sDisplayName = ofr.getListStyles().getDisplayName(sName); }
return sDisplayName!=null ? sDisplayName : sName; declarations.append(sTheLabel).append("\\writerlistremovelabel}}}{}").nl();
} }
else {
String sSpaceBefore = getLength(style,i,XMLString.TEXT_SPACE_BEFORE);
String sLabelWidth = getLength(style,i,XMLString.TEXT_MIN_LABEL_WIDTH);
String sLabelDistance = getLength(style,i,XMLString.TEXT_MIN_LABEL_DISTANCE);
declarations
.append("\\newenvironment{")
.append(sLevelName[i]).append("}{")
.append("\\def\\writerlistleftskip{\\addtolength\\leftskip{")
.append(Misc.add(sSpaceBefore,sLabelWidth)).append("}}")
.append("\\def\\writerlistparindent{}")
.append("\\def\\writerlistlabel{}");
// Redefine \item
declarations
.append("\\def\\item{")
.append("\\def\\writerlistparindent{\\setlength\\parindent{")
.append("-").append(sLabelWidth).append("}}")
.append("\\def\\writerlistlabel{");
if (style.isNumber(i)) {
declarations.append("\\stepcounter{")
.append(sLevelName[i]).append("}");
}
declarations
.append("\\makebox[").append(sLabelWidth).append("][")
.append(sAlignmentChar).append("]{")
.append("\\label").append(sLevelName[i]).append("}")
.append("\\hspace{").append(sLabelDistance).append("}")
.append("\\writerlistremovelabel}}}{}").nl();
}
}
}
/* Helper: Convert OOo number format to LaTeX number format */ /** <p>Create LaTeX list labels from an OOo list style. Examples:</p>
public static final String numFormat(String sFormat){ * <p>Bullets:</p>
if ("1".equals(sFormat)) { return "\\arabic"; } * <pre>\newcommand\labelliststylei{\textbullet}
else if ("i".equals(sFormat)) { return "\\roman"; } * \newcommand\labelliststyleii{*}
else if ("I".equals(sFormat)) { return "\\Roman"; } * \newcommand\labelliststyleiii{\textstylebullet{>}}</pre>
else if ("a".equals(sFormat)) { return "\\alph"; } * <p>Numbering:</p>
else if ("A".equals(sFormat)) { return "\\Alph"; } * <pre>\newcounter{liststylei}
else { return null; } * \newcounter{liststyleii}[liststylei]
} * \newcounter{liststyleiii}[liststyleii]
* \renewcommand\theliststylei{\Roman{liststylei}}
* \renewcommand\theliststyleii{\Roman{liststylei}.\arabic{liststyleii}}
* \renewcommand\theliststyleiii{\alph{liststyleiii}}
* \newcommand\labelliststylei{\textstylelabel{\theliststylei .}}
* \newcommand\labelliststyleii{\textstylelabel{\theliststyleii .}}
* \newcommand\labelliststyleiii{\textstylelabel{\theliststyleiii )}}</pre>
*
* @param <code>style</code> the OOo list style to use
* @param <code>sName</code> an array of label basenames to use
* @param <code>nMaxLevel</code> the highest level in this numbering
* @param <code>bDeclareCounters</code> true if counters should be declared (they may
* exist already, eg. "section", "subsection"... or "enumi", "enumii"...
* @param <code>bRenewLabels</code> true if labels should be defined with \renewcommand
* @param <code>bUseTextStyle</code> true if labels should be formatted with the associated text style
* (rather than \newcommand).
* @param <code>ldp</code> the <code>LaTeXDocumentPortion</code> to add LaTeX code to.
*/
private void createLabels(ListStyle style, String[] sName, int nMaxLevel,
boolean bDeclareCounters, boolean bRenewLabels,
boolean bUseTextStyle, LaTeXDocumentPortion ldp) {
// Declare counters if required (eg. "\newcounter{countername1}[countername2]")
if (bDeclareCounters) {
int j = 0;
for (int i=1; i<=nMaxLevel; i++) {
if (style.isNumber(i)) {
ldp.append("\\newcounter{").append(sName[i]).append("}");
if (j>0) { ldp.append("[").append(sName[j]).append("]"); }
ldp.nl();
j = i;
}
}
}
// Create numbering for each level (eg. "\arabic{countername}")
String[] sNumFormat = new String[nMaxLevel+1];
for (int i=1; i<=nMaxLevel; i++) {
String s = numFormat(style.getLevelProperty(i,XMLString.STYLE_NUM_FORMAT));
if (s==null) { sNumFormat[i]=""; }
else { sNumFormat[i] = s + "{" + sName[i] + "}"; }
}
// Create numberings (ie. define "\thecountername"):
for (int i=1; i<=nMaxLevel; i++) {
if (style.isNumber(i)) {
ldp.append("\\renewcommand\\the").append(sName[i]).append("{");
int nLevels = Misc.getPosInteger(style.getLevelProperty(i,XMLString.TEXT_DISPLAY_LEVELS),1);
for (int j=i-nLevels+1; j<i; j++) {
if (style.isNumber(j)) {
ldp.append(sNumFormat[j]).append(".");
}
}
ldp.append(sNumFormat[i]);
ldp.append("}").nl();
}
}
// Create labels (ie. define "\labelcountername"):
for (int i=1; i<=nMaxLevel; i++) {
ldp.append(bRenewLabels ? "\\renewcommand" : "\\newcommand")
.append("\\label").append(sName[i]).append("{");
// Apply text style if required
BeforeAfter baText = new BeforeAfter();
if (bUseTextStyle) {
String sStyleName = style.getLevelProperty(i,XMLString.TEXT_STYLE_NAME);
palette.getCharSc().applyTextStyle(sStyleName,baText,new Context());
}
// Create label content
if (style.isNumber(i)) {
String sPrefix = style.getLevelProperty(i,XMLString.STYLE_NUM_PREFIX);
String sSuffix = style.getLevelProperty(i,XMLString.STYLE_NUM_SUFFIX);
// Apply style
ldp.append(baText.getBefore());
if (sPrefix!=null) { ldp.append(sPrefix); }
ldp.append("\\the").append(sName[i]);
if (sSuffix!=null) { ldp.append(sSuffix); }
ldp.append(baText.getAfter());
}
else if (style.isBullet(i)) {
String sBullet = style.getLevelProperty(i,XMLString.TEXT_BULLET_CHAR);
// Apply style
ldp.append(baText.getBefore());
if (sBullet!=null) {
// Bullets are usually symbols, so this should be OK:
ldp.append(palette.getI18n().convert(sBullet,false,"en"));
}
ldp.append(baText.getAfter());
}
else {
// TODO: Support images!
ldp.append("\\textbullet");
}
ldp.append("}").nl();
}
}
/* Helper: Get a length property that defaults to 0cm. */
private String getLength(ListStyle style,int nLevel,String sProperty) {
String s = style.getLevelStyleProperty(nLevel,sProperty);
if (s==null) { return "0cm"; }
else { return s; }
}
/* Helper: Get display name, or original name if it doesn't exist */
private String getDisplayName(String sName) {
String sDisplayName = ofr.getListStyles().getDisplayName(sName);
return sDisplayName!=null ? sDisplayName : sName;
}
/* Helper: Convert OOo number format to LaTeX number format */
public static final String numFormat(String sFormat){
if ("1".equals(sFormat)) { return "\\arabic"; }
else if ("i".equals(sFormat)) { return "\\roman"; }
else if ("I".equals(sFormat)) { return "\\Roman"; }
else if ("a".equals(sFormat)) { return "\\alph"; }
else if ("A".equals(sFormat)) { return "\\Alph"; }
else { return null; }
}
} }

82
source/java/writer2latex/office/ListStyle.java
View file

@ -16,18 +16,17 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
* Copyright: 2002 by Henrik Just * Copyright: 2002-2009 by Henrik Just
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 0.4 (2004-02-16) * Version 1.2 (2009-04-27)
* *
*/ */
package writer2latex.office; package writer2latex.office;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import writer2latex.util.Misc; import writer2latex.util.Misc;
@ -69,6 +68,11 @@ public class ListStyle extends OfficeStyle {
public boolean isImage(int i) { public boolean isImage(int i) {
return XMLString.TEXT_LIST_LEVEL_STYLE_IMAGE.equals(level[i].getName()); return XMLString.TEXT_LIST_LEVEL_STYLE_IMAGE.equals(level[i].getName());
} }
// Return true if this level is using the new list formatting of ODT 1.2
public boolean isNewType(int i) {
return "label-alignment".equals(getLevelStyleProperty(i,XMLString.TEXT_LIST_LEVEL_POSITION_AND_SPACE_MODE));
}
public String getLevelProperty(int i, String sName) { public String getLevelProperty(int i, String sName) {
if (i>=1 && i<=MAX_LEVEL) { if (i>=1 && i<=MAX_LEVEL) {
@ -90,39 +94,53 @@ public class ListStyle extends OfficeStyle {
public void loadStyleFromDOM(Node node) { public void loadStyleFromDOM(Node node) {
super.loadStyleFromDOM(node); super.loadStyleFromDOM(node);
// Collect level information from child elements: // Collect level information from child elements (text:list-level-style-*):
if (node.hasChildNodes()){ Node child = node.getFirstChild();
NodeList nl = node.getChildNodes(); while (child!=null) {
int nLen = nl.getLength(); if (child.getNodeType()==Node.ELEMENT_NODE){
for (int i = 0; i < nLen; i++ ) { String sLevel = Misc.getAttribute(child,XMLString.TEXT_LEVEL);
Node child=nl.item(i); if (sLevel!=null) {
if (child.getNodeType()==Node.ELEMENT_NODE){ int nLevel = Misc.getPosInteger(sLevel,1);
String sLevel = Misc.getAttribute(child,XMLString.TEXT_LEVEL); if (nLevel>=1 && nLevel<=MAX_LEVEL) {
if (sLevel!=null) { loadLevelPropertiesFromDOM(nLevel,child);
int nLevel = Misc.getPosInteger(sLevel,1);
if (nLevel>=1 && nLevel<=MAX_LEVEL) {
level[nLevel].loadFromDOM(child);
// Also include style:properties
if (child.hasChildNodes()){
NodeList nl2 = child.getChildNodes();
int nLen2 = nl2.getLength();
for (int i2 = 0; i2 < nLen2; i2++ ) {
Node child2=nl2.item(i2);
if (child2.getNodeType()==Node.ELEMENT_NODE){
if (child2.getNodeName().equals(XMLString.STYLE_PROPERTIES)) {
levelStyle[nLevel].loadFromDOM(child2);
}
if (child2.getNodeName().equals(XMLString.STYLE_LIST_LEVEL_PROPERTIES)) { // oasis
levelStyle[nLevel].loadFromDOM(child2);
}
}
}
}
}
} }
} }
} }
child = child.getNextSibling();
} }
} }
private void loadLevelPropertiesFromDOM(int nLevel, Node node) {
// Load the attributes
level[nLevel].loadFromDOM(node);
// Also include style:properties
Node child = node.getFirstChild();
while (child!=null) {
if (child.getNodeType()==Node.ELEMENT_NODE){
if (child.getNodeName().equals(XMLString.STYLE_PROPERTIES)) {
levelStyle[nLevel].loadFromDOM(child);
loadLevelLabelPropertiesFromDOM(nLevel,node);
}
if (child.getNodeName().equals(XMLString.STYLE_LIST_LEVEL_PROPERTIES)) { // oasis
levelStyle[nLevel].loadFromDOM(child);
loadLevelLabelPropertiesFromDOM(nLevel,child);
}
}
child = child.getNextSibling();
}
}
private void loadLevelLabelPropertiesFromDOM(int nLevel, Node node) {
// Merge the properties from style:list-level-label-alignment
Node child = node.getFirstChild();
while (child!=null) {
if (child.getNodeType()==Node.ELEMENT_NODE){
if (child.getNodeName().equals(XMLString.STYLE_LIST_LEVEL_LABEL_ALIGNMENT)) {
levelStyle[nLevel].loadFromDOM(child);
}
}
child = child.getNextSibling();
}
}
} }

9
source/java/writer2latex/office/XMLString.java
View file

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.2 (2009-03-26) * Version 1.2 (2009-03-27)
* *
*/ */
@ -146,6 +146,7 @@ public class XMLString {
public static final String STYLE_PAGE_LAYOUT_PROPERTIES="style:page-layout-properties"; // oasis public static final String STYLE_PAGE_LAYOUT_PROPERTIES="style:page-layout-properties"; // oasis
public static final String STYLE_DRAWING_PAGE_PROPERTIES="style:drawing-page-properties"; // oasis public static final String STYLE_DRAWING_PAGE_PROPERTIES="style:drawing-page-properties"; // oasis
public static final String STYLE_HEADER_FOOTER_PROPERTIES="style:header-footer-properties"; // oasis public static final String STYLE_HEADER_FOOTER_PROPERTIES="style:header-footer-properties"; // oasis
public static final String STYLE_LIST_LEVEL_LABEL_ALIGNMENT="style:list-level-label-alignment"; // oasis 1.2
public static final String STYLE_BACKGROUND_IMAGE="style:background-image"; public static final String STYLE_BACKGROUND_IMAGE="style:background-image";
public static final String STYLE_COLUMNS="style:columns"; public static final String STYLE_COLUMNS="style:columns";
public static final String STYLE_HEADER="style:header"; public static final String STYLE_HEADER="style:header";
@ -359,7 +360,11 @@ public class XMLString {
public static final String TEXT_DISPLAY="text:display"; public static final String TEXT_DISPLAY="text:display";
public static final String TEXT_DISPLAY_OUTLINE_LEVEL="text:display-outline-level"; public static final String TEXT_DISPLAY_OUTLINE_LEVEL="text:display-outline-level";
public static final String TEXT_SEPARATION_CHARACTER="text:separation-character"; public static final String TEXT_SEPARATION_CHARACTER="text:separation-character";
public static final String TEXT_LIST_LEVEL_POSITION_AND_SPACE_MODE="text:list-level-position-and-space-mode"; // oasis 1.2
public static final String TEXT_LABEL_FOLLOWED_BY="text:label-followed-by"; // oasis 1.2
public static final String TEXT_LIST_TAB_STOP_POSITION="text:list-tab-stop-position"; // oasis 1.2
public static final String TEXT_IDENTIFIER="text:identifier"; public static final String TEXT_IDENTIFIER="text:identifier";
public static final String TEXT_BIBLIOGRAPHY_TYPE="text:bibliography-type"; public static final String TEXT_BIBLIOGRAPHY_TYPE="text:bibliography-type";
public static final String TEXT_BIBILIOGRAPHIC_TYPE="text:bibiliographic-type"; // bug in OOo 1.0 public static final String TEXT_BIBILIOGRAPHIC_TYPE="text:bibiliographic-type"; // bug in OOo 1.0

2
source/java/writer2latex/xhtml/Converter.java
View file

@ -610,7 +610,7 @@ public class Converter extends ConverterBase {
for (String sElement : sElements) { for (String sElement : sElements) {
String[] sNameVal = sElement.split("="); String[] sNameVal = sElement.split("=");
if (sNameVal.length>=2) { if (sNameVal.length>=2) {
anchor.setAttribute(sNameVal[0],sNameVal[1]); anchor.setAttribute(sNameVal[0].trim(),sNameVal[1].trim());
} }
} }
} }

2
source/oxt/writer4latex/Addons.xcu
View file

@ -35,6 +35,7 @@
<value/> <value/>
</prop> </prop>
</node> </node>
<!-- maybe later
<node oor:name="menu2" oor:op="replace"> <node oor:name="menu2" oor:op="replace">
<prop oor:name="Context" oor:type="xs:string"> <prop oor:name="Context" oor:type="xs:string">
<value>com.sun.star.text.TextDocument</value> <value>com.sun.star.text.TextDocument</value>
@ -53,6 +54,7 @@
<value/> <value/>
</prop> </prop>
</node> </node>
-->
<node oor:name="menu3" oor:op="replace"> <node oor:name="menu3" oor:op="replace">
<prop oor:name="Context" oor:type="xs:string"> <prop oor:name="Context" oor:type="xs:string">
<value>com.sun.star.text.TextDocument</value> <value>com.sun.star.text.TextDocument</value>