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

W2X start value for lists

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@44 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2009-12-15 20:17:56 +00:00
parent 612de5abff
commit 9627e8b57c
4 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/distro/changelog.txt
View file

@ -2,6 +2,9 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
---------- version 1.1.1 ---------- ---------- version 1.1.1 ----------
[w2x] Added support for text:start-value in outline numbering and list styles (the latter
is only relevant if use_list_hack is true)
[all] Use zeropadding on exported images (ie file-img001 etc.) [all] Use zeropadding on exported images (ie file-img001 etc.)
[w2l] Bugfix: Add \par after display equation when formatting>=convert_most [w2l] Bugfix: Add \par after display equation when formatting>=convert_most

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

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.2 (2009-12-07) * Version 1.2 (2009-12-15)
* *
*/ */
@ -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 = "2009-12-07"; private static final String DATE = "2009-12-15";
/** Return version information /** Return version information
* @return the Writer2LaTeX version in the form * @return the Writer2LaTeX version in the form

13
source/java/writer2latex/office/ListCounter.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-2005 by Henrik Just * Copyright: 2002-2009 by Henrik Just
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.0 (2007-10-17) * Version 1.2 (2009-12-15)
* *
*/ */
@ -34,8 +34,9 @@ import writer2latex.util.*;
* *
*/ */
public class ListCounter { public class ListCounter {
private int nCounter[] = new int[11]; private int[] nCounter = new int[11];
private String sNumFormat[] = new String[11]; private String[] sNumFormat = new String[11];
private int[] nStartValue = new int[11];
private ListStyle style; private ListStyle style;
private int nLevel=1; // current level private int nLevel=1; // current level
@ -53,8 +54,10 @@ public class ListCounter {
this.style = style; this.style = style;
for (int i=1; i<=10; i++) { for (int i=1; i<=10; i++) {
sNumFormat[i] = style.getLevelProperty(i,XMLString.STYLE_NUM_FORMAT); sNumFormat[i] = style.getLevelProperty(i,XMLString.STYLE_NUM_FORMAT);
nStartValue[i] = Misc.getPosInteger(style.getLevelProperty(i, XMLString.TEXT_START_VALUE),1);
} }
} }
restart(1);
} }
public ListCounter step(int nLevel) { public ListCounter step(int nLevel) {
@ -73,7 +76,7 @@ public class ListCounter {
} }
public ListCounter restart(int nLevel) { public ListCounter restart(int nLevel) {
restart(nLevel,0); restart(nLevel,nStartValue[nLevel]-1);
return this; return this;
} }

12
source/java/writer2latex/xhtml/TextConverter.java
View file

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.0 (2009-09-05) * Version 1.2 (2009-12-15)
* *
*/ */
@ -751,14 +751,12 @@ public class TextConverter extends ConverterHelper {
// Restart numbering, if required // Restart numbering, if required
if (counter!=null) { if (counter!=null) {
boolean bContinueNumbering = "true".equals(Misc.getAttribute(onode,XMLString.TEXT_CONTINUE_NUMBERING)); boolean bContinueNumbering = "true".equals(Misc.getAttribute(onode,XMLString.TEXT_CONTINUE_NUMBERING));
if (bContinueNumbering) { if (!bContinueNumbering && counter!=null) {
if (config.xhtmlUseListHack()) {
hnode.setAttribute("start",Integer.toString(counter.getValue(nLevel)+1));
}
}
else if (counter!=null) {
counter.restart(nLevel); counter.restart(nLevel);
} }
if (config.xhtmlUseListHack() && counter.getValue(nLevel)>0) {
hnode.setAttribute("start",Integer.toString(counter.getValue(nLevel)+1));
}
} }
if (onode.hasChildNodes()) { if (onode.hasChildNodes()) {