Changeset 1087

Timestamp:

02/26/10 14:41:23 (2 years ago)

Author:

jharrop

Message:

Basic character formatting in SVG output

Location:

trunk/docx4j/src/pptx4j/java/org/pptx4j

Files:

• convert/out/svginhtml/SvgExporter.java (modified) (6 diffs)
• convert/out/svginhtml/pptx2svginhtml.xslt (modified) (1 diff)
• model/TextStyles.java (modified) (6 diffs)

trunk/docx4j/src/pptx4j/java/org/pptx4j/convert/out/svginhtml/SvgExporter.java

@@ -22 +22 @@
 import org.docx4j.convert.out.html.HtmlExporterNG;
 import org.docx4j.convert.out.html.AbstractHtmlExporter.HtmlSettings;
+import org.docx4j.dml.CTTextCharacterProperties;
 import org.docx4j.dml.CTTextListStyle;
 import org.docx4j.dml.CTTextParagraphProperties;
@@ -36 +37 @@
 import org.docx4j.wml.PPr;
 import org.docx4j.wml.Pict;
+import org.docx4j.wml.RPr;
+//import org.docx4j.wml.RPr;
 import org.docx4j.wml.Style;
 import org.plutext.jaxb.svg11.Line;
@@ -131 +134 @@
                 String pStyleVal;
         
+                System.out.println("cNvPrName: " + cNvPrName + "; " + "phType: " + phType );
+                
                 if (cNvPrName.toLowerCase().indexOf("subtitle")>-1
                                 || phType.toLowerCase().indexOf("subtitle")>-1) {
@@ -139 +144 @@
                         pStyleVal = "Lvl" + level + "Master" + rl.getMasterNumber() + "Title";
                 } else {
-                        pStyleVal = "Lvl" + level + "Master" + rl.getMasterNumber() + "Body";                   
-                }
+                        // eg cNvPrName: TextBox 2; phType:
+                        pStyleVal = "Lvl" + level + "Master" + rl.getMasterNumber() + "Other";                  
+                }
+                System.out.println("--> " + pStyleVal );
                 
         try {
@@ -291 +298 @@
         
 }
-    
-//    public static CTTextListStyle unmarshalFormatting(NodeIterator lstStyleNodeIt ) {
+
+        public static DocumentFragment createBlockForR(
+                        PresentationMLPackage pmlPackage, NodeIterator rPrNodeIt,
+                        NodeIterator childResults) {
+
+                DocumentFragment docfrag = null;
+                Document d = null;
+                Element span = null;
+
+                try {
+
+                        // Create a DOM builder and parse the fragment
+                        DocumentBuilderFactory factory = DocumentBuilderFactory
+                                        .newInstance();
+                        d = factory.newDocumentBuilder().newDocument();
+
+                        span = d.createElement("span");
+                        d.appendChild(span);
+
+                        CTTextCharacterProperties textCharProps = (CTTextCharacterProperties) nodeToObjectModel(
+                                        rPrNodeIt.nextNode(), CTTextCharacterProperties.class);
+
+                        RPr rPr = TextStyles.getWmlRPr(textCharProps);
+
+                        // Does our rPr contain anything else?
+                        StringBuffer inlineStyle = new StringBuffer();
+                        HtmlExporterNG.createCss(pmlPackage, rPr, inlineStyle);
+                        if (!inlineStyle.toString().equals("")) {
+                                span.setAttribute("style", inlineStyle.toString());
+                        }
+
+                        Node n = childResults.nextNode();
+                        XmlUtils.treeCopy((DTMNodeProxy) n, span);
+
+                } catch (Exception e) {
+                        e.printStackTrace();
+                        log.error(e);
+                        // If something went wrong with the formatting,
+                        // still try to display the text!
+                        Node n = childResults.nextNode();
+                        XmlUtils.treeCopy((DTMNodeProxy) n, span);
+                }
+
+                // Machinery
+                docfrag = d.createDocumentFragment();
+                docfrag.appendChild(d.getDocumentElement());
+                return docfrag;
+
+        }
+
+        //    public static CTTextListStyle unmarshalFormatting(NodeIterator lstStyleNodeIt ) {
 //              
 //      // Get the pPr node as a JAXB object,
