Browse Source

added support for user's defined style classes

luca.conte 10 years ago
parent
commit
29f3b82fc2
3 changed files with 11 additions and 11 deletions
  1. 3 0
      .classpath
  2. 1 1
      pom.xml
  3. 7 10
      src/main/java/org/bazu/jotex/OdtEPUBlisher.java

+ 3 - 0
.classpath

@@ -22,5 +22,8 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry exported="true" kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar"/>
+	<classpathentry exported="true" kind="var" path="M2_REPO/org/odftoolkit/odfdom-java/0.8.7/odfdom-java-0.8.7.jar"/>
+	<classpathentry exported="true" kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

+ 1 - 1
pom.xml

@@ -4,7 +4,7 @@
 	<groupId>org.bazu</groupId>
 	<artifactId>jotex</artifactId>
 	<packaging>jar</packaging>
-	<version>0.4.1-SNAPSHOT</version>
+	<version>0.4.2-SNAPSHOT</version>
 	<name>jotex</name>
 	<url>http://maven.apache.org</url>
 

+ 7 - 10
src/main/java/org/bazu/jotex/OdtEPUBlisher.java

@@ -196,11 +196,9 @@ public class OdtEPUBlisher {
         Utils.processMetadata(getOdt().getMetaDom(), getEpub(), getXpath());
 
 
-        // stylesPropsToCSS( getOdtDocument().getDocumentStyles().get,
-        // className)
-        // System.out.println(getOdtDocument().getDocumentStyles());
-        extractDefaultStyles(getOdt().getDocumentStyles());
 
+         //System.out.println(getOdt().getDocumentStyles());
+        extractDefaultStyles(getOdt().getDocumentStyles());
         if(getCoverPath()!=null&&getCoverPath().trim().length()>0){//a cover will be processed
             
            
@@ -915,21 +913,20 @@ public class OdtEPUBlisher {
                 stylesPropsToCSS(s.getStyleProperties(), "h9", null);
                 stylesPropsToCSS(s.getStyleProperties(), "h10", null);
 
-            }
-            if (s.getAttribute("style:name").startsWith("Heading")) {
+            }else    if (s.getAttribute("style:name").startsWith("Heading")) {
                 String level = s.getAttribute("style:default-outline-level");
                 if (level != null && level.trim().length() > 0) {
                     stylesPropsToCSS(s.getStyleProperties(), "h" + level, null);
                 }
-            }
-            if (s.getAttribute("style:name").startsWith("Standard")) {
+            }else  if (s.getAttribute("style:name").startsWith("Standard")) {
 
                 stylesPropsToCSS(s.getStyleProperties(), "p", null);
 
-            }
-            if (s.getAttribute("style:name").startsWith("Footnote")) {
+            }else  if (s.getAttribute("style:name").startsWith("Footnote")) {
                 stylesPropsToCSS(s.getStyleProperties(), null, "Footnote");
                 stylesPropsToCSS(s.getStyleProperties(), null, "fnDiv");
+            }else if (s.getAttribute("style:name")!=null&&!s.getAttribute("style:name").trim().equals("")) {
+            	  stylesPropsToCSS(s.getStyleProperties(), null, s.getAttribute("style:name"));
             }
             if (isDebugMode()) {
                 System.out.println("Nome: " + s.getAttribute("style:name") + " Classe: "