From 9627e8b57c95f669e96c4eef7300b0f2f4c0220a Mon Sep 17 00:00:00 2001
From: henrikjust <henrikjust@f0f2a975-2e09-46c8-9428-3b39399b9f3c>
Date: Tue, 15 Dec 2009 20:17:56 +0000
Subject: [PATCH] W2X start value for lists

git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@44 f0f2a975-2e09-46c8-9428-3b39399b9f3c
---
 source/distro/changelog.txt                        |  3 +++
 source/java/writer2latex/api/ConverterFactory.java |  4 ++--
 source/java/writer2latex/office/ListCounter.java   | 13 ++++++++-----
 source/java/writer2latex/xhtml/TextConverter.java  | 12 +++++-------
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt
index 2ea804d..a2790c7 100644
--- a/source/distro/changelog.txt
+++ b/source/distro/changelog.txt
@@ -2,6 +2,9 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
 
 ---------- 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.)
 
 [w2l] Bugfix: Add \par after display equation when formatting>=convert_most
diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java
index 19e618a..9642db2 100644
--- a/source/java/writer2latex/api/ConverterFactory.java
+++ b/source/java/writer2latex/api/ConverterFactory.java
@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2009-12-07)
+ *  Version 1.2 (2009-12-15)
  *
  */
  
@@ -33,7 +33,7 @@ public class ConverterFactory {
 
     // Version information
     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 the Writer2LaTeX version in the form
diff --git a/source/java/writer2latex/office/ListCounter.java b/source/java/writer2latex/office/ListCounter.java
index 18a9584..b18d46b 100644
--- a/source/java/writer2latex/office/ListCounter.java
+++ b/source/java/writer2latex/office/ListCounter.java
@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2005 by Henrik Just
+ *  Copyright: 2002-2009 by Henrik Just
  *
  *  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 {
-    private int nCounter[] = new int[11];
-    private String sNumFormat[] = new String[11];
+    private int[] nCounter = new int[11];
+    private String[] sNumFormat = new String[11];
+    private int[] nStartValue = new int[11];
     private ListStyle style;
     private int nLevel=1; // current level
 	
@@ -53,8 +54,10 @@ public class ListCounter {
             this.style = style;
             for (int i=1; i<=10; i++) {
                 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) {
@@ -73,7 +76,7 @@ public class ListCounter {
     }
 	
     public ListCounter restart(int nLevel) {
-        restart(nLevel,0);
+        restart(nLevel,nStartValue[nLevel]-1);
         return this;
     }
 	
diff --git a/source/java/writer2latex/xhtml/TextConverter.java b/source/java/writer2latex/xhtml/TextConverter.java
index c379dc5..990d858 100644
--- a/source/java/writer2latex/xhtml/TextConverter.java
+++ b/source/java/writer2latex/xhtml/TextConverter.java
@@ -20,7 +20,7 @@
  *
  *  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
         if (counter!=null) {
             boolean bContinueNumbering = "true".equals(Misc.getAttribute(onode,XMLString.TEXT_CONTINUE_NUMBERING));
-            if (bContinueNumbering) {
-                if (config.xhtmlUseListHack()) {
-                    hnode.setAttribute("start",Integer.toString(counter.getValue(nLevel)+1));
-                }
-            }
-            else if (counter!=null) {
+            if (!bContinueNumbering && counter!=null) {
                 counter.restart(nLevel);
             }
+            if (config.xhtmlUseListHack() && counter.getValue(nLevel)>0) {
+                hnode.setAttribute("start",Integer.toString(counter.getValue(nLevel)+1));                	
+            }
         }
 
         if (onode.hasChildNodes()) {