diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt
index 3934723..bf006d3 100644
--- a/source/distro/changelog.txt
+++ b/source/distro/changelog.txt
@@ -2,6 +2,8 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
---------- version 1.1.7 ----------
+[w2l] Added the attribute break-after to paragraph style maps with values none, line and par (default)
+
[w2x] Bugfix: Positioning of text boxes (left, right, center, floating) now works correctly
[w2x] Support the value "biggest" for the style:wrap attribute
diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java
index ecffe4a..fe94d0e 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 (2011-03-29)
+ * Version 1.2 (2011-04-20)
*
*/
@@ -33,7 +33,7 @@ public class ConverterFactory {
// Version information
private static final String VERSION = "1.1.7";
- private static final String DATE = "2011-03-29";
+ private static final String DATE = "2011-04-20";
/** Return the Writer2LaTeX version in the form
* (major version).(minor version).(patch level)
diff --git a/source/java/writer2latex/latex/LaTeXConfig.java b/source/java/writer2latex/latex/LaTeXConfig.java
index 1f8d265..d4c4611 100644
--- a/source/java/writer2latex/latex/LaTeXConfig.java
+++ b/source/java/writer2latex/latex/LaTeXConfig.java
@@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
- * Version 1.2 (2011-02-01)
+ * Version 1.2 (2011-03-30)
*
*/
@@ -42,6 +42,7 @@ import writer2latex.latex.util.HeadingMap;
import writer2latex.latex.i18n.ClassicI18n;
import writer2latex.latex.i18n.ReplacementTrie;
import writer2latex.latex.util.StyleMap;
+import writer2latex.latex.util.StyleMapItem;
import writer2latex.util.Misc;
public class LaTeXConfig extends writer2latex.base.ConfigBase {
@@ -437,6 +438,7 @@ public class LaTeXConfig extends writer2latex.base.ConfigBase {
if ("paragraph".equals(sFamily)) {
if (elm.hasAttribute("line-break")) { attr.put("line-break", elm.getAttribute("line-break")); }
+ if (elm.hasAttribute("break-after")) { attr.put("break-after", elm.getAttribute("break-after")); }
if (elm.hasAttribute("verbatim")) { attr.put("verbatim", elm.getAttribute("verbatim")); }
parMap.put(sName, attr);
}
@@ -552,6 +554,9 @@ public class LaTeXConfig extends writer2latex.base.ConfigBase {
if (attr.containsKey("line-break")) {
smNode.setAttribute("line-break",attr.get("line-break"));
}
+ if (attr.containsKey("break-after")) {
+ smNode.setAttribute("break-after", attr.get("break-after"));
+ }
if (attr.containsKey("verbatim")) {
smNode.setAttribute("verbatim",attr.get("verbatim"));
}
@@ -593,13 +598,16 @@ public class LaTeXConfig extends writer2latex.base.ConfigBase {
String sAfter = attr.containsKey("after") ? attr.get("after") : "";
String sNext = attr.containsKey("next") ? attr.get("next") : "";
boolean bLineBreak = !"false".equals(attr.get("line-break"));
+ int nBreakAfter = StyleMapItem.PAR;
+ String sBreakAfter = attr.get("break-after");
+ if ("none".equals(sBreakAfter)) { nBreakAfter = StyleMapItem.NONE; }
+ else if ("line".equals(sBreakAfter)) { nBreakAfter = StyleMapItem.LINE; }
boolean bVerbatim = "true".equals(attr.get("verbatim"));
- map.put(sName, sBefore, sAfter, sNext, bLineBreak, bVerbatim);
+ map.put(sName, sBefore, sAfter, sNext, bLineBreak, nBreakAfter, bVerbatim);
}
return map;
}
-
// Return current string replace as a trie
public ReplacementTrie getStringReplace() {
ReplacementTrie trie = new ReplacementTrie();
diff --git a/source/java/writer2latex/latex/ParConverter.java b/source/java/writer2latex/latex/ParConverter.java
index b068301..bdd57bd 100644
--- a/source/java/writer2latex/latex/ParConverter.java
+++ b/source/java/writer2latex/latex/ParConverter.java
@@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
- * Version 1.2 (2011-03-29)
+ * Version 1.2 (2011-03-30)
*
*/
@@ -36,6 +36,7 @@ import writer2latex.util.*;
import writer2latex.office.*;
import writer2latex.latex.util.BeforeAfter;
import writer2latex.latex.util.Context;
+import writer2latex.latex.util.StyleMapItem;
//import writer2latex.latex.util.HeadingMap;
import writer2latex.latex.util.StyleMap;
@@ -149,20 +150,23 @@ public class ParConverter extends StyleConverter {
palette.getI18n().pushSpecialTable(palette.getCharSc().getFontName(ofr.getParStyle(sStyleName)));
// Apply the style
+ int nBreakAfter;
BeforeAfter ba = new BeforeAfter();
if (oc.isInTable()) {
- applyCellParStyle(sStyleName,ba,ic,OfficeReader.getCharacterCount(node)==0,bLastInBlock);
+ nBreakAfter = applyCellParStyle(sStyleName,ba,ic,OfficeReader.getCharacterCount(node)==0,bLastInBlock);
}
else {
- applyParStyle(sStyleName,ba,ic,OfficeReader.getCharacterCount(node)==0);
+ nBreakAfter = applyParStyle(sStyleName,ba,ic,OfficeReader.getCharacterCount(node)==0);
}
// Do conversion
ldp.append(ba.getBefore());
palette.getInlineCv().traverseInlineText(node,ldp,ic);
ldp.append(ba.getAfter());
- // Add a blank line except within verbatim and last in a block:
- if (!bLastInBlock && !ic.isVerbatim() && !ic.isInSimpleTable()) { ldp.nl(); }
+ // Add line break if desired
+ if (nBreakAfter!=StyleMapItem.NONE) { ldp.nl(); }
+ // Add a blank line except within verbatim and last in a block, and if desired by style map
+ if (!bLastInBlock && !ic.isVerbatim() && !ic.isInSimpleTable() && nBreakAfter==StyleMapItem.PAR) { ldp.nl(); }
// Flush any pending index marks, reference marks and floating frames
palette.getFieldCv().flushReferenceMarks(ldp,oc);
@@ -173,15 +177,14 @@ public class ParConverter extends StyleConverter {
palette.getI18n().popSpecialTable();
}
- private void applyCellParStyle(String sName, BeforeAfter ba, Context context, boolean bNoTextPar, boolean bLastInBlock) {
+ private int applyCellParStyle(String sName, BeforeAfter ba, Context context, boolean bNoTextPar, boolean bLastInBlock) {
// Paragraph formatting for paragraphs within table cells
// We always use simple par styles here
- // Add newline if *between* paragraphs
- if (!bLastInBlock) { ba.add("","\n"); }
-
context.setVerbatim(false);
+ int nBreakAfter = bLastInBlock ? StyleMapItem.NONE : StyleMapItem.PAR;
+
if (context.isInSimpleTable()) {
if (config.formatting()!=LaTeXConfig.IGNORE_ALL) {
// only character formatting!
@@ -192,6 +195,7 @@ public class ParConverter extends StyleConverter {
if (ba.getBefore().length()>0) { ba.add(" ",""); }
}
}
+ nBreakAfter = StyleMapItem.NONE;
}
else if (config.getParStyleMap().contains(ofr.getParStyles().getDisplayName(sName))) {
// We have a style map in the configuration
@@ -205,6 +209,7 @@ public class ParConverter extends StyleConverter {
if (sBefore.length()>0) { ba.add("\n",""); }
if (sAfter.length()>0 && !"}".equals(sAfter)) { ba.add("","\n"); }
}
+ nBreakAfter = sm.getBreakAfter(sDisplayName);
if (sm.getVerbatim(sDisplayName)) { context.setVerbatim(true); }
}
else if (bNoTextPar && (config.formatting()==LaTeXConfig.CONVERT_BASIC || config.formatting()==LaTeXConfig.IGNORE_MOST) ) {
@@ -227,6 +232,7 @@ public class ParConverter extends StyleConverter {
else {
if ("center".equals(sTextAlign)) { ba.add("{\\centering ","\\par}"); }
else if ("end".equals(sTextAlign)) { ba.add("{\\raggedleft ","\\par}"); }
+ nBreakAfter = StyleMapItem.LINE;
}
}
}
@@ -274,8 +280,10 @@ public class ParConverter extends StyleConverter {
// Update context
StyleWithProperties style = ofr.getParStyle(sName);
- if (style==null) { return; }
- context.updateFormattingFromStyle(style);
+ if (style!=null) {
+ context.updateFormattingFromStyle(style);
+ }
+ return nBreakAfter;
}
@@ -285,15 +293,15 @@ public class ParConverter extends StyleConverter {
* @param context the current context. This method will use and update the formatting context
* @param bNoTextPar true if this paragraph has no text content (hence character formatting is not needed)
*/
- private void applyParStyle(String sName, BeforeAfter ba, Context context, boolean bNoTextPar) {
- applyParStyle(sName,ba,context,bNoTextPar,true);
+ private int applyParStyle(String sName, BeforeAfter ba, Context context, boolean bNoTextPar) {
+ return applyParStyle(sName,ba,context,bNoTextPar,true);
}
- private void applyParStyle(String sName, BeforeAfter ba, Context context, boolean bNoTextPar, boolean bBreakInside) {
+ private int applyParStyle(String sName, BeforeAfter ba, Context context, boolean bNoTextPar, boolean bBreakInside) {
// No style specified?
- if (sName==null) { return; }
+ if (sName==null) { return StyleMapItem.PAR; }
- if (context.isInSimpleTable()) {
+ /*if (context.isInSimpleTable()) {
if (config.formatting()!=LaTeXConfig.IGNORE_ALL) {
// only character formatting!
StyleWithProperties style = ofr.getParStyle(sName);
@@ -304,9 +312,11 @@ public class ParConverter extends StyleConverter {
}
}
}
- else if (bNoTextPar && (config.formatting()==LaTeXConfig.CONVERT_BASIC || config.formatting()==LaTeXConfig.IGNORE_MOST) ) {
- // Always end with a line break
- ba.add("","\n");
+ else*/
+ int nBreakAfter = StyleMapItem.PAR;
+
+ if (bNoTextPar && (config.formatting()==LaTeXConfig.CONVERT_BASIC || config.formatting()==LaTeXConfig.IGNORE_MOST) ) {
+ //TODO: If there is a style map, we should respect that despite the fact that the paragraph is empty
// only alignment!
StyleWithProperties style = ofr.getParStyle(sName);
if (style!=null) {
@@ -314,13 +324,11 @@ public class ParConverter extends StyleConverter {
// Note: Left justified text is exported as full justified text!
palette.getPageSc().applyPageBreak(style,false,ba);
String sTextAlign = style.getProperty(XMLString.FO_TEXT_ALIGN,true);
- if ("center".equals(sTextAlign)) { ba.add("{\\centering ","\\par}"); }
- else if ("end".equals(sTextAlign)) { ba.add("{\\raggedleft ","\\par}"); }
+ if ("center".equals(sTextAlign)) { ba.add("{\\centering ","\\par}"); nBreakAfter = StyleMapItem.LINE; }
+ else if ("end".equals(sTextAlign)) { ba.add("{\\raggedleft ","\\par}"); nBreakAfter = StyleMapItem.LINE; }
}
}
else {
- // Always end with a line break
- ba.add("","\n");
// Apply the style
if (!styleMap.contains(sName)) { createParStyle(sName); }
String sBefore = styleMap.getBefore(sName);
@@ -331,13 +339,18 @@ public class ParConverter extends StyleConverter {
if (sBefore.length()>0) { ba.add("\n",""); }
if (sAfter.length()>0 && !"}".equals(sAfter)) { ba.add("","\n"); }
}
+ nBreakAfter = styleMap.getBreakAfter(sName);
+ System.out.println(sName+"-"+nBreakAfter);
}
// Update context
StyleWithProperties style = ofr.getParStyle(sName);
- if (style==null) { return; }
- context.updateFormattingFromStyle(style);
+ if (style!=null) {
+ context.updateFormattingFromStyle(style);
+ }
context.setVerbatim(styleMap.getVerbatim(sName));
+
+ return nBreakAfter;
}
/** Convert a paragraph style to LaTeX.
@@ -354,7 +367,7 @@ public class ParConverter extends StyleConverter {
StyleMap sm = config.getParStyleMap();
if (sm.contains(sDisplayName)) {
styleMap.put(sName,sm.getBefore(sDisplayName),sm.getAfter(sDisplayName),
- sm.getLineBreak(sDisplayName),sm.getVerbatim(sDisplayName));
+ sm.getLineBreak(sDisplayName),sm.getBreakAfter(sDisplayName),sm.getVerbatim(sDisplayName));
return;
}
// Does the style exist?
@@ -396,7 +409,7 @@ public class ParConverter extends StyleConverter {
String sParentName = style.getParentName();
if (styleMap.getVerbatim(sParentName)) {
styleMap.put(style.getName(),styleMap.getBefore(sParentName),styleMap.getAfter(sParentName),
- styleMap.getLineBreak(sParentName),styleMap.getVerbatim(sParentName));
+ styleMap.getLineBreak(sParentName),styleMap.getBreakAfter(sParentName),styleMap.getVerbatim(sParentName));
return;
}
applyParStyle(sParentName,baPar,context,false,false);
@@ -413,7 +426,7 @@ public class ParConverter extends StyleConverter {
ba.add(baText.getBefore(),baText.getAfter());
boolean bLineBreak = styleMap.getLineBreak(sParentName);
if (!bLineBreak && !baText.isEmpty()) { ba.add(" ",""); }
- styleMap.put(style.getName(),ba.getBefore(),ba.getAfter(),bLineBreak,false);
+ styleMap.put(style.getName(),ba.getBefore(),ba.getAfter(),bLineBreak,styleMap.getBreakAfter(sParentName), false);
}
private void createSimpleParStyle(StyleWithProperties style, Context context) {
diff --git a/source/java/writer2latex/latex/util/StyleMap.java b/source/java/writer2latex/latex/util/StyleMap.java
index beff59d..cad57c7 100644
--- a/source/java/writer2latex/latex/util/StyleMap.java
+++ b/source/java/writer2latex/latex/util/StyleMap.java
@@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
- * Copyright: 2002-2009 by Henrik Just
+ * Copyright: 2002-2011 by Henrik Just
*
* All Rights Reserved.
*
- * Version 1.2 (2009-09-28)
+ * Version 1.2 (2011-03-30)
*
*/
@@ -32,22 +32,24 @@ import java.util.Enumeration;
public class StyleMap {
private Hashtable items = new Hashtable();
- public void put(String sName, String sBefore, String sAfter, String sNext, boolean bLineBreak, boolean bVerbatim) {
+ public void put(String sName, String sBefore, String sAfter, String sNext, boolean bLineBreak, int nBreakAfter, boolean bVerbatim) {
StyleMapItem item = new StyleMapItem();
item.sBefore = sBefore;
item.sAfter = sAfter;
item.sNext = ";"+sNext+";";
item.bLineBreak = bLineBreak;
+ item.nBreakAfter = nBreakAfter;
item.bVerbatim = bVerbatim;
items.put(sName,item);
}
- public void put(String sName, String sBefore, String sAfter, boolean bLineBreak, boolean bVerbatim) {
+ public void put(String sName, String sBefore, String sAfter, boolean bLineBreak, int nBreakAfter, boolean bVerbatim) {
StyleMapItem item = new StyleMapItem();
item.sBefore = sBefore;
item.sAfter = sAfter;
item.sNext = ";;";
item.bLineBreak = bLineBreak;
+ item.nBreakAfter = nBreakAfter;
item.bVerbatim = bVerbatim;
items.put(sName,item);
}
@@ -58,6 +60,7 @@ public class StyleMap {
item.sAfter = sAfter;
item.sNext = ";"+sNext+";";
item.bLineBreak = true;
+ item.nBreakAfter = StyleMapItem.PAR;
item.bVerbatim = bVerbatim;
items.put(sName,item);
}
@@ -68,6 +71,7 @@ public class StyleMap {
item.sAfter = sAfter;
item.sNext = ";;";
item.bLineBreak = true;
+ item.nBreakAfter = StyleMapItem.PAR;
item.bVerbatim = false;
items.put(sName,item);
}
@@ -97,6 +101,10 @@ public class StyleMap {
public boolean getLineBreak(String sName) {
return contains(sName) && items.get(sName).bLineBreak;
}
+
+ public int getBreakAfter(String sName) {
+ return contains(sName) ? items.get(sName).nBreakAfter : StyleMapItem.PAR;
+ }
public boolean getVerbatim(String sName) {
return contains(sName) && items.get(sName).bVerbatim;
diff --git a/source/java/writer2latex/latex/util/StyleMapItem.java b/source/java/writer2latex/latex/util/StyleMapItem.java
index 8055b5c..5328714 100644
--- a/source/java/writer2latex/latex/util/StyleMapItem.java
+++ b/source/java/writer2latex/latex/util/StyleMapItem.java
@@ -16,21 +16,26 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
- * Copyright: 2002-2007 by Henrik Just
+ * Copyright: 2002-2011 by Henrik Just
*
* All Rights Reserved.
*
- * Version 1.0 (2007-07-30)
+ * Version 1.2 (2011-03-30)
*
*/
package writer2latex.latex.util;
// A struct to hold data about a style map
-class StyleMapItem {
+public class StyleMapItem {
+ public static final int NONE = 0;
+ public static final int LINE = 1;
+ public static final int PAR = 2;
+
String sBefore;
String sAfter;
String sNext;
+ int nBreakAfter;
boolean bLineBreak;
boolean bVerbatim;
}