optimise whitespace in feed templates

diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl
index 768695a2ca0d434e376cdf1b1de7325376b5aa49..87cbee9e0877ea20cdcb4922911207804ed63a61 100644 (file)
--- a/templates/atomitem.tmpl
+++ b/templates/atomitem.tmpl
@@ -1,48 +1,48 @@
 <entry>
        <title><TMPL_VAR TITLE></title>
-       <TMPL_IF NAME="GUID">
-         <id><TMPL_VAR GUID></id>
-       <TMPL_ELSE>
-         <id><TMPL_VAR URL></id>
-       </TMPL_IF>
+<TMPL_IF NAME="GUID">
+       <id><TMPL_VAR GUID></id>
+<TMPL_ELSE>
+       <id><TMPL_VAR URL></id>
+</TMPL_IF>
        <link href="<TMPL_VAR PERMALINK>"/>
-       <TMPL_IF NAME="AUTHOR">
-        <author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author>
-       </TMPL_IF>
-       <TMPL_IF NAME="COPYRIGHT">
-        <rights type="html" xml:lang="en">
-          <TMPL_IF NAME="LICENSE">
-           <TMPL_VAR LICENSE ESCAPE=HTML>
-           <TMPL_VAR COPYRIGHT ESCAPE=HTML>
-          <TMPL_ELSE>
-           <TMPL_VAR COPYRIGHT ESCAPE=HTML>
-          </TMPL_IF>
-        </rights>
-       <TMPL_ELSE>
-        <TMPL_IF NAME="LICENSE">
-         <rights type="html" xml:lang="en">
-           <TMPL_VAR LICENSE ESCAPE=HTML>
-         </rights>
-        </TMPL_IF>
-       </TMPL_IF>
-       <TMPL_IF NAME="CATEGORIES">
-        <TMPL_LOOP NAME="CATEGORIES">
-         <category term="<TMPL_VAR CATEGORY>" />
-        </TMPL_LOOP>
-       </TMPL_IF>
+<TMPL_IF NAME="AUTHOR">
+       <author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author>
+</TMPL_IF>
+<TMPL_IF NAME="COPYRIGHT">
+       <rights type="html" xml:lang="en">
+<TMPL_IF NAME="LICENSE">
+               <TMPL_VAR LICENSE ESCAPE=HTML>
+               <TMPL_VAR COPYRIGHT ESCAPE=HTML>
+<TMPL_ELSE>
+               <TMPL_VAR COPYRIGHT ESCAPE=HTML>
+</TMPL_IF>
+       </rights>
+<TMPL_ELSE>
+<TMPL_IF NAME="LICENSE">
+       <rights type="html" xml:lang="en">
+       <TMPL_VAR LICENSE ESCAPE=HTML>
+       </rights>
+</TMPL_IF>
+</TMPL_IF>
+<TMPL_IF NAME="CATEGORIES">
+<TMPL_LOOP NAME="CATEGORIES">
+       <category term="<TMPL_VAR CATEGORY>" />
+</TMPL_LOOP>
+</TMPL_IF>
        <updated><TMPL_VAR MDATE_3339></updated>
        <published><TMPL_VAR CDATE_3339></published>
-       <TMPL_IF NAME="ENCLOSURE">
-        <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
-       <TMPL_ELSE>
-        <content type="html" xml:lang="en">
-         <TMPL_VAR CONTENT ESCAPE=HTML>
-        </content>
-       </TMPL_IF>
-       <TMPL_IF NAME="COMMENTSURL">
+<TMPL_IF NAME="ENCLOSURE">
+       <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
+<TMPL_ELSE>
+       <content type="html" xml:lang="en">
+       <TMPL_VAR CONTENT ESCAPE=HTML>
+       </content>
+</TMPL_IF>
+<TMPL_IF NAME="COMMENTSURL">
        <link rel="comments" href="<TMPL_VAR NAME="COMMENTSURL">" type="text/html" />
-       </TMPL_IF>
-       <TMPL_IF NAME="ATOMCOMMENTSURL">
+</TMPL_IF>
+<TMPL_IF NAME="ATOMCOMMENTSURL">
        <link rel="comments" href="<TMPL_VAR NAME="ATOMCOMMENTSURL">" type="application/atom+xml" />
-       </TMPL_IF>
+</TMPL_IF>
 </entry>

diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
index dcb89ab5cfac9ed6f26ca1e15a20caf58e6f9491..fc0088ae809cdb908111715d3ff5ae54f6c5cda9 100644 (file)
--- a/templates/atompage.tmpl
+++ b/templates/atompage.tmpl
@@ -6,31 +6,31 @@
 <link href="<TMPL_VAR FEEDURL>" rel="self" type="application/atom+xml"/>
 <author>
 <TMPL_IF NAME="AUTHOR">
