Changeset 2a386e2

Timestamp:

08/10/10 19:48:59 (3 years ago)

Author:

Aurélien Bompard <aurelien@…>

Branches:

master

Children:

6734727

Parents:

ebf3cf3

git-author:

Aurélien Bompard <aurelien@…> (08/10/10 19:48:59)

git-committer:

Aurélien Bompard <aurelien@…> (08/10/10 19:48:59)

Message:

Handle non-breaking spaces

Files:

• tests/data/1.xml (modified) (3 diffs)
• tests/test_block.py (modified) (1 diff)
• xsl/document-content/block.xsl (modified) (1 diff)

tests/data/1.xml

@@ -316 +316 @@
 Example:
 </text:p>
-<text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" text:style-name="Preformatted_20_Text"> llama::<text:line-break/>   some kind of mammal, with hair<text:line-break/> ppython::<text:line-break/>   some kind of reptile, without hair<text:line-break/>   (can you spot the typo?)</text:p><text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" text:style-name="Text_20_body">
+<text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" text:style-name="Preformatted_20_Text"> llama::<text:line-break/>   some kind of mammal, with hair<text:line-break/> ppython::<text:line-break/>   some kind of reptile, without hair<text:line-break/>   (can you spot the typo?)</text:p><text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" text:style-name="Text_20_body">
 Display:
 </text:p>
@@ -372 +372 @@
 Display:
 </text:p>
-<text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" text:style-name="Preformatted_20_Text"> def HelloWorld():<text:line-break/>     print "Hello World"</text:p><!--section level 2-->
+<text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" text:style-name="Preformatted_20_Text"> def HelloWorld():<text:line-break/>     print "Hello World"</text:p><!--section level 2-->
 <text:h xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" text:style-name="Heading_20_2" text:outline-level="2">Blockquotes</text:h>
 <text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" text:style-name="Text_20_body">
@@ -380 +380 @@
 Example:
 </text:p>
-<text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" text:style-name="Preformatted_20_Text">  This text is a quote from someone else.</text:p><text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" text:style-name="Text_20_body">
+<text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" text:style-name="Preformatted_20_Text">  This text is a quote from someone else.</text:p><text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" text:style-name="Text_20_body">
 Display:
 </text:p>

tests/test_block.py

@@ -38 +38 @@
         odt = xhtml2odt(html)
         print odt
-        assert str(odt) == '<?xml version="1.0" encoding="utf-8"?>\n<text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" text:style-name="Preformatted_20_Text">   Line with spaces </text:p>\n'
+        # note: one of the spaces below is a non-breaking space, can you spot it ? ;-)
+        assert str(odt) == '<?xml version="1.0" encoding="utf-8"?>\n<text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" text:style-name="Preformatted_20_Text">   Line with spaces </text:p>\n'
 
     def test_pre4(self):

xsl/document-content/block.xsl

@@ -103 +103 @@
             </xsl:call-template>
         </xsl:when>
+        <xsl:when test="contains($content, '  ')">
+            <xsl:value-of select="substring-before($content, '  ')"/>
+            <xsl:text> &#xa0;</xsl:text>
+            <xsl:call-template name="pre.line">
+                <xsl:with-param name="content" select="substring-after($content, '  ')"/>
+            </xsl:call-template>
+        </xsl:when>
         <xsl:otherwise>
             <xsl:value-of select="string($content)"/>