[PATCH 03/17] XHTML export: remove trailing space

andrew-libreoffice.org at pileofstuff.org andrew-libreoffice.org at pileofstuff.org
Thu Aug 14 14:53:43 PDT 2014


From: Andrew Sayers <andrew-libreoffice.org at pileofstuff.org>

---
 .../source/xslt/odf2xhtml/export/common/body.xsl   | 68 +++++++++++-----------
 .../export/common/styles/style_mapping_css.xsl     |  6 +-
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git filter/source/xslt/odf2xhtml/export/common/body.xsl filter/source/xslt/odf2xhtml/export/common/body.xsl
index 3196fac..4353c7c 100644
--- filter/source/xslt/odf2xhtml/export/common/body.xsl
+++ filter/source/xslt/odf2xhtml/export/common/body.xsl
@@ -151,7 +151,7 @@
 			<xsl:apply-templates select="@* | node()">
 				<xsl:with-param name="globalData" select="$globalData"/>
 			</xsl:apply-templates>
-				
+
 		</xsl:element>
 		</xsl:if>
 	</xsl:template>
@@ -170,13 +170,13 @@
 			</xsl:choose>
         </xsl:attribute>
     </xsl:template>
-    
+
 	<xsl:template match="text:sequence">
 		<xsl:param name="globalData"/>
 
 		<xsl:element namespace="{$namespace}" name="a">
 			<xsl:apply-templates select="@*" />
-			<xsl:attribute name="id">			
+			<xsl:attribute name="id">
 				<xsl:choose>
 					<xsl:when test="number(substring(@text:ref-name,1,1))">
 					<!-- Heuristic: If the first character is a number a 'a_' will be set
@@ -186,7 +186,7 @@
 					<xsl:otherwise>
 						<xsl:value-of select="translate(@text:ref-name, '&#xA;&<>.,;: %()[]/\+', '___________________________')"/>
 					</xsl:otherwise>
-				</xsl:choose>			
+				</xsl:choose>
 			</xsl:attribute>
 		</xsl:element>
 
@@ -210,7 +210,7 @@
 					<xsl:otherwise>
 						<xsl:value-of select="translate(@text:name, '&#xA;&<>.,;: %()[]/\+', '___________________________')"/>
 					</xsl:otherwise>
-				</xsl:choose>					
+				</xsl:choose>
 			</xsl:attribute>
 		</xsl:element>
 
@@ -256,60 +256,60 @@
 		<xsl:apply-templates/>
 	</xsl:template>
 
-   
+
     <xsl:template match="office:annotation">
         <xsl:element name="span">
-            <xsl:attribute name="title">annotation</xsl:attribute>       
-            <xsl:attribute name="class">annotation_style_by_filter</xsl:attribute>                    
+            <xsl:attribute name="title">annotation</xsl:attribute>
+            <xsl:attribute name="class">annotation_style_by_filter</xsl:attribute>
             <xsl:apply-templates select="@*" />
-            <br/>            
+            <br/>
             <xsl:text>[ANNOTATION:</xsl:text>
             <br/>
             <xsl:apply-templates select="*" mode="annotation"/>
-            <xsl:text>]</xsl:text>           
+            <xsl:text>]</xsl:text>
         </xsl:element>
     </xsl:template>
-    
+
     <xsl:template match="text:p" mode="annotation">
-        <br/>    
+        <br/>
         <xsl:element name="span">
-            <xsl:text>NOTE: '</xsl:text>            
+            <xsl:text>NOTE: '</xsl:text>
             <xsl:apply-templates />
-            <xsl:text>'</xsl:text>                        
+            <xsl:text>'</xsl:text>
         </xsl:element>
     </xsl:template>
-        
+
     <xsl:template match="dc:creator" mode="annotation">
-        <br/>     
+        <br/>
         <xsl:element name="span">
-            <xsl:attribute name="title">dc:creator</xsl:attribute>  
-            <xsl:text>BY '</xsl:text>            
+            <xsl:attribute name="title">dc:creator</xsl:attribute>
+            <xsl:text>BY '</xsl:text>
             <xsl:apply-templates />
             <xsl:text>'</xsl:text>
-        </xsl:element>   
+        </xsl:element>
     </xsl:template>
-    
-    <xsl:template match="dc:date" mode="annotation">  
-        <br/>     
+
+    <xsl:template match="dc:date" mode="annotation">
+        <br/>
         <xsl:element name="span">
             <xsl:attribute name="title">dc:date</xsl:attribute>
-            <xsl:text>ON '</xsl:text>                    
+            <xsl:text>ON '</xsl:text>
             <xsl:apply-templates />
             <xsl:text>'</xsl:text>
-        </xsl:element>       
-    </xsl:template>    
-    
+        </xsl:element>
+    </xsl:template>
+
     <xsl:template match="meta:date-string" mode="annotation">
-        <br/>    
+        <br/>
         <xsl:element name="span">
-            <xsl:attribute name="title">meta-date-string</xsl:attribute>  
-            <xsl:text>META DATE '</xsl:text>                            
+            <xsl:attribute name="title">meta-date-string</xsl:attribute>
+            <xsl:text>META DATE '</xsl:text>
             <xsl:apply-templates />
-            <xsl:text>'</xsl:text>            
-        </xsl:element>           
-    </xsl:template>    
-        
-    
+            <xsl:text>'</xsl:text>
+        </xsl:element>
+    </xsl:template>
+
+
 	<!-- *************** -->
 	<!-- *** HELPER  *** -->
 	<!-- *************** -->
diff --git filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index e56be28..d4ffff2 100644
--- filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -87,7 +87,7 @@
 	</xsl:template>
 
 	<!-- workaround AOOO#119401 suspicious property fo:margin="100%" in paragraph style -->
-	<xsl:template match="@fo:margin[string(.) = '100%']"/> 
+	<xsl:template match="@fo:margin[string(.) = '100%']"/>
 
 	<!-- Maps fo:margin as well fo:margin-top, fo:margin-bottom, fo:padding-left, fo:margin-right -->
 	<!-- Maps fo:padding as well fo:padding-top, fo:padding-bottom, fo:padding-left, fo:padding-right -->
@@ -123,7 +123,7 @@
 			<xsl:when test="contains(., 'end')">
                 <xsl:choose>
                     <xsl:when test="parent::*/@style:writing-mode and contains(parent::*/@style:writing-mode, 'rl')">
-                        <xsl:text>text-align:left ! important;</xsl:text> 
+                        <xsl:text>text-align:left ! important;</xsl:text>
                     </xsl:when>
                     <xsl:otherwise>
                         <xsl:text>text-align:right ! important; </xsl:text>
@@ -292,7 +292,7 @@
         <xsl:text>writing-mode:</xsl:text>
         <xsl:value-of select="."/>
         <xsl:text>; </xsl:text>
-	</xsl:template>    
+	</xsl:template>  
     <!-- *** Properties with a no 'fo:' or 'style:' prefix *** -->
 	<xsl:template match="@table:align">
 		<xsl:choose>
-- 
1.8.5.1



More information about the LibreOffice mailing list