Changeset 1f1699f

Timestamp:

05/11/10 09:29:40 (3 years ago)

Author:

Aurélien Bompard <aurelien@…>

Branches:

master

Children:

ef52efc

Parents:

b620e6f

git-author:

Aurélien Bompard <aurelien@…> (05/11/10 09:29:40)

git-committer:

Aurélien Bompard <aurelien@…> (05/11/10 09:29:40)

Message:

Improve support for the HTML5 <aside> element

Files:

• tests/test_html5.py (added)
• xsl/document-content/html5.xsl (modified) (1 diff)
• xsl/styles/main-styles.xsl (modified) (1 diff)

xsl/document-content/html5.xsl

@@ -69 +69 @@
 
 <xsl:template match="h:aside">
-    <!-- TODO: make a floating frame -->
-    <xsl:apply-templates/>
+    <text:p text:style-name="Text_20_body">
+        <draw:frame draw:style-name="Marginalia"
+                    text:anchor-type="paragraph"
+                    svg:width="8.5cm" style:rel-width="50%">
+            <draw:text-box fo:min-height="0.5cm">
+                <xsl:apply-templates/>
+            </draw:text-box>
+        </draw:frame>
+    </text:p>
 </xsl:template>
 

xsl/styles/main-styles.xsl

@@ -361 +361 @@
     </xsl:if>
 
+    <xsl:if test="count(//office:styles/style:style[@style:name = 'Marginalia']) = 0">
+        <style:style style:name="Marginalia" style:display-name="Marginalia"
+                     style:family="graphic">
+            <style:graphic-properties svg:width="8.5cm" style:rel-width="50%"
+                                      fo:min-height="0.5cm"
+                                      text:anchor-type="paragraph"
+                                      svg:x="0cm" svg:y="0cm"
+                                      fo:margin-left="0.2cm"
+                                      fo:margin-right="0cm"
+                                      fo:margin-top="0.1cm"
+                                      fo:margin-bottom="0.1cm"
+                                      style:wrap="parallel"
+                                      style:number-wrapped-paragraphs="no-limit"
+                                      style:wrap-contour="false"
+                                      style:vertical-pos="top"
+                                      style:vertical-rel="paragraph"
+                                      style:horizontal-pos="right"
+                                      style:horizontal-rel="paragraph"
+                                      fo:background-color="transparent"
+                                      style:background-transparency="100%"
+                                      fo:padding="0.15cm"
+                                      fo:border="0.002cm solid #000000"
+                                      style:shadow="none">
+            </style:graphic-properties>
+        </style:style>
+    </xsl:if>
+
 </xsl:template>