- <name><TMPL_VAR AUTHOR></name>
+<name><TMPL_VAR AUTHOR></name>
 <TMPL_ELSE>
- <name><TMPL_VAR WIKINAME></name>
+<name><TMPL_VAR WIKINAME></name>
 </TMPL_IF>
 </author>
 <TMPL_IF NAME="COPYRIGHT">
- <rights type="html" xml:lang="en">
-   <TMPL_IF NAME="LICENSE">
-    <TMPL_VAR LICENSE>
-    <TMPL_VAR COPYRIGHT ESCAPE=HTML>
-   <TMPL_ELSE>
-    <TMPL_VAR COPYRIGHT ESCAPE=HTML>
-   </TMPL_IF>
- </rights>
+<rights type="html" xml:lang="en">
+<TMPL_IF NAME="LICENSE">
+       <TMPL_VAR LICENSE>
+       <TMPL_VAR COPYRIGHT ESCAPE=HTML>
 <TMPL_ELSE>
- <TMPL_IF NAME="LICENSE">
-  <rights type="html">
-    <TMPL_VAR LICENSE ESCAPE=HTML>
-  </rights>
- </TMPL_IF>
+       <TMPL_VAR COPYRIGHT ESCAPE=HTML>
+</TMPL_IF>
+</rights>
+<TMPL_ELSE>
+<TMPL_IF NAME="LICENSE">
+<rights type="html">
+       <TMPL_VAR LICENSE ESCAPE=HTML>
+</rights>
+</TMPL_IF>
 </TMPL_IF>
 <TMPL_IF NAME="GUID">
-  <id><TMPL_VAR GUID></id>
+<id><TMPL_VAR GUID></id>
 <TMPL_ELSE>
-  <id><TMPL_VAR PAGEURL></id>
+<id><TMPL_VAR PAGEURL></id>
 </TMPL_IF>
 <subtitle type="html"><TMPL_VAR FEEDDESC ESCAPE=HTML></subtitle>
 <generator uri="http://ikiwiki.info/" version="<TMPL_VAR VERSION>">ikiwiki</generator>

diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index a61b92b6127505e3f61b068d046e3f706a956d9a..069ae199719a7b81ec790041e9aace63c1bdbe27 100644 (file)
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -1,29 +1,29 @@
 <item>
-       <TMPL_IF NAME="AUTHOR">
+<TMPL_IF NAME="AUTHOR">
        <title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE></title>
        <dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator>
-       <TMPL_ELSE>
+<TMPL_ELSE>
        <title><TMPL_VAR TITLE></title>
-       </TMPL_IF>
-       <TMPL_IF NAME="GUID">
-         <guid isPermaLink="no"><TMPL_VAR GUID></guid>
-       <TMPL_ELSE>
-         <guid><TMPL_VAR URL></guid>
-       </TMPL_IF>
+</TMPL_IF>
+<TMPL_IF NAME="GUID">
+       <guid isPermaLink="no"><TMPL_VAR GUID></guid>
+<TMPL_ELSE>
+       <guid><TMPL_VAR URL></guid>
+</TMPL_IF>
        <link><TMPL_VAR PERMALINK></link>
-       <TMPL_IF NAME="CATEGORIES">
-       <TMPL_LOOP NAME="CATEGORIES">
+<TMPL_IF NAME="CATEGORIES">
+<TMPL_LOOP NAME="CATEGORIES">
        <category><TMPL_VAR CATEGORY></category>
-       </TMPL_LOOP>
-       </TMPL_IF>
+</TMPL_LOOP>
+</TMPL_IF>
        <pubDate><TMPL_VAR CDATE_822></pubDate>
        <dcterms:modified><TMPL_VAR MDATE_3339></dcterms:modified>
-       <TMPL_IF NAME="ENCLOSURE">
+<TMPL_IF NAME="ENCLOSURE">
        <enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
-       <TMPL_ELSE>
+<TMPL_ELSE>
        <description><TMPL_VAR CONTENT ESCAPE=HTML></description>
-       </TMPL_IF>
-       <TMPL_IF NAME="COMMENTSURL">
+</TMPL_IF>
+<TMPL_IF NAME="COMMENTSURL">
        <comments><TMPL_VAR NAME="COMMENTSURL"></comments>
-       </TMPL_IF>
+</TMPL_IF>
 </item>