@@ -467 +523 @@
 
     public static Object nodeToObjectModel(Node n, Class declaredType) throws Docx4JException {
+        
+        if (n==null) {
+                throw new Docx4JException("null input");
+        }
+        
+//      if (log.isDebugEnabled() ) {
+//              System.out.println("IN: " + XmlUtils.w3CDomNodeToString(n));
+//      }
+        
                 Object jaxb=null;
                 try {

trunk/docx4j/src/pptx4j/java/org/pptx4j/convert/out/svginhtml/pptx2svginhtml.xslt

@@ -155 +155 @@
 
  <xsl:template match="a:r">
-        <xsl:apply-templates select="a:t"/>
+                <xsl:variable name="rPr" select="a:rPr"/>
+                <xsl:variable name="childResults"><xsl:apply-templates select="a:t"/></xsl:variable>
+                <xsl:copy-of select="java:org.pptx4j.convert.out.svginhtml.SvgExporter.createBlockForR(
+                        $wmlPackage, $rPr,
+                         $childResults)" />
  </xsl:template>
 

trunk/docx4j/src/pptx4j/java/org/pptx4j/model/TextStyles.java

@@ -33 +33 @@
 import org.docx4j.UnitsOfMeasurement;
 import org.docx4j.XmlUtils;
+import org.docx4j.dml.CTTextCharacterProperties;
 import org.docx4j.dml.CTTextListStyle;
 import org.docx4j.dml.CTTextParagraphProperties;
@@ -45 +46 @@
 import org.docx4j.openpackaging.parts.PresentationML.MainPresentationPart;
 import org.docx4j.openpackaging.parts.PresentationML.SlideMasterPart;
+import org.docx4j.wml.BooleanDefaultTrue;
 import org.docx4j.wml.HpsMeasure;
 import org.docx4j.wml.Jc;
@@ -54 +56 @@
 import org.docx4j.wml.Style;
 import org.docx4j.wml.Styles;
+import org.docx4j.wml.U;
+import org.docx4j.wml.UnderlineEnumeration;
 import org.docx4j.wml.Style.Name;
 import org.pptx4j.pml.CTSlideMasterTextStyles;
@@ -209 +213 @@
 //              <w:sz w:val="28" />
                         if (lvlPPr.getDefRPr().getSz()!=null) {                         
-                                HpsMeasure sz = factory.createHpsMeasure();
-                                int halfPts = Math.round(lvlPPr.getDefRPr().getSz()/50); 
-                                sz.setVal( BigInteger.valueOf(halfPts) );
-                                rPr.setSz(sz);
+                                rPr.setSz( convertFontSize(lvlPPr.getDefRPr().getSz()) );
                         }
                         
@@ -233 +234 @@
                 return rPr;
         }       
+        
+        private static HpsMeasure convertFontSize(Integer in) {
+                ObjectFactory factory = Context.getWmlObjectFactory();
+                HpsMeasure sz = factory.createHpsMeasure();
+                int halfPts = Math.round(in/50); 
+                sz.setVal( BigInteger.valueOf(halfPts) );
+                return sz;
+        }
+        
         // From Main Presentation Part
         public static List<Style> generateWordStylesFromPresentationPart(CTTextListStyle textStyles, String suffix,  
@@ -346 +356 @@
         }       
     
-        
+        public static RPr getWmlRPr(CTTextCharacterProperties in) {
+                
+                ObjectFactory factory = Context.getWmlObjectFactory();
+                RPr rPr = factory.createRPr();
+
+                if (in==null) {
+                        System.out.println("Was passed null");
+                        return rPr;
+                }
+                
+//        <a:rPr  i="true" />           
+                if (in.isI()!=null && in.isI()) {
+                        rPr.setI( new BooleanDefaultTrue() );
+                }
+                
+//        <a:rPr  b="true"
+                if (in.isB()!=null && in.isB()) {
+                        rPr.setB( new BooleanDefaultTrue() );
+                }
+                
+//        <a:rPr  u="sng" 
+                if (in.getU()!=null) {
+                        U u = factory.createU(); 
+                        u.setVal(UnderlineEnumeration.SINGLE);
+                        rPr.setU(u);
+                }
+//        <a:rPr  sz="4000" 
+                if (in.getSz()!=null) {
+                        rPr.setSz(
+                                        convertFontSize(in.getSz() ) );
+                }
+                
+                return rPr;
+
+        }
 }