- we now use only one step of XSL transformation

svn path=/trunk/; revision=25134

about/legal/de/de.xsl

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/>
+  <xsl:import href="../../../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
     <xsl:element name="ul">
-      <xsl:for-each select="/html/set/person[@chapter_de='yes']">
+      <xsl:for-each select="/buildinfo/document/set/person[@chapter_de='yes']">
         <xsl:sort select="@id"/>
         <xsl:element name="li">
           <xsl:value-of select="name"/>
@@ -15,14 +16,4 @@
     </xsl:element>
   </xsl:template>
 
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
 </xsl:stylesheet>

about/members.xsl

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
     <xsl:element name="ul">
-      <xsl:for-each select="/html/set/person[@association-member='yes']">
+      <xsl:for-each select="/buildinfo/document/set/person[@association-member='yes']">
         <xsl:sort select="@id"/>
         <xsl:element name="li">
           <xsl:element name="p">
@@ -43,14 +44,4 @@
     </xsl:element>
   </xsl:template>
 
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
 </xsl:stylesheet>

about/printable/get_h1.xsl

@@ -9,8 +9,4 @@
     <xsl:if test="../@id='fsfe'"> - </xsl:if>
     <xsl:if test="../@id='free_software'"> - </xsl:if>
   </xsl:template>
-  
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:apply-templates select="@*|node()"/>
-  </xsl:template>
 </xsl:stylesheet>

about/printable/get_moreinfo.xsl

@@ -6,8 +6,4 @@
   <xsl:template match="a[@id='moreinfo']">
     <xsl:value-of select="@href"/>
   </xsl:template>
-  
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:apply-templates select="@*|node()"/>
-  </xsl:template>
 </xsl:stylesheet>

about/printable/printable.xsl

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
+  <xsl:import href="../../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
@@ -12,7 +13,7 @@
     <xsl:variable name="text-pdf-0"><xsl:value-of select="text[@id='pdf-0']"/></xsl:variable>
     <xsl:variable name="text-moreinfo"><xsl:value-of select="text[@id='moreinfo']"/></xsl:variable>
 
-    <xsl:for-each select="/html/set/printable[@type=$type]">
+    <xsl:for-each select="/buildinfo/document/set/printable[@type=$type]">
       <xsl:sort select="@id"/>
       <xsl:variable name="id"><xsl:value-of select="@id"/></xsl:variable>
 
@@ -20,8 +21,8 @@
       <xsl:element name="h3">
         <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute>
         <xsl:choose>
-          <xsl:when test="translation[@lang=/html/@lang]!=''">
-            <xsl:value-of select="translation[@lang=/html/@lang]"/>
+          <xsl:when test="translation[@lang=/buildinfo/@language]!=''">
+            <xsl:value-of select="translation[@lang=/buildinfo/@language]"/>
           </xsl:when>
           <xsl:otherwise>
             <xsl:value-of select="translation[@lang='en']"/>
@@ -127,15 +128,5 @@
       </xsl:element>
     </xsl:for-each>
   </xsl:template>
-  
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set" />
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 
 </xsl:stylesheet>

about/team.xsl

@@ -3,7 +3,8 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
   <xsl:import href="../tools/xsltsl/countries.xsl" />
-  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
   <!-- 
     For documentation on tagging (e.g. display a people list), take a
@@ -17,15 +18,5 @@
       <xsl:with-param name="team" select="'main'" />
     </xsl:call-template>
   </xsl:template>
-  
-  <!-- Do not copy <set> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 
 </xsl:stylesheet>

activities/ftf/avm-gpl-violation.xsl

@@ -4,10 +4,11 @@
   
   <xsl:import href="../../tools/xsltsl/tagging.xsl" />
   
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+  <xsl:import href="../../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- In /html/body node, append dynamic content -->
-  <xsl:template match="/html/body/tagged-docs">
+  <xsl:template match="tagged-docs">
     
     <xsl:call-template name="fetch-news">
       <xsl:with-param name="tag" select="'avmgplviolation'" />
@@ -17,15 +18,4 @@
     </xsl:call-template>
     
   </xsl:template>
-
-  <!-- Do not copy <set> and <text> to output at all -->
-  <xsl:template match="/html/set" />
-  <xsl:template match="/html/text" />
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 </xsl:stylesheet>

activities/map/de/de.xsl

@@ -1,26 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
+  <xsl:import href="../../../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
     <xsl:variable name="type"><xsl:value-of select="@type"/></xsl:variable>
-    <xsl:for-each select="/html/set/item[@type=$type]">
+    <xsl:for-each select="/buildinfo/document/set/item[@type=$type]">
       <xsl:element name="li">
         <xsl:apply-templates select="node()"/>
       </xsl:element>
     </xsl:for-each>
   </xsl:template>
 
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
 </xsl:stylesheet>

activities/os/os.xsl

@@ -4,7 +4,8 @@
   
   <xsl:import href="../../tools/xsltsl/tagging.xsl" />
   
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+  <xsl:import href="../../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
   
   <xsl:template match="fetch-news">
@@ -14,28 +15,16 @@
     </xsl:call-template>
   </xsl:template>
   
-  
-  <!-- Do not copy <set> and <text> to output at all -->
-  <xsl:template match="/html/set" />
-  <xsl:template match="/html/text" />
-  
   <!-- How to show a link -->
-  <xsl:template match="/html/set/news/link">
+  <xsl:template match="/buildinfo/document/set/news/link">
     <xsl:element name="a">
       <xsl:attribute name="href">
         <xsl:value-of select="text()" />
       </xsl:attribute>
       <xsl:text>[</xsl:text>
-      <xsl:value-of select="/html/text[@id='more']" />
+      <xsl:value-of select="/buildinfo/document/text[@id='more']" />
       <xsl:text>]</xsl:text>
     </xsl:element>
   </xsl:template>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
   
 </xsl:stylesheet>

activities/wipo/wipo.xsl

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes" />
+  <xsl:import href="../../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
     <xsl:element name="ul">
-      <xsl:for-each select="/html/set/document">
+      <xsl:for-each select="/buildinfo/document/set/document">
         <xsl:sort select="@date" order="descending" />
         <xsl:element name="li">
           <xsl:element name="p">
@@ -38,14 +39,4 @@
     </xsl:element>
   </xsl:template>
 
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set" />
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
 </xsl:stylesheet>

activities/wipo/wiwo.de.xhtml

@@ -76,19 +76,16 @@
 
 <h3>Unterzeichner</h3>
 
-   </body>
-   <text id="osig">Organisationen</text>
-   <text id="isig">Personen</text>
+<signatories/>
+
+<p>
+  Wenn sie ihren Namen oder den ihrer Organisation auch in dieser Liste
+  sehen wollen, kontaktieren Sie bitte 
+  <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+</p>
+
+   </body>
 
-   <text>
-     <footer>
-       <p>
-         Wenn sie ihren Namen oder den ihrer Organisation auch in dieser Liste
-         sehen wollen, kontaktieren Sie bitte 
-         <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-       </p>
-     </footer>
-   </text>
 
    <timestamp>$Date$ $Author$</timestamp>
 </html>

activities/wipo/wiwo.el.xhtml

@@ -62,18 +62,16 @@ WIPO, αλλά τι είδους οργανισμό χρειαζόμαστε γ
 
 
 <h2>Συμβαλλόμενα μέρη</h2>
+
+<signatories/>
+
+<p>
+  Αν επιθυμείτε να δείτε το όνομά σας ή το όνομα του οργανισμού σας να προστίθεται
+  σε αυτόν τον κατάλογο, παρακαλούμε επικοινωνήστε στο
+  <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+</p>
+
    </body>
-   <text id="osig">Οργανισμοί</text>
-   <text id="isig">Άτομα</text>
-   <text>
-     <footer>
-       <p>
-         Αν επιθυμείτε να δείτε το όνομά σας ή το όνομα του οργανισμού σας να προστίθεται
-         σε αυτόν τον κατάλογο, παρακαλούμε επικοινωνήστε στο
-         <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-       </p>
-     </footer>
-   </text>
 
    <timestamp>$Date$ $Author$</timestamp>
 </html>

activities/wipo/wiwo.en.xhtml

@@ -75,19 +75,16 @@
 
 
     <h2>Signatories</h2>
-
-  </body>
-  <text id="osig">Organisations</text>
-  <text id="isig">Individuals</text>
-  <text>
-    <footer>
-      <p>
-        If you wish to see your name or the name of your organisation
-        added to this list, please contact <a
-          href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+    
+    <signatories/>
+    
+    <p>
+      If you wish to see your name or the name of your organisation
+      added to this list, please contact <a
+        href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
      </p>
-   </footer>
- </text>
+     
+  </body>
   <timestamp>$Date$ $Author$</timestamp>
 </html>
 <!--

activities/wipo/wiwo.es.xhtml

@@ -58,19 +58,17 @@ establecimiento de una agenda de desarrollo para la OMPI:
 <a href="http://www.wipo.int/documents/es/document/govbody/wo_gb_ga/pdf/wo_ga_31_11.pdf">http://www.wipo.int/documents/es/document/govbody/wo_gb_ga/pdf/wo_ga_31_11.pdf</a></li>
 </ol>
 
-	 <h2>Firmantes</h2>
+    <h2>Firmantes</h2>
+    
+    <signatories/>
+    
+    <p>
+      Si desea que su nombre o el de su organización aparezca en 
+      esta lista, por favor contacte con
+      <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+    </p>
+    
    </body>
-   <text id="osig">Organizaciones</text>
-   <text id="isig">Individuos</text>
-   <text>
-     <footer>
-       <p>
-	    Si desea que su nombre o el de su organización aparezca en 
-	    esta lista, por favor contacte con
-         <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-       </p>
-     </footer>
-   </text>
 
    <timestamp>$Date$ $Author$</timestamp>
 </html>

activities/wipo/wiwo.fr.xhtml

@@ -60,18 +60,16 @@ avoir, mais plut
       </li>
     </ol>
 
-<h2>Signataires</h2>
-   </body>
-   <text id="osig">Organisations</text>
-   <text id="isig">Individus</text>
-  <text>
-    <footer>
-      <p>
-        Si vous désirez ajouter votre nom ou celui de votre organisation à la liste des signataires, veuillez contacter <a
-          href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-     </p>
-   </footer>
- </text>
+  <h2>Signataires</h2>
+  
+  <signatories/>
+  
+  <p>
+    Si vous désirez ajouter votre nom ou celui de votre organisation à la liste des signataires, veuillez contacter <a
+    href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+  </p>
+
+</body>
 
    <timestamp>$Date$ $Author$</timestamp>
 </html>

activities/wipo/wiwo.hu.xhtml

@@ -30,14 +30,12 @@ href="http://www.cptech.org/ip/wipo/genevadeclaration.html">Genfi Deklaráció</
 
 
 <h2>Aláírók</h2>
+
+<signatories/>
+
+<p>Ha Ön is szerepeltetni szeretné saját vagy szervezete nevét e listán, kérjük jelezze a <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a> e-mail címen.</p>
+
   </body>
-  <text id="osig">Szervezetek</text>
-  <text id="isig">Egyének</text>
-  <text>
-    <footer>
-      <p>Ha Ön is szerepeltetni szeretné saját vagy szervezete nevét e listán, kérjük jelezze a <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a> e-mail címen.</p>
-    </footer>
-  </text>
 
   <timestamp>$Date$ $Author$</timestamp>
   <translator>FSF.hu Alapítvány</translator>

activities/wipo/wiwo.it.xhtml

@@ -60,18 +60,16 @@ piuttosto al tipo di organizzazione di cui abbiamo bisogno al suo posto.</p>
 
 
 <h2>Firmatari</h2>
+
+<signatories/>
+
+<p>
+  Per aggiungere il proprio nome, o quello della propria organizzazione,
+  a questa lista, si prega di contattare
+  <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+</p>
+
    </body>
-   <text id="osig">Organizzazioni</text>
-   <text id="isig">Individui</text>
-   <text>
-     <footer>
-       <p>
-         Per aggiungere il proprio nome, o quello della propria organizzazione,
-         a questa lista, si prega di contattare
-         <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-       </p>
-     </footer>
-   </text>
 
    <timestamp>$Date$ $Author$</timestamp>
 </html>

activities/wipo/wiwo.nl.xhtml

@@ -77,22 +77,17 @@
     </ol>
 
     <h2>Ondertekenaars</h2>
-
+    
+    <signatories/>
+    
+    <p>
+      Als je uw naam of de naam van uw organisatie aan de lijst
+      wil toevoegen meld dit dan via <a 
+      href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+    </p>
+    
     </body>
 
-
-   <text id="osig">Organisaties</text>
-   <text id="isig">Personen</text>
-   <text>
-     <footer>
-       <p>
-	 Als je uw naam of de naam van uw organisatie aan de lijst
-         wil toevoegen meld dit dan via <a 
-	 href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-       </p>
-     </footer>
-   </text>
-
    <timestamp>$Date$ $Author$</timestamp>
 </html>
 <!--

activities/wipo/wiwo.pt.xhtml

@@ -57,17 +57,16 @@ nova organização, mas não o único e talvez nem mesmo o mais importante.</p>
 </ol>
 
 <h2>Assinantes</h2>
+
+<signatories/>
+
+<p>
+  Se deseja que o seu nome ou o nome da sua organização apareça
+  nesta lista, por favor entre em contacto com <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+</p>
+
    </body>
-   <text id="osig">Organizações</text>
-   <text id="isig">Indivíduos</text>
-   <text>
-     <footer>
-       <p>
-            Se deseja que o seu nome ou o nome da sua organização apareça
-            nesta lista, por favor entre em contacto com <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-       </p>
-     </footer>
-   </text>
+   
    <timestamp>$Date$ $Author$</timestamp>
 </html>
 <!--

activities/wipo/wiwo.ru.xhtml

@@ -62,16 +62,13 @@ http://www.wipo.int/edocs/mdocs/govbody/en/wo_ga_31/wo_ga_31_11.pdf</a></li>
 
 <h2>Присоединившиеся стороны</h2>
 
-</body>
-<text id="osig">Организации</text>
-<text id="isig">Частные лица</text>
-<text>
-<footer>
+<signatories/>
+
 <p>Если вы хотите внести свое имя или название организации в этот
 список, напишите по адресу <a
 href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.</p>
-</footer>
-</text>
+
+</body>
 <timestamp>$Date$ $Author$</timestamp>
 </html>
 <!--

activities/wipo/wiwo.xsl

@@ -3,39 +3,23 @@
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-  <xsl:output method="xml"
-           encoding="ISO-8859-1"
-           indent="yes"
-           />
+  <xsl:import href="../../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
-  <xsl:template match="/">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()" />
-    </xsl:copy>
+  <xsl:template match="signatories">
+    <h3 id="organisations">
+      <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'osig'" /></xsl:call-template>
+    </h3>
+    <ul>
+      <xsl:apply-templates select="/buildinfo/document/set/osig/node()" />
+    </ul>
+
+    <h3 id="individuals">
+      <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'isig'" /></xsl:call-template>
+    </h3>
+    <ul>
+      <xsl:apply-templates select="/buildinfo/document/set/isig/node()" />
+    </ul>
   </xsl:template>
 
-  <xsl:template match="/html/body">
-    <body>
-      <xsl:apply-templates />
-      <h3><xsl:value-of select="/html/text[@id='osig']" /></h3>
-      <ul>
-        <xsl:apply-templates select="/html/set/osig/node()" />
-      </ul>
-
-      <h3><xsl:value-of select="/html/text[@id='isig']" /></h3>
-      <ul>
-        <xsl:apply-templates select="/html/set/isig/node()" />
-      </ul>
-      <xsl:apply-templates select="/html/text/footer/node()" />
-    </body>
-  </xsl:template>
-
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="/html/set" />
-  <xsl:template match="/html/text" />
 </xsl:stylesheet>

associates/associates.ca.xhtml

@@ -21,6 +21,8 @@ junts en campanyes i events com fires.</p>
 <p>Si voleu saber més sobre l'estatus d'associat, trobareu
 aquesta informació <a href="/associates/about.html">aquí</a>.</p>
 
+<associates/>
+
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>

associates/associates.da.xhtml

@@ -29,6 +29,9 @@
       læse om <a href="/associates/about.html">hvad det betyder, at være 
       tilknyttet FSFE og hvordan man bliver det</a>.
     </p>
+    
+    <associates/>
+    
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>

associates/associates.de.xhtml

@@ -29,6 +29,8 @@
     Organisation suchen, so lesen Sie was es bedeutet, <a href="/associates/about.html">assoziierte 
     Organisation zu sein und wie Ihre Organisation es werden kann</a>. 
     </p>
+    
+    <associates/>
 
   </body>
 

associates/associates.el.xhtml

@@ -21,6 +21,8 @@
 <p>Αν ενδιαφέρεστε για την ιδιότητα του συνεργαζόμενου, παρακαλούμε διαβάστε
 <a href="/associates/about.html">τι σημαίνει συνεργαζόμενος με το FSFE και πώς θα γίνετε</a>.</p>
 
+<associates/>
+
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>

associates/associates.en.xhtml

@@ -26,6 +26,9 @@
     <p>
       If you are interested in the associate status, please consider to read <a href="/associates/about.html">what it means to be an associate of FSFE and how to become one</a>.
     </p>
+    
+    <associates/>
+    
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>

associates/associates.es.xhtml

@@ -21,6 +21,8 @@ en todos los aspectos (tales como afiliación, estatutos, finanzas, etc.)</p>
 
 <p>Si desea saber más sobre el estatus de asociado, lea nuestra <a href="/associates/about.html">explicación del significado del estatus de asociado y como puede volverselo</a>.</p>
 
+  <associates/>
+  
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>

associates/associates.fi.xhtml

@@ -21,6 +21,8 @@ messuilla.</p>
 <p>Lisätietoja kumppanuudesta FSFE:n kanssa löydät 
 <a href="/associates/about.html">täältä</a>.</p>
 
+<associates/>
+
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>

associates/associates.fr.xhtml

@@ -22,6 +22,8 @@ salons.</p>
 
 <p>Si vous êtes intéressé par le statut de partenaire, nous vous recommandons de considérer<a href="/associates/about.html">ce que cela signifie d'être partenaire de la FSFE et comment en devenir un</a>. </p>
 
+<associates/>
+
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>

associates/associates.hu.xhtml

@@ -17,6 +17,8 @@
 
 <p>Amennyiben többet szeretne tudni a társult szervezeti státusról, további információt találhat <a href="/associates/about.html">itt</a>.</p>
 
+<associates/>
+
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>

associates/associates.it.xhtml

@@ -23,6 +23,8 @@ esempio fiere e manifestazioni).</p>
 leggere <a href="/associates/about.html">cosa significa essere associati a FSFE
 e come diventarlo</a>.</p>
 
+<associates/>
+
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>

associates/associates.nb.xhtml

@@ -21,6 +21,8 @@ også om kampanjer og begivenheter, som for eksempel messer.</p>
 <p>Ønsker du å vite mer, kan du lese mer om <a
 href="/associates/about.html">tilknyttingsstatusen</a>.</p>
 
+<associates/>
+
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>

associates/associates.nl.xhtml

@@ -22,6 +22,8 @@ samenwerken voor campagnes en evenementen zoals handelsbeurzen.</p>
 <p>Als u meer wilt weten over de status als partnerorganisatie, kunt u dat
 <a href="/associates/about.html">hier</a> vinden.</p>
 
+<associates/>
+
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>

associates/associates.pt.xhtml

@@ -26,6 +26,8 @@
     <p>
       Se quiser saber mais sobre o estatuto de associado, você pode ler nossa <a href="/associates/about.html">exploração do significado do estatuto de aasociado e o guia para tornar-se associado da FSFE</a>.
     </p>
+    
+    <associates/>
   </body>
 
   <timestamp>$Date: 2010-01-23 16:58:15 +0000 (Sat, 23 Jan 2010) $ $Author: ato $</timestamp>

associates/associates.ro.xhtml

@@ -29,6 +29,8 @@ implica în activitãţile FSFE.</p>
 Dacã doriţi mai multe informaţii despre statutul asociaţilor, puteţi
 afla mai multe informaţii <a href="/associates/about.html">aici</a>.</p>
 
+<associates/>
+
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>

associates/associates.ru.xhtml

@@ -24,6 +24,8 @@
 прочтите, пожалуйста, о том, <a href="/associates/about.html">что значит
 быть союзной организацией ЕФСПО и как стать такой организацией</a>.</p>
 
+<associates/>
+
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>

associates/associates.sq.xhtml

@@ -26,6 +26,9 @@
     <p>
       Nëse jeni të interesuar rreth statusit të anëtarit shok, ju lutemi, mund të lexoni <a href="/associates/about.html">se ç'do të thotë të jesh anëtar shok i FSFE-së dhe se si të bëheni një i tillë</a>.
     </p>
+    
+    <associates/>
+    
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>

associates/associates.sv.xhtml

@@ -26,6 +26,8 @@ FSFE aktiviteter att g
 <p>Om du vill veta mer om de associerades status så hittar du den
 informationen <a href="/associates/about.html">här</a>.</p>
 
+<associates/>
+
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>

associates/associates.tr.xhtml

@@ -27,6 +27,8 @@ Ortaklık statüsüyle ilgili daha fazla bilgi edinmek isterseniz,
 <a href="/associates/about.html">burada</a> aradığınızı bulabilirsiniz.
 </p>
 
+<associates/>
+
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>

associates/associates.xsl

@@ -3,29 +3,21 @@
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-  <xsl:output method="xml"
-           encoding="ISO-8859-1"
-           indent="yes"
-           />
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
-  <xsl:template match="/">
-    <html>
-      <xsl:apply-templates select="html/head" />
-      <body>
-        <xsl:apply-templates select="html/body/node()" />
-        <xsl:for-each select="/html/set/associate">
-          <xsl:sort select="@id" />
-          <h3><a href="{link}"><xsl:value-of select="name" /></a></h3>
-          <xsl:apply-templates select="description/node()" />
-        </xsl:for-each>
-      </body>
-    </html>
-  </xsl:template>
-
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
+  <xsl:template match="associates">
+    <xsl:for-each select="/buildinfo/document/set/associate">
+      <xsl:sort select="@id" />
+      <h3>
+        <xsl:call-template name="generate-id-attribute">
+          <xsl:with-param name="title" select="name" />
+        </xsl:call-template>
+        <a href="{link}"><xsl:value-of select="name" /></a>
+      </h3>
+      <xsl:apply-templates select="description/node()" />
+    </xsl:for-each>
   </xsl:template>
+  
 </xsl:stylesheet>
 

at/at.xsl

@@ -7,7 +7,8 @@
   <xsl:import href="../tools/xsltsl/tagging.xsl" />
   <xsl:import href="../tools/xsltsl/countries.xsl" />
   <xsl:import href="../tools/xsltsl/translations.xsl" />
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- To localise this page to a new country, copy this file and change the following:
   
@@ -60,7 +61,7 @@
   <!--define contact information-->
   
   <xsl:template match="contact-details">
-    <xsl:for-each select="/html/set/contact">
+    <xsl:for-each select="/buildinfo/document/set/contact">
 
     <xsl:if test="@id = 'DE'">
   
@@ -145,15 +146,5 @@
             </xsl:with-param>
         </xsl:call-template>
     </xsl:template>
-  
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 
 </xsl:stylesheet>

campaigns/askyourcandidates/askyourcandidates.xsl

@@ -4,7 +4,8 @@
   
   <xsl:import href="../../tools/xsltsl/tagging.xsl" />
   
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+  <xsl:import href="../../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
   
   <xsl:template match="fetch-news">
@@ -14,28 +15,16 @@
     </xsl:call-template>
   </xsl:template>
   
-  
-  <!-- Do not copy <set> and <text> to output at all -->
-  <xsl:template match="/html/set" />
-  <xsl:template match="/html/text" />
-  
   <!-- How to show a link -->
-  <xsl:template match="/html/set/news/link">
+  <xsl:template match="/buildinfo/document/set/news/link">
     <xsl:element name="a">
       <xsl:attribute name="href">
         <xsl:value-of select="text()" />
       </xsl:attribute>
       <xsl:text>[</xsl:text>
-      <xsl:value-of select="/html/text[@id='more']" />
+      <xsl:value-of select="/buildinfo/document/text[@id='more']" />
       <xsl:text>]</xsl:text>
     </xsl:element>
   </xsl:template>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
   
 </xsl:stylesheet>

campaigns/finished.xsl

@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
-    <xsl:for-each select="/html/set/project [@status = 'finished']">
+    <xsl:for-each select="/buildinfo/document/set/project [@status = 'finished']">
       <xsl:sort select="@date" order="descending"/>
 
       <!-- Title -->
@@ -26,14 +27,4 @@
     </xsl:for-each>
   </xsl:template>
 
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
 </xsl:stylesheet>

campaigns/ilovefs/2012/ilovefs.xsl

@@ -4,7 +4,8 @@
   
   <xsl:import href="../../../tools/xsltsl/tagging.xsl" />
   
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+  <xsl:import href="../../../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
   
   <xsl:template match="fetch-news">
@@ -14,28 +15,16 @@
     </xsl:call-template>
   </xsl:template>
   
-  
-  <!-- Do not copy <set> and <text> to output at all -->
-  <xsl:template match="/html/set" />
-  <xsl:template match="/html/text" />
-  
   <!-- How to show a link -->
-  <xsl:template match="/html/set/news/link">
+  <xsl:template match="/buildinfo/document/set/news/link">
     <xsl:element name="a">
       <xsl:attribute name="href">
         <xsl:value-of select="text()" />
       </xsl:attribute>
       <xsl:text>[</xsl:text>
-      <xsl:value-of select="/html/text[@id='more']" />
+      <xsl:value-of select="/buildinfo/document/text[@id='more']" />
       <xsl:text>]</xsl:text>
     </xsl:element>
   </xsl:template>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
   
 </xsl:stylesheet>

campaigns/ilovefs/2012/unperfekthaus.xsl

@@ -4,7 +4,8 @@
   
   <xsl:import href="../../../tools/xsltsl/tagging.xsl" />
   
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+  <xsl:import href="../../../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
   
   <xsl:template match="fetch-news">
@@ -14,28 +15,16 @@
     </xsl:call-template>
   </xsl:template>
   
-  
-  <!-- Do not copy <set> and <text> to output at all -->
-  <xsl:template match="/html/set" />
-  <xsl:template match="/html/text" />
-  
   <!-- How to show a link -->
-  <xsl:template match="/html/set/news/link">
+  <xsl:template match="/buildinfo/document/set/news/link">
     <xsl:element name="a">
       <xsl:attribute name="href">
         <xsl:value-of select="text()" />
       </xsl:attribute>
       <xsl:text>[</xsl:text>
-      <xsl:value-of select="/html/text[@id='more']" />
+      <xsl:value-of select="/buildinfo/document/text[@id='more']" />
       <xsl:text>]</xsl:text>
     </xsl:element>
   </xsl:template>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
   
 </xsl:stylesheet>

campaigns/inactive.xsl

@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
-    <xsl:for-each select="/html/set/project [@status = 'inactive']">
+    <xsl:for-each select="/buildinfo/document/set/project [@status = 'inactive']">
       <xsl:sort select="@date" order="descending"/>
 
       <!-- Title -->
@@ -26,14 +27,4 @@
     </xsl:for-each>
   </xsl:template>
 
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
 </xsl:stylesheet>

campaigns/nledu/nledu.xsl

@@ -4,7 +4,8 @@
   
   <xsl:import href="../../tools/xsltsl/tagging.xsl" />
   
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+  <xsl:import href="../../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
   
   <xsl:template match="fetch-news">
@@ -14,28 +15,16 @@
     </xsl:call-template>
   </xsl:template>
   
-  
-  <!-- Do not copy <set> and <text> to output at all -->
-  <xsl:template match="/html/set" />
-  <xsl:template match="/html/text" />
-  
   <!-- How to show a link -->
-  <xsl:template match="/html/set/news/link">
+  <xsl:template match="/buildinfo/document/set/news/link">
     <xsl:element name="a">
       <xsl:attribute name="href">
         <xsl:value-of select="text()" />
       </xsl:attribute>
       <xsl:text>[</xsl:text>
-      <xsl:value-of select="/html/text[@id='more']" />
+      <xsl:value-of select="/buildinfo/document/text[@id='more']" />
       <xsl:text>]</xsl:text>
     </xsl:element>
   </xsl:template>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
   
 </xsl:stylesheet>

campaigns/pdfreaders/buglist.xsl

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
+  <xsl:import href="../../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic index -->
   <xsl:template match="dynamic-index">
-    <xsl:for-each select="/html/set/buglist">
+    <xsl:for-each select="/buildinfo/document/set/buglist">
       <xsl:sort select="@country"/>
 
       <xsl:variable name="country">
@@ -18,7 +19,7 @@
             <xsl:text>#</xsl:text>
             <xsl:value-of select="$country"/>
           </xsl:attribute>
-          <xsl:value-of select="/html/set/country[@id=$country]"/>
+          <xsl:value-of select="/buildinfo/document/set/country[@id=$country]"/>
         </xsl:element>
       </xsl:element>
 
@@ -29,11 +30,11 @@
   <!-- fill in global figures -->
   
   <xsl:variable name="solved">
-    <xsl:value-of select="count( /html/set/buglist/bug[@closed != ''] )" />
+    <xsl:value-of select="count( /buildinfo/document/set/buglist/bug[@closed != ''] )" />
   </xsl:variable>
   
   <xsl:variable name="total">
-    <xsl:value-of select="count( /html/set/buglist/bug )" />
+    <xsl:value-of select="count( /buildinfo/document/set/buglist/bug )" />
   </xsl:variable>
   
   <xsl:template match="solved">
@@ -49,18 +50,18 @@
   </xsl:template>
   
   
-  <!-- <xsl:key name="indivs-by-name" match="/html/set/buglist/bug/@name" use="normalize-space(.)" />
-  <xsl:key name="groups-by-name" match="/html/set/buglist/bug/@group" use="normalize-space(.)" /> -->
+  <!-- <xsl:key name="indivs-by-name" match="/buildinfo/document/set/buglist/bug/@name" use="normalize-space(.)" />
+  <xsl:key name="groups-by-name" match="/buildinfo/document/set/buglist/bug/@group" use="normalize-space(.)" /> -->
   
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
     
-    <!-- <xsl:value-of select="count( /html/set/buglist/bug[@closed != ''] ) " /><br/>
-    <xsl:value-of select="count( /html/set/buglist/bug ) " /><br/>
-    <xsl:value-of select="floor( count(/html/set/buglist/bug[@closed != '']) div count( /html/set/buglist/bug ) * 100)" /><br/>
+    <!-- <xsl:value-of select="count( /buildinfo/document/set/buglist/bug[@closed != ''] ) " /><br/>
+    <xsl:value-of select="count( /buildinfo/document/set/buglist/bug ) " /><br/>
+    <xsl:value-of select="floor( count(/buildinfo/document/set/buglist/bug[@closed != '']) div count( /buildinfo/document/set/buglist/bug ) * 100)" /><br/>
     -->
     
-    <xsl:for-each select="/html/set/buglist">
+    <xsl:for-each select="/buildinfo/document/set/buglist">
       <xsl:sort select="@country"/>
       
       <xsl:variable name="country">
@@ -72,24 +73,24 @@
         <xsl:attribute name="id">
           <xsl:value-of select="$country"/>
         </xsl:attribute>
-        <xsl:value-of select="/html/set/country[@id=$country]"/>
-        <xsl:variable name="nbsolved" select="count( /html/set/buglist[@country=$country]/bug[@closed != ''] )" />
-        <xsl:variable name="nbinst" select="count( /html/set/buglist[@country=$country]/bug )" />
+        <xsl:value-of select="/buildinfo/document/set/country[@id=$country]"/>
+        <xsl:variable name="nbsolved" select="count( /buildinfo/document/set/buglist[@country=$country]/bug[@closed != ''] )" />
+        <xsl:variable name="nbinst" select="count( /buildinfo/document/set/buglist[@country=$country]/bug )" />
         (<xsl:value-of select="$nbsolved" />/<xsl:value-of select="$nbinst" /> = <xsl:value-of select="floor($nbsolved div $nbinst * 100)" />%)
       </xsl:element>
       
       <!-- Table header -->
       <xsl:element name="table">
         <xsl:element name="tr">
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='institution-name']"/></xsl:element>
-          <!--<xsl:element name="th"><xsl:value-of select="/html/text[@id='institution-address']"/></xsl:element>-->
-          <!--<xsl:element name="th"><xsl:value-of select="/html/text[@id='institution-url']"/></xsl:element>-->
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='opened']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='closed']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='name']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='group']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='closedby']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='comment']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='institution-name']"/></xsl:element>
+          <!--<xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='institution-address']"/></xsl:element>-->
+          <!--<xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='institution-url']"/></xsl:element>-->
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='opened']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='closed']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='name']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='group']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='closedby']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='comment']"/></xsl:element>
         </xsl:element>
         
         <!-- Table rows -->
@@ -103,7 +104,7 @@
                 <xsl:attribute name="href">
                   <xsl:value-of select="@institution-url"/>
                 </xsl:attribute>
-                <xsl:value-of select="@institution-name"/><!--<xsl:value-of select="/html/text[@id='link']"/>-->
+                <xsl:value-of select="@institution-name"/><!--<xsl:value-of select="/buildinfo/document/text[@id='link']"/>-->
               </xsl:element>
             </xsl:element>
             <xsl:comment><xsl:element name="td"><xsl:value-of select="translate(@institution-address, '-', '–' )"/></xsl:element></xsl:comment>
@@ -121,19 +122,19 @@
     
     <!-- List of participants -->
     <!-- 
-    <xsl:value-of select="count(/html/set/buglist/bug/@group[ generate-id() = generate-id(key('groups-by-name', normalize-space(.))) ])" />
+    <xsl:value-of select="count(/buildinfo/document/set/buglist/bug/@group[ generate-id() = generate-id(key('groups-by-name', normalize-space(.))) ])" />
     
     <xsl:element name="ul">
       
-      <xsl:for-each select=" /html/set/buglist/bug/@group[ generate-id() = generate-id(key('groups-by-name', normalize-space(.))) ] ">
-        <xsl:sort select="count( /html/set/buglist/bug/@name = . )" data-type="number" />
+      <xsl:for-each select=" /buildinfo/document/set/buglist/bug/@group[ generate-id() = generate-id(key('groups-by-name', normalize-space(.))) ] ">
+        <xsl:sort select="count( /buildinfo/document/set/buglist/bug/@name = . )" data-type="number" />
         
         <xsl:variable name="name" select="." />
         
         <xsl:if test="position() &lt;= 5">
           
           <xsl:element name="li">
-            <xsl:value-of select="count( /html/set/buglist/bug[@group=$name] )" />
+            <xsl:value-of select="count( /buildinfo/document/set/buglist/bug[@group=$name] )" />
             <xsl:text>-</xsl:text>
             <xsl:value-of select="$name" />
           </xsl:element>
@@ -147,14 +148,4 @@
     
   </xsl:template>
 
-  <!-- Do not copy <set> and <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
 </xsl:stylesheet>

campaigns/pdfreaders/pdfreaders.xsl

@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+  <xsl:import href="../../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
   <xsl:template match="number-of-businesses">
-    <xsl:value-of select="count(/html/set/bsig/li)" />
+    <xsl:value-of select="count(/buildinfo/document/set/bsig/li)" />
   </xsl:template>
   
   <xsl:template match="number-of-orgs">
-    <xsl:value-of select="count(/html/set/osig/li)" />
+    <xsl:value-of select="count(/buildinfo/document/set/osig/li)" />
   </xsl:template>
   
   <xsl:template match="number-of-individuals">
-    <xsl:value-of select="count(/html/set/isig/li)" />
+    <xsl:value-of select="count(/buildinfo/document/set/isig/li)" />
   </xsl:template>
   
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
-    <xsl:for-each select="/html/set/buglist">
+    <xsl:for-each select="/buildinfo/document/set/buglist">
       <xsl:sort select="@country"/>
 
       <xsl:variable name="country">
@@ -26,20 +27,20 @@
 
       <!-- Heading -->
       <xsl:element name="h3">
-        <xsl:value-of select="/html/set/country[@id=$country]"/>
+        <xsl:value-of select="/buildinfo/document/set/country[@id=$country]"/>
       </xsl:element>
 
       <!-- Table header -->
       <xsl:element name="table">
         <xsl:element name="tr">
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='institution-name']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='institution-address']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='institution-url']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='opened']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='closed']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='name']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='group']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/html/text[@id='comment']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='institution-name']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='institution-address']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='institution-url']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='opened']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='closed']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='name']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='group']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='comment']"/></xsl:element>
         </xsl:element>
 
         <!-- Table rows -->
@@ -52,7 +53,7 @@
                 <xsl:attribute name="href">
                   <xsl:value-of select="@institution-url"/>
                 </xsl:attribute>
-                <xsl:value-of select="/html/text[@id='link']"/>
+                <xsl:value-of select="/buildinfo/document/text[@id='link']"/>
               </xsl:element>
             </xsl:element>
             <xsl:element name="td"><xsl:value-of select="@opened"/></xsl:element>
@@ -67,14 +68,4 @@
     </xsl:for-each>
   </xsl:template>
 
-  <!-- Do not copy <set> and <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
 </xsl:stylesheet>

campaigns/pdfreaders/petition.xsl

@@ -5,64 +5,46 @@
 	
 	<xsl:import href="../../tools/xsltsl/countries.xsl" />
 	
-  <xsl:output method="xml"
-           encoding="UTF-8"
-           indent="yes"
-           />
+  <xsl:import href="../../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
-  <xsl:template match="/">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()" />
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="/html/body">
-    <body>
+  <xsl:template match="body">
       <xsl:apply-templates />
       
-      <h3>
-        <xsl:value-of select="/html/text[@id='osig']" />
-        (<xsl:value-of select="count(/html/set/osig/li)" />)
+      <h3 id="organisations">
+        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'osig'" /></xsl:call-template>
+        (<xsl:value-of select="count(/buildinfo/document/set/osig/li)" />)
       </h3>
       <ul>
-        <xsl:apply-templates select="/html/set/osig/node()">
+        <xsl:apply-templates select="/buildinfo/document/set/osig/node()">
           <xsl:sort select="." />
         </xsl:apply-templates>
       </ul>
       
-      <h3>
-      	<xsl:value-of select="/html/text[@id='bsig']" />
-      	(<xsl:value-of select="count(/html/set/bsig/li)" />)
+      <h3 id="businesses">
+      	<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'bsig'" /></xsl:call-template>
+      	(<xsl:value-of select="count(/buildinfo/document/set/bsig/li)" />)
       </h3>
       <ul>
-        <xsl:apply-templates select="/html/set/bsig/node()">
+        <xsl:apply-templates select="/buildinfo/document/set/bsig/node()">
           <xsl:sort select="." />
         </xsl:apply-templates>
       </ul>
       
-      <h3>
-        <xsl:value-of select="/html/text[@id='isig']" />
-        (<xsl:value-of select="count(/html/set/isig/li)" />)
+      <h3 id="individuals">
+        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'isig'" /></xsl:call-template>
+        (<xsl:value-of select="count(/buildinfo/document/set/isig/li)" />)
       </h3>
       <ul>
-        <xsl:apply-templates select="/html/set/isig/node()">
+        <xsl:apply-templates select="/buildinfo/document/set/isig/node()">
           <xsl:sort select="." />
         </xsl:apply-templates>
       </ul>
-      <xsl:apply-templates select="/html/text/footer/node()" />
-    </body>
+      <xsl:apply-templates select="/buildinfo/document/text/footer/node()" />
   </xsl:template>
   
   <xsl:template match="country-list">
     <xsl:call-template name="country-list" />
   </xsl:template>
   
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="/html/set" />
-  <xsl:template match="/html/text" />
 </xsl:stylesheet>

campaigns/projects.xsl

@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
-    <xsl:for-each select="/html/set/project [@status = 'active']">
+    <xsl:for-each select="/buildinfo/document/set/project [@status = 'active']">
       <xsl:sort select="@date" order="descending"/>
 
       <!-- Title -->
@@ -26,14 +27,4 @@
     </xsl:for-each>
   </xsl:template>
 
-  <!-- Do not copy <set> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
 </xsl:stylesheet>

campaigns/swpat/documents.xsl

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes" />
+  <xsl:import href="../../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
     <xsl:element name="ul">
-      <xsl:for-each select="/html/set/document">
+      <xsl:for-each select="/buildinfo/document/set/document">
         <xsl:sort select="@date" order="descending" />
         <xsl:element name="li">
           <xsl:element name="p">
@@ -38,14 +39,4 @@
     </xsl:element>
   </xsl:template>
 
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set" />
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
 </xsl:stylesheet>

campaigns/swpat/memorandum.de.xhtml

@@ -91,17 +91,16 @@ erlaubt, jedoch Softwarepatentierung eindeutig verhindert.</p>
  Präsident<br />
  Free Software Foundation Europe (FSFE)</p>
 
-      <p>
-      	Wenn sie ihren Namen, oder den ihrer Organisation auf dieser
-	Listen hinzufügen möchten, kontaktieren sie bitte
-	<a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-      </p>
+<p>
+  Wenn sie ihren Namen, oder den ihrer Organisation auf dieser
+  Listen hinzufügen möchten, kontaktieren sie bitte
+  <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+</p>
+
+<signatories/>
 
   </body>
 
-  <text id="osig">Organisationen</text>
-  <text id="isig">Privatpersonen</text>
-
 
   <timestamp>$Date$ $Author$</timestamp>
 </html>

campaigns/swpat/memorandum.el.xhtml

@@ -89,18 +89,17 @@
  Πρόεδρος<br />
  Ευρωπαϊκό Ίδρυμα Ελεύθερου Λογισμικού (FSFE)</p>
 
-      <p>
-        Αν επιθυμείτε να δείτε το όνομά σας ή το όνομα του οργανισμού στον
-        οποίο ανήκετε, να προστίθεται σε αυτόν τον κατάλογο, παρακαλούμε
-        επικοινωνήστε με τη διεύθυνση 
-        <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-      </p>
+  <p>
+    Αν επιθυμείτε να δείτε το όνομά σας ή το όνομα του οργανισμού στον
+    οποίο ανήκετε, να προστίθεται σε αυτόν τον κατάλογο, παρακαλούμε
+    επικοινωνήστε με τη διεύθυνση 
+    <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+  </p>
+  
+  <signatories/>
 
   </body>
 
-  <text id="osig">Οργανισμοί</text>
-  <text id="isig">Άτομα</text>
-
 
   <timestamp>$Date$ $Author$</timestamp>
 </html>

campaigns/swpat/memorandum.en.xhtml

@@ -84,17 +84,16 @@ prevents software patenting.</p>
  President<br />
  Free Software Foundation Europe (FSFE)</p>
 
-      <p>
-        If you wish to see your name or the name of your organisation added
-        to this list, please contact 
-        <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-      </p>
+<p>
+  If you wish to see your name or the name of your organisation added
+  to this list, please contact 
+  <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+</p>
+
+<signatories/>
 
   </body>
 
-  <text id="osig">Organisations</text>
-  <text id="isig">Individuals</text>
-
 
   <timestamp>$Date$ $Author$</timestamp>
 </html>

campaigns/swpat/memorandum.it.xhtml

@@ -107,16 +107,15 @@ esplicitamente la brevettabilit
  Presidente<br />
  Free Software Foundation Europe (FSFE)</p>
 
-      <p>
-        Se volete aggiungere ai firmatari il vostro nome, o quello della vostra organizzazione,
-        contattate <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-      </p>
+<p>
+  Se volete aggiungere ai firmatari il vostro nome, o quello della vostra organizzazione,
+  contattate <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+</p>
+
+<signatories/>
 
   </body>
 
-  <text id="osig">Organizzazioni</text>
-  <text id="isig">Individui</text>
-
 
   <timestamp>$Date$ $Author$</timestamp>
 </html>

campaigns/swpat/memorandum.xsl

@@ -3,39 +3,22 @@
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-  <xsl:output method="xml"
-           encoding="ISO-8859-1"
-           indent="yes"
-           />
+  <xsl:import href="../../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
-  <xsl:template match="/">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()" />
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="/html/body">
-    <body>
-      <xsl:apply-templates />
-      <div class="indent"><b><xsl:value-of select="/html/text[@id='osig']" /></b>
+  <xsl:template match="signatories">
+      
+    <div class="indent">
+      <b><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'osig'" /></xsl:call-template></b>
       <ul>
-        <xsl:apply-templates select="/html/set/osig/node()" />
+        <xsl:apply-templates select="/buildinfo/document/set/osig/node()" />
       </ul>
 
-      <b><xsl:value-of select="/html/text[@id='isig']" /></b>
+      <b><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'isig'" /></xsl:call-template></b>
       <ul>
-        <xsl:apply-templates select="/html/set/isig/node()" />
-      </ul></div>
-      <xsl:apply-templates select="/html/text/footer/node()" />
-    </body>
+        <xsl:apply-templates select="/buildinfo/document/set/isig/node()" />
+      </ul>
+    </div>
   </xsl:template>
 
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="/html/set" />
-  <xsl:template match="/html/text" />
 </xsl:stylesheet>

campaigns/valentine/2011/valentine-2011.xsl

@@ -4,7 +4,8 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:dt="http://xsltsl.org/date-time">
   
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+  <xsl:import href="../../../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
   <!-- 
     For documentation on tagging (e.g. fetching news and events), take a
@@ -41,14 +42,4 @@
 	  </xsl:element>-->
   </xsl:template>
   
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-  
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
 </xsl:stylesheet>

contact/local.en.xml

@@ -4,7 +4,7 @@
 
 <contactset>
   <contact id="AT">
-<homepage>/at</homepage>
+    <homepage>/at</homepage>
     <email>austria@fsfeurope.org</email>
   </contact>
 

contact/local.xsl

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
-    <xsl:for-each select="/html/set/contact">
+    <xsl:for-each select="/buildinfo/document/set/contact">
       <xsl:sort select="@id" />
 
       <xsl:variable name="country">
@@ -13,31 +14,32 @@
       </xsl:variable>
 
       <!-- Heading -->
-      <xsl:element name="h3">
-        <xsl:value-of select="/html/set/country[@id=$country]" />
-      </xsl:element>
+      <h3>
+        <xsl:call-template name="generate-id-attribute" />
+        <xsl:value-of select="/buildinfo/document/set/country[@id=$country]" />
+      </h3>
 
       <!-- Team homepage -->
       <xsl:if test="homepage != ''">
-	  <xsl:element name="strong">
-		  <xsl:element name="a">
-		    <xsl:attribute name="href">
-			<xsl:value-of select="homepage" />
-		    </xsl:attribute>
-		    Team Homepage
-		  </xsl:element>
-		</xsl:element>
+        <xsl:element name="strong">
+          <xsl:element name="a">
+            <xsl:attribute name="href">
+              <xsl:value-of select="homepage" />
+            </xsl:attribute>
+            Team Homepage
+          </xsl:element>
+        </xsl:element>
       </xsl:if>
 
       <!-- Address -->
       <xsl:if test="address != ''">
-      <xsl:apply-templates select="address"/>
+        <xsl:apply-templates select="address"/>
       </xsl:if>
 
       <!-- Email -->
       <xsl:if test="email != ''">
         <xsl:element name="p">
-          <xsl:value-of select="/html/text[@id='email']" />
+          <xsl:value-of select="/buildinfo/document/text[@id='email']" />
           <xsl:text> </xsl:text>
           <xsl:element name="a">
             <xsl:attribute name="href">
@@ -52,7 +54,7 @@
       <!-- Phone -->
       <xsl:if test="phone != ''">
         <xsl:element name="p">
-          <xsl:value-of select="/html/text[@id='phone']" />
+          <xsl:value-of select="/buildinfo/document/text[@id='phone']" />
           <xsl:text> </xsl:text>
           <xsl:value-of select="phone" />
         </xsl:element>
@@ -61,7 +63,7 @@
       <!-- Fax -->
       <xsl:if test="fax != ''">
         <xsl:element name="p">
-          <xsl:value-of select="/html/text[@id='fax']" />
+          <xsl:value-of select="/buildinfo/document/text[@id='fax']" />
           <xsl:text> </xsl:text>
           <xsl:value-of select="fax" />
         </xsl:element>
@@ -70,30 +72,30 @@
       <!-- Core team members -->
       <xsl:element name="p">
         <xsl:choose>
-          <xsl:when test="count(/html/set/person[count(country[text()=$country])>0 and contains(@teams, 'main')])>0">
-            <xsl:value-of select="/html/text[@id='members']" />
+          <xsl:when test="count(/buildinfo/document/set/person[count(country[text()=$country])>0 and contains(@teams, 'main')])>0">
+            <xsl:value-of select="/buildinfo/document/text[@id='members']" />
             <xsl:text> </xsl:text>
-            <xsl:for-each select="/html/set/person[count(country[text()=$country])>0 and contains(@teams, 'main')]">
+            <xsl:for-each select="/buildinfo/document/set/person[count(country[text()=$country])>0 and contains(@teams, 'main')]">
               <xsl:if test="position()!=1">
                 <xsl:text>, </xsl:text>
               </xsl:if>
-	      <xsl:choose>
-		<xsl:when test="link != ''">
-		  <xsl:element name="a">
-		    <xsl:attribute name="href">
-			<xsl:value-of select="link" />
-		    </xsl:attribute>
-		    <xsl:value-of select="name" />
-		  </xsl:element>
-		</xsl:when>
-		<xsl:otherwise>
-		  <xsl:value-of select="name" />
-		</xsl:otherwise>
-	      </xsl:choose>
+              <xsl:choose>
+                <xsl:when test="link != ''">
+                  <xsl:element name="a">
+                    <xsl:attribute name="href">
+                  <xsl:value-of select="link" />
+                    </xsl:attribute>
+                    <xsl:value-of select="name" />
+                  </xsl:element>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="name" />
+                </xsl:otherwise>
+              </xsl:choose>
             </xsl:for-each>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:value-of select="/html/text[@id='nomembers']" />
+            <xsl:value-of select="/buildinfo/document/text[@id='nomembers']" />
           </xsl:otherwise>
         </xsl:choose>
       </xsl:element>
@@ -101,15 +103,4 @@
     </xsl:for-each>
   </xsl:template>
 
-  <!-- Do not copy <set> and <text> to output at all -->
-  <xsl:template match="set" />
-  <xsl:template match="text" />
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
 </xsl:stylesheet>

de/de.xsl

@@ -7,7 +7,8 @@
   <xsl:import href="../tools/xsltsl/tagging.xsl" />
   <xsl:import href="../tools/xsltsl/countries.xsl" />
   <xsl:import href="../tools/xsltsl/translations.xsl" />
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- To localise this page to a new country, copy this file and change the following:
   
@@ -60,7 +61,7 @@
   <!--define contact information-->
   
   <xsl:template match="contact-details">
-    <xsl:for-each select="/html/set/contact">
+    <xsl:for-each select="/buildinfo/document/set/contact">
 
     <xsl:if test="@id = 'DE'">
   
@@ -145,15 +146,5 @@
             </xsl:with-param>
         </xsl:call-template>
     </xsl:template>
-  
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 
 </xsl:stylesheet>

default.xsl

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:dt="http://xsltsl.org/date-time"
+  exclude-result-prefixes="dt">
+  
+  <xsl:import href="fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  
+</xsl:stylesheet> 

documents/documents.xsl

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes" />
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
     <xsl:variable name="type"><xsl:value-of select="@type" /></xsl:variable>
     <xsl:element name="ul">
-      <xsl:for-each select="/html/set/document [@type = $type]">
+      <xsl:for-each select="/buildinfo/document/set/document [@type = $type]">
         <xsl:sort select="@date" order="descending" />
         <xsl:element name="li">
           <xsl:element name="p">
@@ -39,14 +40,4 @@
     </xsl:element>
   </xsl:template>
 
-  <!-- Do not copy <set> to output at all -->
-  <xsl:template match="set" />
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
 </xsl:stylesheet>

documents/whyfs.xsl

@@ -3,22 +3,11 @@
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-  <xsl:output method="xml"
-           encoding="UTF-8"
-           indent="yes"
-           />
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <xsl:template match="speakers">
-    <xsl:copy-of select="/html/set/table" />
-  </xsl:template>
-  
-  <!-- Do not copy <set> to output at all -->
-  <xsl:template match="set" />
-
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
+    <xsl:copy-of select="/buildinfo/document/set/table" />
   </xsl:template>
 </xsl:stylesheet>
 

donate/thankgnus-2001.xsl

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
@@ -9,7 +10,7 @@
     <xsl:choose>
       <xsl:when test="$group='patrons'">
         <xsl:element name="table">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="tr">
               <xsl:element name="td">
                 <xsl:element name="img">
@@ -26,7 +27,7 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:element name="ul">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="li">
               <xsl:apply-templates select="node()"/>
             </xsl:element>
@@ -35,15 +36,5 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 </xsl:stylesheet>
 

donate/thankgnus-2002.xsl

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
@@ -9,7 +10,7 @@
     <xsl:choose>
       <xsl:when test="$group='patrons'">
         <xsl:element name="table">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="tr">
               <xsl:element name="td">
                 <xsl:element name="img">
@@ -26,7 +27,7 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:element name="ul">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="li">
               <xsl:apply-templates select="node()"/>
             </xsl:element>
@@ -35,15 +36,5 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 </xsl:stylesheet>
 

donate/thankgnus-2003.xsl

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
@@ -9,7 +10,7 @@
     <xsl:choose>
       <xsl:when test="$group='patrons'">
         <xsl:element name="table">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="tr">
               <xsl:element name="td">
                 <xsl:element name="img">
@@ -26,7 +27,7 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:element name="ul">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="li">
               <xsl:apply-templates select="node()"/>
             </xsl:element>
@@ -35,15 +36,5 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 </xsl:stylesheet>
 

donate/thankgnus-2004.xsl

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
@@ -9,7 +10,7 @@
     <xsl:choose>
       <xsl:when test="$group='patrons'">
         <xsl:element name="table">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="tr">
               <xsl:element name="td">
                 <xsl:element name="img">
@@ -26,7 +27,7 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:element name="ul">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="li">
               <xsl:apply-templates select="node()"/>
             </xsl:element>
@@ -35,15 +36,5 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 </xsl:stylesheet>
 

donate/thankgnus-2005.xsl

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
@@ -9,7 +10,7 @@
     <xsl:choose>
       <xsl:when test="$group='patrons'">
         <xsl:element name="table">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="tr">
               <xsl:element name="td">
                 <xsl:element name="img">
@@ -26,7 +27,7 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:element name="ul">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="li">
               <xsl:apply-templates select="node()"/>
             </xsl:element>
@@ -35,15 +36,5 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 </xsl:stylesheet>
 

donate/thankgnus-2006.xsl

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
@@ -9,7 +10,7 @@
     <xsl:choose>
       <xsl:when test="$group='patrons'">
         <xsl:element name="table">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="tr">
               <xsl:element name="td">
                 <xsl:element name="img">
@@ -26,7 +27,7 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:element name="ul">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="li">
               <xsl:apply-templates select="node()"/>
             </xsl:element>
@@ -35,15 +36,5 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 </xsl:stylesheet>
 

donate/thankgnus-2007.xsl

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
@@ -9,7 +10,7 @@
     <xsl:choose>
       <xsl:when test="$group='patrons'">
         <xsl:element name="table">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="tr">
               <xsl:element name="td">
                 <xsl:element name="img">
@@ -26,7 +27,7 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:element name="ul">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="li">
               <xsl:apply-templates select="node()"/>
             </xsl:element>
@@ -35,15 +36,5 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 </xsl:stylesheet>
 

donate/thankgnus-2008.xsl

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
@@ -9,7 +10,7 @@
     <xsl:choose>
       <xsl:when test="$group='patrons'">
         <xsl:element name="table">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="tr">
               <xsl:element name="td">
                 <xsl:element name="img">
@@ -26,7 +27,7 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:element name="ul">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="li">
               <xsl:apply-templates select="node()"/>
             </xsl:element>
@@ -35,15 +36,5 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 </xsl:stylesheet>
 

donate/thankgnus-2009.xsl

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
@@ -9,7 +10,7 @@
     <xsl:choose>
       <xsl:when test="$group='patrons'">
         <xsl:element name="table">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="tr">
               <xsl:element name="td">
                 <xsl:element name="img">
@@ -26,7 +27,7 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:element name="ul">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="li">
               <xsl:apply-templates select="node()"/>
             </xsl:element>
@@ -35,15 +36,5 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 </xsl:stylesheet>
 

donate/thankgnus-2010.xsl

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
@@ -9,7 +10,7 @@
     <xsl:choose>
       <xsl:when test="$group='patrons'">
         <xsl:element name="table">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="tr">
               <xsl:element name="td">
                 <xsl:element name="img">
@@ -26,7 +27,7 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:element name="ul">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="li">
               <xsl:apply-templates select="node()"/>
             </xsl:element>
@@ -35,15 +36,5 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 </xsl:stylesheet>
 

donate/thankgnus-2011.xsl

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
@@ -9,7 +10,7 @@
     <xsl:choose>
       <xsl:when test="$group='patrons'">
         <xsl:element name="table">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="tr">
               <xsl:element name="td">
                 <xsl:element name="img">
@@ -26,7 +27,7 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:element name="ul">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="li">
               <xsl:apply-templates select="node()"/>
             </xsl:element>
@@ -35,15 +36,5 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 </xsl:stylesheet>
 

donate/thankgnus-2012.xsl

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
@@ -9,7 +10,7 @@
     <xsl:choose>
       <xsl:when test="$group='patrons'">
         <xsl:element name="table">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="tr">
               <xsl:element name="td">
                 <xsl:element name="img">
@@ -26,7 +27,7 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:element name="ul">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
             <xsl:element name="li">
               <xsl:apply-templates select="node()"/>
             </xsl:element>
@@ -35,15 +36,5 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 </xsl:stylesheet>
 

donate/thankgnus.xsl

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- $today = current date (given as <html date="...">) -->
   <xsl:variable name="today">
-    <xsl:value-of select="/html/@date"/>
+    <xsl:value-of select="/buildinfo/@date"/>
   </xsl:variable>
 
   <!-- $frommonth = date from which the list should start -->
@@ -20,7 +21,7 @@
       <xsl:when test="$group='patrons'">
         <xsl:element name="table">
           <xsl:attribute name="id">patrons</xsl:attribute>
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor[translate(@date,'-','')&gt;=translate($frommonth,'-','')]">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor[translate(@date,'-','')&gt;=translate($frommonth,'-','')]">
             <xsl:sort select="translate(node(),'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
             <xsl:element name="tr">
               <xsl:element name="td">
@@ -38,7 +39,7 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:element name="ul">
-          <xsl:for-each select="/html/set/*[name(.)=$group]/donor[translate(@date,'-','')&gt;=translate($frommonth,'-','')]">
+          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor[translate(@date,'-','')&gt;=translate($frommonth,'-','')]">
             <xsl:sort select="translate(node(),'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
             <xsl:element name="li">
               <xsl:apply-templates select="node()"/>
@@ -48,15 +49,5 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
-  <!-- Do not copy <set> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 </xsl:stylesheet>
 

events/events.ics.xsl

@@ -53,16 +53,16 @@
   </xsl:template>
 
   <!-- In /html/body node, append dynamic content -->
-  <xsl:template match="/html/body">
+  <xsl:template match="body">
 	  <xsl:text>BEGIN:VCALENDAR</xsl:text><xsl:call-template name="nl" />
 	  <xsl:text>VERSION:2.0</xsl:text><xsl:call-template name="nl" />
 	  <xsl:text>PRODID:fsfe.org/events/events.ics.xsl</xsl:text><xsl:call-template name="nl" />
       <!-- $today = current date (given as <html date="...">) -->
       <xsl:variable name="today">
-        <xsl:value-of select="/html/@date" />
+        <xsl:value-of select="/buildinfo/@date" />
       </xsl:variable>
       <!-- Future events -->
-      <xsl:for-each select="/html/set/event
+      <xsl:for-each select="/buildinfo/document/set/event
         [translate (@start, '-', '') &gt;= translate ($today, '-', '')]">
         <xsl:sort select="@start" order="descending" />
         <xsl:call-template name="event">

events/events.rss.xsl

@@ -11,7 +11,7 @@
 
   <!-- $today = current date (given as <html date="...">) -->
   <xsl:variable name="today">
-    <xsl:value-of select="/html/@date" />
+    <xsl:value-of select="/buildinfo/@date" />
   </xsl:variable>
 
   
@@ -47,7 +47,7 @@
         </image>
 
         <!-- Event items -->
-        <xsl:for-each select="/html/set/event
+        <xsl:for-each select="/buildinfo/document/set/event
           [translate (@end, '-', '') &gt;= translate ($today, '-', '')]">
           <xsl:sort select="@start" />
           <xsl:if test="position() &lt; 11">

events/events.xsl

@@ -5,7 +5,8 @@
   xmlns:dt="http://xsltsl.org/date-time">
 
   <xsl:import href="../tools/xsltsl/tagging.xsl" />
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
   <!-- 
       For documentation on tagging (e.g. fetching news and events), take a
@@ -13,27 +14,27 @@
         /tools/xsltsl/tagging-documentation.txt
   -->
 
-  <!-- Basically, copy everything -->
-  <xsl:template match="/">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()" />
-    </xsl:copy>
-  </xsl:template>
-
   <!-- we need to include some things for event maps -->
-  <xsl:template match="/html/head">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()" />
-
-      <link rel="stylesheet" href="/look/leaflet.css" />
-      <script type="text/javascript" src="/scripts/leaflet.js"></script>
-      <script type="text/javascript" src="/scripts/map.js"></script>
-    </xsl:copy>
+  <xsl:template match="head">
+    <head>
+      <xsl:call-template name="fsfe-head" />
+      <xsl:element name="link">
+        <xsl:attribute name="rel">stylesheet</xsl:attribute>
+        <xsl:attribute name="href">/look/leaflet.css</xsl:attribute>
+      </xsl:element>
+      <xsl:element name="script">
+        <xsl:attribute name="type">text/javascript</xsl:attribute>
+        <xsl:attribute name="src">/scripts/leaflet.js</xsl:attribute>
+      </xsl:element>
+      <xsl:element name="script">
+        <xsl:attribute name="type">text/javascript</xsl:attribute>
+        <xsl:attribute name="src">/scripts/map.js</xsl:attribute>
+      </xsl:element>
+    </head>
   </xsl:template>
 
   <!-- In /html/body node, append dynamic content -->
-  <xsl:template match="/html/body">
-    <xsl:element name="body">
+  <xsl:template match="body">
       <!-- First, include what's in the source file -->
       <xsl:apply-templates />
       
@@ -61,18 +62,6 @@
           <xsl:with-param name="display-year" select="'yes'" />
       </xsl:call-template>
 
-    </xsl:element>
-  </xsl:template>
-
-  <!-- Do not copy <set> and <text> to output at all -->
-  <xsl:template match="set" />
-  <xsl:template match="text" />
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
   </xsl:template>
 
 </xsl:stylesheet>

fellowship/default.xsl

@@ -9,8 +9,8 @@
   <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
   <!-- The top level element of the input file is "buildinfo" -->
-  <xsl:template match="buildinfo">
-    <xsl:apply-templates select="node()"/>
+  <xsl:template match="/">
+    <xsl:apply-templates select="buildinfo/document"/>
   </xsl:template>
 
   <!-- The actual HTML tree is in "buildinfo/document" -->
@@ -22,7 +22,9 @@
       <xsl:if test="/buildinfo/@language='ar'">
         <xsl:attribute name="dir">rtl</xsl:attribute>
       </xsl:if>
-      <xsl:apply-templates select="node()"/>
+      <!--<xsl:apply-templates select="node()"/>-->
+      <xsl:apply-templates select="head" />
+      <xsl:call-template name="fsfe-body" />
     </xsl:element>
   </xsl:template>
 
@@ -232,8 +234,8 @@
   <!-- End modifications to H1 -->  
 
   <!-- HTML body -->
-  <xsl:template match="body">
-    <xsl:copy>
+  <xsl:template name="fsfe-body">
+    <body>
 
       <!-- For pages used on external web servers, use absolute URLs -->
       <xsl:variable name="urlprefix"><xsl:if test="/buildinfo/document/@external">https://fsfe.org</xsl:if></xsl:variable>
@@ -315,126 +317,126 @@
         <!-- Sidebar -->
         <xsl:element name="div">
           <xsl:attribute name="id">sidebar</xsl:attribute>
-	  
+    
           <!-- Menu -->
           <xsl:element name="div">
-	    <xsl:attribute name="id">menu</xsl:attribute>
-	    
-	    <xsl:element name="ul">
+      <xsl:attribute name="id">menu</xsl:attribute>
+      
+      <xsl:element name="ul">
 
-	      <!-- Fellowship portal menu -->
-	      <xsl:element name="li">
-		<xsl:attribute name="class">fellowship</xsl:attribute>
+        <!-- Fellowship portal menu -->
+        <xsl:element name="li">
+    <xsl:attribute name="class">fellowship</xsl:attribute>
 
-		<xsl:element name="a">
-		  <xsl:attribute name="href">/fellowship/</xsl:attribute>
-		  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fellowship/fellowship'" /></xsl:call-template>
-		</xsl:element>
+    <xsl:element name="a">
+      <xsl:attribute name="href">/fellowship/</xsl:attribute>
+      <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fellowship/fellowship'" /></xsl:call-template>
+    </xsl:element>
 
-		<xsl:element name="ul">
-		  <xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
+    <xsl:element name="ul">
+      <xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
 
-		  <xsl:for-each select="/buildinfo/menuset/menu[@parent='fellowship']">
-		    <xsl:sort select="@priority" />
-		    <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
+      <xsl:for-each select="/buildinfo/menuset/menu[@parent='fellowship']">
+        <xsl:sort select="@priority" />
+        <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
 
-		    <xsl:element name="li">
-		      <xsl:choose>
-			<xsl:when test="not(string(.))">
-			  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-			</xsl:when>
+        <xsl:element name="li">
+          <xsl:choose>
+      <xsl:when test="not(string(.))">
+        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+      </xsl:when>
 
                         <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
                           <xsl:element name="span">
                             <xsl:attribute name="id">selected</xsl:attribute>
                             <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
                           </xsl:element>
-			</xsl:when>
+      </xsl:when>
 
-			<xsl:otherwise>
-			  <xsl:element name="a">
-			    <xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
-			    <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-			  </xsl:element>
-			</xsl:otherwise>
-		      </xsl:choose>		      
-		    </xsl:element>
-		  </xsl:for-each>
-		</xsl:element>
-	      </xsl:element>
-	      
-	      <!-- FSFE portal menu -->
-	      <xsl:element name="li">
-		<xsl:attribute name="class">fsfe</xsl:attribute>
+      <xsl:otherwise>
+        <xsl:element name="a">
+          <xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+        </xsl:element>
+      </xsl:otherwise>
+          </xsl:choose>         
+        </xsl:element>
+      </xsl:for-each>
+    </xsl:element>
+        </xsl:element>
+        
+        <!-- FSFE portal menu -->
+        <xsl:element name="li">
+    <xsl:attribute name="class">fsfe</xsl:attribute>
 
-		<xsl:element name="a">
-		  <xsl:attribute name="href">/</xsl:attribute>
-		  <xsl:text>FSFE</xsl:text>
-		</xsl:element>
+    <xsl:element name="a">
+      <xsl:attribute name="href">/</xsl:attribute>
+      <xsl:text>FSFE</xsl:text>
+    </xsl:element>
 
-		<xsl:element name="ul">	      
-		  <xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
+    <xsl:element name="ul">       
+      <xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
 
-		  <xsl:for-each select="/buildinfo/menuset/menu[@parent='fsfe']">
-		    <xsl:sort select="@priority" />
-		    <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
-		    <xsl:element name="li">
-		      <xsl:choose>
+      <xsl:for-each select="/buildinfo/menuset/menu[@parent='fsfe']">
+        <xsl:sort select="@priority" />
+        <xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
+        <xsl:element name="li">
+          <xsl:choose>
 
-			<!-- <menu id="fsfe" /> (illformed XML header for menu) -->
-			<xsl:when test="not(string(.))">
-			  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-			</xsl:when>
+      <!-- <menu id="fsfe" /> (illformed XML header for menu) -->
+      <xsl:when test="not(string(.))">
+        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+      </xsl:when>
 
-			<!-- Selected menu item, we're on this page -->
-			<xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
-			  <xsl:element name="span">
-			    <xsl:attribute name="id">selected</xsl:attribute>
-			    <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-			  </xsl:element>
-			</xsl:when>
+      <!-- Selected menu item, we're on this page -->
+      <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
+        <xsl:element name="span">
+          <xsl:attribute name="id">selected</xsl:attribute>
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+        </xsl:element>
+      </xsl:when>
 
-			<!-- Regular menu item, nonselected -->
-			<xsl:otherwise>
-			  <xsl:element name="a">
-			    <xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
-			    <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
-			  </xsl:element>
-			</xsl:otherwise>
+      <!-- Regular menu item, nonselected -->
+      <xsl:otherwise>
+        <xsl:element name="a">
+          <xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
+        </xsl:element>
+      </xsl:otherwise>
 
-		      </xsl:choose>		  
-		    </xsl:element>
-		  </xsl:for-each>
-		</xsl:element>
-	      </xsl:element>
+          </xsl:choose>     
+        </xsl:element>
+      </xsl:for-each>
+    </xsl:element>
+        </xsl:element>
 
-	      <!-- Planet portal menu -->
-	      <xsl:element name="li">
-		<xsl:attribute name="class">planet</xsl:attribute>
-		<xsl:element name="a">
-		  <xsl:attribute name="href">http://planet.fsfe.org/</xsl:attribute>
-		  <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'planet/blogs'" /></xsl:call-template>
-		</xsl:element>
-		<!-- causes validation errors, needs li to pass validator?
-		     <xsl:element name="ul">
-		     
-		     </xsl:element>-->
-	      </xsl:element>
-	      
+        <!-- Planet portal menu -->
+        <xsl:element name="li">
+    <xsl:attribute name="class">planet</xsl:attribute>
+    <xsl:element name="a">
+      <xsl:attribute name="href">http://planet.fsfe.org/</xsl:attribute>
+      <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'planet/blogs'" /></xsl:call-template>
+    </xsl:element>
+    <!-- causes validation errors, needs li to pass validator?
+         <xsl:element name="ul">
+         
+         </xsl:element>-->
+        </xsl:element>
+        
 
 
-	      <!-- Wiki -->
-	      <xsl:element name="li">
-		<xsl:attribute name="class">wiki</xsl:attribute>
-		<xsl:element name="a">
-		  <xsl:attribute name="href">http://wiki.fsfe.org/</xsl:attribute>
-		  Wiki
-		</xsl:element>
-	      </xsl:element> <!-- /li -->
-	    </xsl:element> <!-- /ul -->
+        <!-- Wiki -->
+        <xsl:element name="li">
+    <xsl:attribute name="class">wiki</xsl:attribute>
+    <xsl:element name="a">
+      <xsl:attribute name="href">http://wiki.fsfe.org/</xsl:attribute>
+      Wiki
+    </xsl:element>
+        </xsl:element> <!-- /li -->
+      </xsl:element> <!-- /ul -->
 
-	    
-	  </xsl:element><!-- end menu -->
+      
+    </xsl:element><!-- end menu -->
         
         <xsl:element name="div">
           <xsl:attribute name="id">search</xsl:attribute>
@@ -669,7 +671,7 @@
         <!-- End Fundraising box -->
 
         <!-- Here goes the actual content of the <body> node of the input file -->
-        <xsl:apply-templates select="node()"/>
+        <xsl:apply-templates select="body"/>
 
         <!-- Link to top -->
         <xsl:element name="p">
@@ -691,7 +693,7 @@
           Copyright © 2001-2011 <a href="/">Free Software
         Foundation Europe</a>. <strong>
         <a href="/contact/contact.html">
-          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'contact'" /></xsl:call-template>
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'contact-us'" /></xsl:call-template>
         </a></strong>.<br />
 
           <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'permission'" /></xsl:call-template><br />
@@ -771,21 +773,21 @@
       
     </div> <!-- /#footer -->
     
-	<!-- Piwik -->
-	<script type="text/javascript">
-	var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsfe.org/" : "http://piwik.fsfe.org/");
-	document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-	</script><script type="text/javascript">
-	try {
-	var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 4);
-	piwikTracker.trackPageView();
-	piwikTracker.enableLinkTracking();
-	} catch( err ) {}
-	</script><noscript><p><img src="http://piwik.fsfe.org/piwik.php?idsite=4" style="border:0" alt="" /></p></noscript>
-	<!-- End Piwik Tracking Code -->
+  <!-- Piwik -->
+  <script type="text/javascript">
+  var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsfe.org/" : "http://piwik.fsfe.org/");
+  document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+  </script><script type="text/javascript">
+  try {
+  var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 4);
+  piwikTracker.trackPageView();
+  piwikTracker.enableLinkTracking();
+  } catch( err ) {}
+  </script><noscript><p><img src="http://piwik.fsfe.org/piwik.php?idsite=4" style="border:0" alt="" /></p></noscript>
+  <!-- End Piwik Tracking Code -->
     
       </xsl:element>
-    </xsl:copy>
+    </body>
   </xsl:template>
 
   <!-- Insert local menu -->

fellowship/index.xsl

@@ -1,38 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+  <xsl:import href="default.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
-  <xsl:template match="/html/head">
-    <xsl:copy>
-      <xsl:element name="link">
-        <xsl:attribute name="href">/look/fellowship.css</xsl:attribute>
-        <xsl:attribute name="rel">stylesheet</xsl:attribute>
-      </xsl:element>
-
-      <xsl:apply-templates />
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="/html/body">
+  <xsl:template match="body">
     <!-- xsl:attribute name="id">fellowship</xsl:attribute -->
-
-    <xsl:copy>
       <div id="fellowship">
         <xsl:apply-templates />
       </div>
-    </xsl:copy>
-  </xsl:template>
-
-  <!--
-  <xsl:template match="/html/body/div[@id='wrapper-inner']/div[@id='header']/div[@id='logo']/a/img">
-    <xsl:attribute name="src">/graphics/fellowship/logo.png</xsl:attribute>
-  </xsl:template>
-  -->
-
-  <xsl:template match="@* | node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@* | node()" />
-    </xsl:copy>
   </xsl:template>
 </xsl:stylesheet>

fi/fi.xsl

@@ -7,7 +7,8 @@
   <xsl:import href="../tools/xsltsl/tagging.xsl" />
   <xsl:import href="../tools/xsltsl/countries.xsl" />
   <xsl:import href="../tools/xsltsl/translations.xsl" />
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- To localise this page to a new country, copy this file and change the following:
   
@@ -60,7 +61,7 @@
   <!--define contact information-->
   
   <xsl:template match="contact-details">
-    <xsl:for-each select="/html/set/contact">
+    <xsl:for-each select="/buildinfo/document/set/contact">
 
     <xsl:if test="@id = 'FI'">
   
@@ -145,15 +146,5 @@
             </xsl:with-param>
         </xsl:call-template>
     </xsl:template>
-  
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 
 </xsl:stylesheet>

fr/fr.fr.xhtml

@@ -40,11 +40,10 @@ soutien de la liberté logicielle." />
     
     <div id="news" class="section">
       <h2>
-	<a class="rss-feed" href="/news/news.rss"><img src="/graphics/rss.png" alt="Actualités RSS" title="flux RSS des nouvelles" /></a>
-	<a class="ical" href="http://identi.ca/fsfefrance"><img src="/graphics/identica.png" alt="identica" title="suivez l'équipe française de la FSFE sur identi.ca"/></a>
-	
-	<a href="/news/news.html"><news-label /></a>
-	
+        <a class="rss-feed" href="/news/news.rss"><img src="/graphics/rss.png" alt="Actualités RSS" title="flux RSS des nouvelles" /></a>
+        <a class="ical" href="http://identi.ca/fsfefrance"><img src="/graphics/identica.png" alt="identica" title="suivez l'équipe française de la FSFE sur identi.ca"/></a>
+        
+        <a href="/news/news.html"><news-label /></a>
       </h2>
       
       <!-- this element fetches all news items which have the relevant country tag -->

fr/fr.xsl

@@ -7,7 +7,8 @@
   <xsl:import href="../tools/xsltsl/tagging.xsl" />
   <xsl:import href="../tools/xsltsl/countries.xsl" />
   <xsl:import href="../tools/xsltsl/translations.xsl" />
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- To localise this page to a new country, copy this file and change the following:
   
@@ -60,7 +61,7 @@
   <!--define contact information-->
   
   <xsl:template match="contact-details">
-    <xsl:for-each select="/html/set/contact">
+    <xsl:for-each select="/buildinfo/document/set/contact">
 
     <xsl:if test="@id = 'FR'">
   
@@ -145,15 +146,5 @@
             </xsl:with-param>
         </xsl:call-template>
     </xsl:template>
-  
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 
 </xsl:stylesheet>

fsfe.xsl

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:dt="http://xsltsl.org/date-time"
+  exclude-result-prefixes="dt">
 
   <xsl:import href="tools/xsltsl/translations.xsl" />
   <xsl:import href="tools/xsltsl/static-elements.xsl" />
@@ -13,8 +15,8 @@
   </xsl:variable>
   
   <!-- The top level element of the input file is "buildinfo" -->
-  <xsl:template match="buildinfo">
-    <xsl:apply-templates select="node()"/>
+  <xsl:template match="/">
+    <xsl:apply-templates select="buildinfo/document"/>
   </xsl:template>
 
   <!-- The actual HTML tree is in "buildinfo/document" -->
@@ -26,138 +28,146 @@
       <xsl:if test="/buildinfo/@language='ar'">
         <xsl:attribute name="dir">rtl</xsl:attribute>
       </xsl:if>
-      <xsl:apply-templates select="node()"/>
+      <!--<xsl:apply-templates select="node()"/>-->
+      <xsl:apply-templates select="head" />
+      <xsl:call-template name="fsfe-body" />
     </xsl:element>
   </xsl:template>
-
+  
+  
   <!-- HTML head -->
   <xsl:template match="head">
-    <xsl:copy>
-      
-      <!-- Don't let search engine robots index untranslated pages -->
-      <xsl:element name="meta">
-        <xsl:attribute name="name">robots</xsl:attribute>
-        <xsl:attribute name="content">
-          <xsl:choose>
-            <xsl:when test="/buildinfo/@language=/buildinfo/document/@language">index, follow</xsl:when>
-            <xsl:otherwise>noindex</xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-      </xsl:element>
+    <head>
+      <xsl:call-template name="fsfe-head" />
+    </head>
+  </xsl:template>
+  
+  
+  <xsl:template name="fsfe-head">
+    
+    <!-- Don't let search engine robots index untranslated pages -->
+    <xsl:element name="meta">
+      <xsl:attribute name="name">robots</xsl:attribute>
+      <xsl:attribute name="content">
+        <xsl:choose>
+          <xsl:when test="/buildinfo/@language=/buildinfo/document/@language">index, follow</xsl:when>
+          <xsl:otherwise>noindex</xsl:otherwise>
+        </xsl:choose>
+      </xsl:attribute>
+    </xsl:element>
 
-      <!-- For pages used on external web servers, load the CSS from absolute URL -->
-      <xsl:variable name="urlprefix"><xsl:if test="/buildinfo/document/@external">https://www.fsfe.org</xsl:if></xsl:variable>
-      
+    <!-- For pages used on external web servers, load the CSS from absolute URL -->
+    <xsl:variable name="urlprefix"><xsl:if test="/buildinfo/document/@external">https://fsfe.org</xsl:if></xsl:variable>
+    
+    <xsl:element name="link">
+      <xsl:attribute name="rel">stylesheet</xsl:attribute>
+      <xsl:attribute name="media">all</xsl:attribute>
+      <xsl:attribute name="href"><xsl:value-of select="$urlprefix"/>/look/generic.css</xsl:attribute>
+      <xsl:attribute name="type">text/css</xsl:attribute>
+    </xsl:element>
+    
+    <xsl:if test="$mode = 'valentine'">
       <xsl:element name="link">
         <xsl:attribute name="rel">stylesheet</xsl:attribute>
         <xsl:attribute name="media">all</xsl:attribute>
-        <xsl:attribute name="href"><xsl:value-of select="$urlprefix"/>/look/generic.css</xsl:attribute>
+        <xsl:attribute name="href"><xsl:value-of select="$urlprefix"/>/look/genericv.css</xsl:attribute>
         <xsl:attribute name="type">text/css</xsl:attribute>
       </xsl:element>
-      
-      <xsl:if test="$mode = 'valentine'">
-        <xsl:element name="link">
-          <xsl:attribute name="rel">stylesheet</xsl:attribute>
-          <xsl:attribute name="media">all</xsl:attribute>
-          <xsl:attribute name="href"><xsl:value-of select="$urlprefix"/>/look/genericv.css</xsl:attribute>
-          <xsl:attribute name="type">text/css</xsl:attribute>
-        </xsl:element>
-      </xsl:if>
-      
+    </xsl:if>
+    
+    <xsl:element name="link">
+      <xsl:attribute name="rel">stylesheet</xsl:attribute>
+      <xsl:attribute name="media">print</xsl:attribute>
+      <xsl:attribute name="href"><xsl:value-of select="$urlprefix"/>/look/print.css</xsl:attribute>
+      <xsl:attribute name="type">text/css</xsl:attribute>
+    </xsl:element>
+    
+    <xsl:if test="/buildinfo/@language='ar'">
       <xsl:element name="link">
         <xsl:attribute name="rel">stylesheet</xsl:attribute>
-        <xsl:attribute name="media">print</xsl:attribute>
-        <xsl:attribute name="href"><xsl:value-of select="$urlprefix"/>/look/print.css</xsl:attribute>
+        <xsl:attribute name="media">all</xsl:attribute>
+        <xsl:attribute name="href"><xsl:value-of select="$urlprefix"/>/look/rtl.css</xsl:attribute>
         <xsl:attribute name="type">text/css</xsl:attribute>
       </xsl:element>
-      
-      <xsl:if test="/buildinfo/@language='ar'">
-        <xsl:element name="link">
-          <xsl:attribute name="rel">stylesheet</xsl:attribute>
-          <xsl:attribute name="media">all</xsl:attribute>
-          <xsl:attribute name="href"><xsl:value-of select="$urlprefix"/>/look/rtl.css</xsl:attribute>
-          <xsl:attribute name="type">text/css</xsl:attribute>
-        </xsl:element>
-      </xsl:if>
-      
+    </xsl:if>
+    
+    <xsl:element name="link">
+      <xsl:attribute name="rel">icon</xsl:attribute>
+      <xsl:attribute name="href">
+        <xsl:value-of select="$urlprefix"/>
+        <xsl:choose>
+          <xsl:when test="$mode = 'valentine'">/graphics/fsfev.png</xsl:when>
+          <xsl:otherwise>/graphics/fsfe.ico</xsl:otherwise>
+        </xsl:choose>
+      </xsl:attribute>
+      <xsl:attribute name="type">image/x-icon</xsl:attribute>
+    </xsl:element>
+    
+    <xsl:element name="link">
+      <xsl:attribute name="rel">alternate</xsl:attribute>
+      <xsl:attribute name="title">FSFE <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'menu1/news'" /></xsl:call-template></xsl:attribute>
+      <xsl:attribute name="href"><xsl:value-of select="$urlprefix"/>/news/news.<xsl:value-of select="/buildinfo/@language"/>.rss</xsl:attribute>
+      <xsl:attribute name="type">application/rss+xml</xsl:attribute>
+    </xsl:element>
+    
+    <xsl:element name="link">
+      <xsl:attribute name="rel">alternate</xsl:attribute>
+      <xsl:attribute name="title">FSFE <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'menu1/events'" /></xsl:call-template></xsl:attribute>
+      <xsl:attribute name="href"><xsl:value-of select="$urlprefix"/>/events/events.<xsl:value-of select="/buildinfo/@language"/>.rss</xsl:attribute>
+      <xsl:attribute name="type">application/rss+xml</xsl:attribute>
+    </xsl:element>
+
+    <xsl:for-each select="/buildinfo/trlist/tr">
+      <xsl:sort select="@id"/>
       <xsl:element name="link">
-        <xsl:attribute name="rel">icon</xsl:attribute>
-        <xsl:attribute name="href">
-          <xsl:value-of select="$urlprefix"/>
+        <xsl:attribute name="type">text/html</xsl:attribute>
+        <xsl:attribute name="rel">alternate</xsl:attribute>
+        <xsl:attribute name="hreflang"><xsl:value-of select="@id" /></xsl:attribute>
+        <xsl:attribute name="lang"><xsl:value-of select="@id" /></xsl:attribute>
+        <xsl:attribute name="href"><xsl:value-of select="/buildinfo/@filename"/>.<xsl:value-of select="@id"/>.html</xsl:attribute>
+        <xsl:attribute name="title"><xsl:value-of select="."  disable-output-escaping="yes" /></xsl:attribute>
+      </xsl:element>
+    </xsl:for-each>
+    
+    <xsl:for-each select="/buildinfo/document/author">
+      <xsl:variable name="id">
+        <xsl:value-of select="@id" />
+      </xsl:variable>
+      <xsl:element name="meta">
+        <xsl:attribute name="name">author</xsl:attribute>
+        <xsl:attribute name="content">
           <xsl:choose>
-            <xsl:when test="$mode = 'valentine'">/graphics/fsfev.png</xsl:when>
-            <xsl:otherwise>/graphics/fsfe.ico</xsl:otherwise>
+            <xsl:when test="@id and document('about/people/people.en.xml')/personset/person[@id=$id]">
+              <xsl:value-of select="document('about/people/people.en.xml')/personset/person[@id=$id]/name" />
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="name" />
+            </xsl:otherwise>
           </xsl:choose>
         </xsl:attribute>
-        <xsl:attribute name="type">image/x-icon</xsl:attribute>
-      </xsl:element>
-      
-      <xsl:element name="link">
-        <xsl:attribute name="rel">alternate</xsl:attribute>
-        <xsl:attribute name="title">FSFE <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'menu1/news'" /></xsl:call-template></xsl:attribute>
-        <xsl:attribute name="href"><xsl:value-of select="$urlprefix"/>/news/news.<xsl:value-of select="/buildinfo/@language"/>.rss</xsl:attribute>
-        <xsl:attribute name="type">application/rss+xml</xsl:attribute>
-      </xsl:element>
-      
-      <xsl:element name="link">
-        <xsl:attribute name="rel">alternate</xsl:attribute>
-        <xsl:attribute name="title">FSFE <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'menu1/events'" /></xsl:call-template></xsl:attribute>
-        <xsl:attribute name="href"><xsl:value-of select="$urlprefix"/>/events/events.<xsl:value-of select="/buildinfo/@language"/>.rss</xsl:attribute>
-        <xsl:attribute name="type">application/rss+xml</xsl:attribute>
       </xsl:element>
+    </xsl:for-each>
+    
+    <script src="/scripts/jquery.js"></script>
+    <script src="/scripts/master.js"></script>
+    <script src="/scripts/placeholder.js"></script>
+    <script src="/scripts/highlight.pack.js"></script>
 
-      <xsl:for-each select="/buildinfo/trlist/tr">
-        <xsl:sort select="@id"/>
-        <xsl:element name="link">
-          <xsl:attribute name="type">text/html</xsl:attribute>
-          <xsl:attribute name="rel">alternate</xsl:attribute>
-          <xsl:attribute name="hreflang"><xsl:value-of select="@id" /></xsl:attribute>
-          <xsl:attribute name="lang"><xsl:value-of select="@id" /></xsl:attribute>
-          <xsl:attribute name="href"><xsl:value-of select="/buildinfo/@filename"/>.<xsl:value-of select="@id"/>.html</xsl:attribute>
-          <xsl:attribute name="title"><xsl:value-of select="."  disable-output-escaping="yes" /></xsl:attribute>
-        </xsl:element>
-      </xsl:for-each>
-      
-      <xsl:for-each select="/buildinfo/document/author">
-        <xsl:variable name="id">
-          <xsl:value-of select="@id" />
-        </xsl:variable>
-        <xsl:element name="meta">
-          <xsl:attribute name="name">author</xsl:attribute>
-          <xsl:attribute name="content">
-            <xsl:choose>
-              <xsl:when test="@id and document('about/people/people.en.xml')/personset/person[@id=$id]">
-                <xsl:value-of select="document('about/people/people.en.xml')/personset/person[@id=$id]/name" />
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="name" />
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-        </xsl:element>
-      </xsl:for-each>
-      
-      <script src="/scripts/jquery.js"></script>
-      <script src="/scripts/master.js"></script>
-      <script src="/scripts/placeholder.js"></script>
-      <script src="/scripts/highlight.pack.js"></script>
-
-      <script>
-        hljs.tabReplace = "  ";
+    <script>
+      hljs.tabReplace = "  ";
 //        hljs.initHighligtingOnLoad();
 // above line throws error: Uncaught TypeError: Object [object Object] has no method 'initHighligtingOnLoad'
-      </script>
-      
-      <xsl:comment>
-        <![CDATA[
-          [if lt IE 8]>
-            <script src="http://ie7-js.googlecode.com/svn/version/2.1(beta4)/IE8.js"></script>
-          <![endif]
-        ]]>
-      </xsl:comment>
-      
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
+    </script>
+    
+    <xsl:comment>
+      <![CDATA[
+        [if lt IE 8]>
+          <script src="http://ie7-js.googlecode.com/svn/version/2.1(beta4)/IE8.js"></script>
+        <![endif]
+      ]]>
+    </xsl:comment>
+    
+    <xsl:apply-templates select="@*|node()"/>
   </xsl:template>
   
   <!-- Modify H1 -->
@@ -190,7 +200,7 @@
       </xsl:element>
     </xsl:if>
     
-    <!-- auto generate ID for headings if doesn't already exist -->
+    <!-- auto generate ID for headings if it doesn't already exist -->
     <xsl:call-template name="generate-id" />
     
     <!-- Apply news page rules -->
@@ -379,37 +389,37 @@
   
   <!-- Modify H2 -->
   <xsl:template match="h2">
-    <!-- auto generate ID for headings if doesn't already exist -->
+    <!-- auto generate ID for headings if it doesn't already exist -->
     <xsl:call-template name="generate-id" />
   </xsl:template>
   
   <!-- Modify H3 -->
   <xsl:template match="h3">
-    <!-- auto generate ID for headings if doesn't already exist -->
+    <!-- auto generate ID for headings if it doesn't already exist -->
     <xsl:call-template name="generate-id" />
   </xsl:template>
   
   <!-- Modify H4 -->
   <xsl:template match="h4">
-    <!-- auto generate ID for headings if doesn't already exist -->
+    <!-- auto generate ID for headings if it doesn't already exist -->
     <xsl:call-template name="generate-id" />
   </xsl:template>
   
   <!-- Modify H4 -->
   <xsl:template match="h4">
-    <!-- auto generate ID for headings if doesn't already exist -->
+    <!-- auto generate ID for headings if it doesn't already exist -->
     <xsl:call-template name="generate-id" />
   </xsl:template>
   
   <!-- Modify H5 -->
   <xsl:template match="h5">
-    <!-- auto generate ID for headings if doesn't already exist -->
+    <!-- auto generate ID for headings if it doesn't already exist -->
     <xsl:call-template name="generate-id" />
   </xsl:template>
   
   <!-- Modify H6 -->
   <xsl:template match="h6">
-    <!-- auto generate ID for headings if doesn't already exist -->
+    <!-- auto generate ID for headings if it doesn't already exist -->
     <xsl:call-template name="generate-id" />
   </xsl:template>
 
@@ -429,9 +439,9 @@
   <!-- End apply support page rules -->
     
   <!-- HTML body -->
-  <xsl:template match="body">
-    <xsl:copy>
-
+  <!--<xsl:template match="body">-->
+  <xsl:template name="fsfe-body">
+    <body>
       <!-- For pages used on external web servers, use absolute URLs -->
       <xsl:variable name="urlprefix"><xsl:if test="/buildinfo/document/@external">https://fsfe.org</xsl:if></xsl:variable>
 
@@ -774,19 +784,19 @@
           <xsl:choose>
             <xsl:when test="@id=/buildinfo/@language">
               <xsl:element name="li">
-            <xsl:value-of select="." disable-output-escaping="yes"/>
+                <xsl:value-of select="." disable-output-escaping="yes"/>
               </xsl:element>
             </xsl:when>
             <xsl:otherwise>
               <xsl:element name="li">
-            <xsl:element name="a">
-              <xsl:attribute name="href"><xsl:value-of select="/buildinfo/@filename"/>.<xsl:value-of select="@id"/>.html</xsl:attribute>
-              <xsl:value-of select="." disable-output-escaping="yes"/>
-            </xsl:element>
+                <xsl:element name="a">
+                  <xsl:attribute name="href"><xsl:value-of select="/buildinfo/@filename"/>.<xsl:value-of select="@id"/>.html</xsl:attribute>
+                  <xsl:value-of select="." disable-output-escaping="yes"/>
+                </xsl:element>
               </xsl:element>
             </xsl:otherwise>
           </xsl:choose>
-          </xsl:for-each>
+        </xsl:for-each>
         </xsl:element><!-- end translations -->
         
       </xsl:element><!-- End sidebar -->
@@ -803,7 +813,7 @@
         <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'outdated'" /></xsl:call-template>
           </xsl:element>
         </xsl:if>
-	
+  
         <!-- Missing translation note -->
         <xsl:if test="/buildinfo/@language!=/buildinfo/document/@language">
           <xsl:element name="p">
@@ -811,29 +821,29 @@
         <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'notranslation'" /></xsl:call-template>
           </xsl:element>
         </xsl:if>
-	
+  
         <!-- Info box -->
-	<xsl:element name="div"> 
-		<xsl:attribute name="id">infobox</xsl:attribute>
-		<!-- Add under construction message -->
-		<xsl:if test = "/buildinfo/document/head/meta[@name='under-construction' and @content='true']">
-			<xsl:element name="p">
-				<xsl:attribute name="class">warning yellow</xsl:attribute>
-				<xsl:call-template name="fsfe-gettext">
-					<xsl:with-param name="id" select="'under-construction'" />
-				</xsl:call-template>
-			</xsl:element>
-		</xsl:if>
-		<!-- Add project completed message -->
-		<xsl:if test = "/buildinfo/document/head/meta[@name='project-complete' and @content='true']">
-			<xsl:element name="p">
-				<xsl:attribute name="class">warning green</xsl:attribute>
-				<xsl:call-template name="fsfe-gettext">
-					<xsl:with-param name="id" select="'project-complete'" />
-				</xsl:call-template>
-			</xsl:element>
-		</xsl:if>
-	</xsl:element>
+        <xsl:element name="div"> 
+          <xsl:attribute name="id">infobox</xsl:attribute>
+          <!-- Add under construction message -->
+          <xsl:if test = "/buildinfo/document/head/meta[@name='under-construction' and @content='true']">
+            <xsl:element name="p">
+              <xsl:attribute name="class">warning yellow</xsl:attribute>
+              <xsl:call-template name="fsfe-gettext">
+                <xsl:with-param name="id" select="'under-construction'" />
+              </xsl:call-template>
+            </xsl:element>
+          </xsl:if>
+          <!-- Add project completed message -->
+          <xsl:if test = "/buildinfo/document/head/meta[@name='project-complete' and @content='true']">
+            <xsl:element name="p">
+              <xsl:attribute name="class">warning green</xsl:attribute>
+              <xsl:call-template name="fsfe-gettext">
+                <xsl:with-param name="id" select="'project-complete'" />
+              </xsl:call-template>
+            </xsl:element>
+          </xsl:if>
+        </xsl:element>
         
         <!-- Fundraising box
           <xsl:element name="div">
@@ -881,7 +891,7 @@
         <!-- End Fundraising box -->
 
         <!-- Here goes the actual content of the <body> node of the input file -->
-        <xsl:apply-templates select="node()"/>
+        <xsl:apply-templates select="body | /buildinfo/document/event/body | /buildinfo/document/news/body" />
 
         <!-- Link to top -->
         <xsl:element name="p">
@@ -896,60 +906,58 @@
 
     </xsl:element><!--end wrapper-inner-->
     
-	<!-- licenses -->
-	
-	<xsl:if test = "/buildinfo/document/legal">
-	  <div id="legal">
-	   
-	    <p>
-              <xsl:choose> 
-                <xsl:when test = "/buildinfo/document/legal/license">	    
-	        <xsl:element name="a">
-	          <xsl:attribute name="href">
-	            <xsl:value-of select="/buildinfo/document/legal/license"/>
- 	          </xsl:attribute>
-	          <xsl:attribute name="rel">license</xsl:attribute>
-                    <xsl:if test ="/buildinfo/document/legal/@type='cc-license'">
-	                <xsl:element name="img">
-	                  <xsl:attribute name="src">/graphics/cc-logo.png</xsl:attribute>
-	                  <xsl:attribute name="alt">
-	                    <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'creative-commons-license'" /></xsl:call-template>
-	                  </xsl:attribute>
-	                </xsl:element>
-                    </xsl:if>
-                    <xsl:value-of select="/buildinfo/document/legal/notice"/>
-	        </xsl:element>
-	        </xsl:when>
-	        
-	        <xsl:otherwise>
+    <!-- licenses -->
+    
+    <xsl:if test = "/buildinfo/document/legal">
+      <div id="legal">
+        <p>
+          <xsl:choose> 
+            <xsl:when test = "/buildinfo/document/legal/license">      
+              <xsl:element name="a">
+                <xsl:attribute name="href">
+                  <xsl:value-of select="/buildinfo/document/legal/license"/>
+                </xsl:attribute>
+                <xsl:attribute name="rel">license</xsl:attribute>
+                  <xsl:if test ="/buildinfo/document/legal/@type='cc-license'">
+                    <xsl:element name="img">
+                      <xsl:attribute name="src">/graphics/cc-logo.png</xsl:attribute>
+                      <xsl:attribute name="alt">
+                        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'creative-commons-license'" /></xsl:call-template>
+                      </xsl:attribute>
+                    </xsl:element>
+                  </xsl:if>
                   <xsl:value-of select="/buildinfo/document/legal/notice"/>
-	        </xsl:otherwise>
-	      </xsl:choose>
-            </p>  
-	    
- 	  </div>
-	</xsl:if>
-	
-	
-	<!--Depreciated: it's here only for "backward compatibility"  cc license way-->
-	<xsl:if test = "string(/buildinfo/document/head/meta[@name='cc-license']/@content)">
-	<xsl:element name="div">		
-		<xsl:attribute name="id">cc-licenses</xsl:attribute>
-		
-		<xsl:element name="p">
-			<xsl:element name="img">
-			<xsl:attribute name="src">/graphics/cc-logo.png</xsl:attribute>
-			<xsl:attribute name="alt">Creative Commons logo</xsl:attribute>
-			</xsl:element> <!-- </img> -->
-			<xsl:for-each select="/buildinfo/document/head/meta[@name='cc-license']">
-				<xsl:value-of select="@content"/> • 
-			</xsl:for-each>
-			<!--<xsl:value-of select="/buildinfo/document/head/meta[@name='cc-license-1']/@content" /> • -->
-		</xsl:element> <!-- </p> -->
-		
-	</xsl:element> <!-- </div> -->
-	</xsl:if>
-	<!-- End cc licenses -->
+              </xsl:element>
+            </xsl:when>
+            
+            <xsl:otherwise>
+              <xsl:value-of select="/buildinfo/document/legal/notice"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </p>
+      </div>
+    </xsl:if>
+  
+  
+  <!--Depreciated: it's here only for "backward compatibility"  cc license way-->
+  <xsl:if test = "string(/buildinfo/document/head/meta[@name='cc-license']/@content)">
+  <xsl:element name="div">    
+    <xsl:attribute name="id">cc-licenses</xsl:attribute>
+    
+    <xsl:element name="p">
+      <xsl:element name="img">
+      <xsl:attribute name="src">/graphics/cc-logo.png</xsl:attribute>
+      <xsl:attribute name="alt">Creative Commons logo</xsl:attribute>
+      </xsl:element> <!-- </img> -->
+      <xsl:for-each select="/buildinfo/document/head/meta[@name='cc-license']">
+        <xsl:value-of select="@content"/> • 
+      </xsl:for-each>
+      <!--<xsl:value-of select="/buildinfo/document/head/meta[@name='cc-license-1']/@content" /> • -->
+    </xsl:element> <!-- </p> -->
+    
+  </xsl:element> <!-- </div> -->
+  </xsl:if>
+  <!-- End cc licenses -->
     
     <!-- Footer -->
     <div id="footer">
@@ -958,7 +966,7 @@
           Copyright © 2001-2012 <a href="/">Free Software
         Foundation Europe</a>. <strong>
         <a href="/contact/contact.html">
-          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'contact'" /></xsl:call-template>
+          <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'contact-us'" /></xsl:call-template>
         </a></strong>.<br />
 
           <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'permission'" /></xsl:call-template><br />
@@ -1060,7 +1068,7 @@
 	<!-- End Piwik Tracking Code -->
     
       </xsl:element>
-    </xsl:copy>
+    </body>
   </xsl:template>
 
   <!-- Insert local menu -->
@@ -1138,15 +1146,18 @@
   <xsl:template match="latin">
     <xsl:apply-templates select="@*|node()"/>
   </xsl:template>
-
+  
+  <!-- If no template matching <body> is found in the current page's XSL file, this one will be used -->
+  <xsl:template match="body" priority="-1">
+    <xsl:apply-templates />
+  </xsl:template>
+  
   <!-- Do not copy non-HTML elements to output -->
   <xsl:template match="timestamp|
                buildinfo/document/translator|
                buildinfo/set|
                buildinfo/textset|
                buildinfo/textsetbackup|
-               textset-content|
-               textset-content-backup|
                buildinfo/menuset|
                buildinfo/trlist|
                buildinfo/fundraising|
@@ -1156,6 +1167,8 @@
                buildinfo/document/author|
                buildinfo/document/date|
                buildinfo/document/download"/>
+  
+  <xsl:template match="set | tags | text"/>
 
   <!-- For all other nodes, copy verbatim -->
   <xsl:template match="@*|node()" priority="-1">
@@ -1163,6 +1176,13 @@
       <xsl:apply-templates select="@* | node()"/>
     </xsl:copy>
   </xsl:template>
+  
+  <xsl:template match="@dt:*">
+    <xsl:attribute name="{local-name()}">
+      <xsl:value-of select="." />
+    </xsl:attribute>
+  </xsl:template>
+  
   <!--
   <xsl:template match="@x:*">
     <xsl:attribute name="{local-name()}">

index.en.xhtml

@@ -26,7 +26,7 @@
 
     <div id="feeds">
       <div id="news" class="section">
-        <h2>
+        <h2 id="id-news">
           <a class="rss-feed" href="/news/news.rss"><img src="/graphics/rss.png" alt="News RSS" title="news RSS feed" /></a>
           <a class="ical" href="http://identi.ca/fsfe"><img src="/graphics/identica.png" alt="identica" title="follow FSFE on identi.ca"/></a>
           <a href="/news/news.html"><news-label /></a>
@@ -36,7 +36,7 @@
       </div>
 
       <div id="newsletter" class="section">
-        <h2><a href="/news/newsletter.html"><newsletter-label /></a></h2>
+        <h2 id="id-newsletter"><a href="/news/newsletter.html"><newsletter-label /></a></h2>
 
         <div class="entry">
           <p>
@@ -53,7 +53,7 @@
       </div>
 
       <div id="events" class="section">
-        <h2>
+        <h2 id="id-events">
           <a class="rss-feed" href="/events/events.rss"><img src="/graphics/rss.png" alt="Events RSS" title="events RSS feed" /></a>
           <a class="ical" href="webcal://fsfe.org/events/events.ics"><img src="/graphics/ical.png" alt="iCal" title="FSFE events as iCal feed" /></a>
           <a href="/events/events.html"><events-label /></a>

index.xsl

@@ -1,29 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:dt="http://xsltsl.org/date-time"
-  exclude-result-prefixes="dt">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
   <xsl:import href="tools/xsltsl/date-time.xsl" />
   <xsl:import href="tools/xsltsl/tagging.xsl" />
   <xsl:import href="tools/xsltsl/translations.xsl" />
   <xsl:import href="tools/xsltsl/static-elements.xsl" />
   <xsl:import href="tools/xsltsl/quotes.xsl" />
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
   
+  <xsl:import href="fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
-  <!-- The top level element of the input file is "buildinfo" -->
-  <xsl:template match="buildinfo">
-    <xsl:apply-templates select="node()"/>
-  </xsl:template>
-
-  <xsl:template match="/html/body">
-    <xsl:copy>
+  <xsl:template match="body">
       <div id="frontpage">
         <xsl:apply-templates />
       </div>
-    </xsl:copy>
   </xsl:template>
   
   <xsl:template match="quote-box">
@@ -221,19 +212,4 @@
     <xsl:call-template name="subscribe-nl" />
   </xsl:template>
   
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags | text"/>
-  
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@* | node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@* | node()"/>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="@dt:*">
-    <xsl:attribute name="{local-name()}">
-      <xsl:value-of select="." />
-    </xsl:attribute>
-  </xsl:template>
 </xsl:stylesheet>

it/it.xsl

@@ -7,7 +7,8 @@
   <xsl:import href="../tools/xsltsl/tagging.xsl" />
   <xsl:import href="../tools/xsltsl/countries.xsl" />
   <xsl:import href="../tools/xsltsl/translations.xsl" />
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- To localise this page to a new country, copy this file and change the following:
   
@@ -60,7 +61,7 @@
   <!--define contact information-->
   
   <xsl:template match="contact-details">
-    <xsl:for-each select="/html/set/contact">
+    <xsl:for-each select="/buildinfo/document/set/contact">
 
     <xsl:if test="@id = 'IT'">
   
@@ -145,15 +146,5 @@
             </xsl:with-param>
         </xsl:call-template>
     </xsl:template>
-  
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 
 </xsl:stylesheet>

news/legal-news.xsl

@@ -3,13 +3,8 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../tools/xsltsl/tagging.xsl" />
   
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
-  
-  <xsl:template match="/">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
   <xsl:template match="legal-news">
     <xsl:call-template name="fetch-news">
@@ -17,15 +12,4 @@
     </xsl:call-template>
   </xsl:template>
   
-  <!-- Do not copy <set> and <text> to output at all -->
-  <xsl:template match="/html/set" />
-  <xsl:template match="/html/text" />
-  
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-  
 </xsl:stylesheet>

news/news.rss.xsl

@@ -16,7 +16,7 @@
 
   <!-- $today = current date (given as <html date="...">) -->
   <xsl:variable name="today">
-    <xsl:value-of select="/html/@date" />
+    <xsl:value-of select="/buildinfo/@date" />
   </xsl:variable>
 
   <!-- ======== -->
@@ -130,7 +130,7 @@
         </xsl:element>
         
         <!-- News items -->
-        <xsl:for-each select="/html/set/news
+        <xsl:for-each select="/buildinfo/document/set/news
           [translate (@date, '-', '') &lt;= translate ($today, '-', '')]">
           <xsl:sort select="@date" order="descending"/>
           <xsl:if test="position() &lt; 11">
@@ -280,14 +280,4 @@ Make a one time donation: http://fsfe.org/donate/donate.html</xsl:text>
     </xsl:element>
   </xsl:template>
   
-  <!-- Do not copy <body-complete> to output at all -->
-  <xsl:template match="body-complete"/>
-  
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-  
 </xsl:stylesheet>

news/news.xsl

@@ -2,21 +2,21 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes" />
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- In /html/body node, append dynamic content -->
-  <xsl:template match="/html/body">
-    <xsl:copy>
+  <xsl:template match="body">
       <!-- First, include what's in the source file -->
       <xsl:apply-templates />
 
       <!-- $today = current date (given as <html date="...">) -->
       <xsl:variable name="today">
-        <xsl:value-of select="/html/@date" />
+        <xsl:value-of select="/buildinfo/@date" />
       </xsl:variable>
 
       <!-- Show news except those in the future, but no newsletters -->
-      <xsl:for-each select="/html/set/news
+      <xsl:for-each select="/buildinfo/document/set/news
         [translate (@date, '-', '') &lt;= translate ($today, '-', '') and
          not (@type = 'newsletter')]">
         <xsl:sort select="@date" order="descending" />
@@ -43,29 +43,17 @@
         <!-- End news entry -->
 
       </xsl:for-each>
-    </xsl:copy>
   </xsl:template>
 
-  <!-- Do not copy <set> and <text> to output at all -->
-  <xsl:template match="/html/set" />
-  <xsl:template match="/html/text" />
-
   <!-- How to show a link -->
-  <xsl:template match="/html/set/news/link">
+  <xsl:template match="/buildinfo/document/set/news/link">
     <xsl:element name="a">
       <xsl:attribute name="href">
         <xsl:value-of select="text()" />
       </xsl:attribute>
       <xsl:text>[</xsl:text>
-      <xsl:value-of select="/html/text[@id='more']" />
+        <xsl:value-of select="/buildinfo/document/text[@id='more']" />
       <xsl:text>]</xsl:text>
     </xsl:element>
   </xsl:template>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 </xsl:stylesheet>

news/newsletter.xsl

@@ -5,44 +5,29 @@
   <xsl:import href="../tools/xsltsl/translations.xsl" />
   <xsl:import href="../tools/xsltsl/static-elements.xsl" />
   
-  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
-  <xsl:template match="/">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
+  <xsl:template match="body">
+    <xsl:apply-templates />
+
+    <!-- $today = current date (given as <html date="...">) -->
+    <xsl:variable name="today">
+      <xsl:value-of select="/buildinfo/@date" />
+    </xsl:variable>
+
+    <xsl:for-each select="/buildinfo/document/set/news[translate(@date,'-','') &lt;= translate($today,'-','')]">
+      <xsl:sort select="@date" order="descending"/>
+      <p>
+        <b><xsl:value-of select="@date" /></b><br/>
+        <xsl:value-of select="body"/>
+        <xsl:variable name="link"><xsl:value-of select="link"/></xsl:variable>
+        <xsl:if test="$link!=''">
+          [<a href="{link}"><xsl:value-of select="/buildinfo/document/text[@id='more']"/>]</a>
+        </xsl:if>
+      </p>
+    </xsl:for-each>
   </xsl:template>
-
-  <xsl:template match="/html/body">
-    <body>
-      <xsl:apply-templates />
-
-      <!-- $today = current date (given as <html date="...">) -->
-      <xsl:variable name="today">
-        <xsl:value-of select="/html/@date" />
-      </xsl:variable>
-
-      <xsl:for-each select="/html/set/news[translate(@date,'-','') &lt;= translate($today,'-','')]">
-        <xsl:sort select="@date" order="descending"/>
-        <p>
-         <b><xsl:value-of select="@date" /></b><br/>
-         <xsl:value-of select="body"/>
-         <xsl:variable name="link"><xsl:value-of select="link"/></xsl:variable>
-         <xsl:if test="$link!=''">
-           [<a href="{link}"><xsl:value-of select="/html/text[@id='more']"/>]</a>
-         </xsl:if>
-        </p>
-      </xsl:for-each>
-    </body>
-  </xsl:template>
-
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="set | tags"/>
   
   <!--translated sentence "receive-newsletter"-->
   <xsl:template match="receive-newsletter">

order/order.xsl

@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- Fill dynamic content -->
   <xsl:template match="dynamic-content">
@@ -10,7 +11,7 @@
     <xsl:element name="table">
       <xsl:attribute name="id">merchandise</xsl:attribute>
 
-      <xsl:for-each select="/html/set/item [@type = $type]">
+      <xsl:for-each select="/buildinfo/document/set/item [@type = $type]">
         <xsl:sort select="@date" order="descending"/>
         <xsl:variable name="id"><xsl:value-of select="@id"/></xsl:variable>
         <xsl:variable name="price"><xsl:value-of select="@price"/></xsl:variable>
@@ -41,14 +42,14 @@
             <xsl:attribute name="class">description</xsl:attribute>
 
             <xsl:element name="h3">
-              <xsl:value-of select="/html/set/info[@id=$id]/name"/>
+              <xsl:value-of select="/buildinfo/document/set/info[@id=$id]/name"/>
               <xsl:text> (€</xsl:text>
               <xsl:value-of select="@price"/>
               <xsl:text>)</xsl:text>
             </xsl:element>
 
             <xsl:apply-templates
-              select="/html/set/info[@id=$id]/description/node()"/>
+              select="/buildinfo/document/set/info[@id=$id]/description/node()"/>
           </xsl:element>
 
           <!-- Order quantity -->
@@ -93,14 +94,4 @@
     </xsl:element>
   </xsl:template>
 
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-  
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
 </xsl:stylesheet>

press/press.xsl

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
 
   <!-- $today = current date (given as <html date="...">) -->
   <xsl:variable name="today">
-    <xsl:value-of select="/html/@date"/>
+    <xsl:value-of select="/buildinfo/@date"/>
   </xsl:variable>
 
   <!-- Fill dynamic content -->
@@ -14,7 +15,7 @@
       <xsl:attribute name="id">press-releases</xsl:attribute>
 
       <!-- Show news except those in the future, but no newsletters -->
-      <xsl:for-each select="/html/set/news[translate(@date,'-','')&lt;=translate($today,'-','') and not(@type='newsletter')]">
+      <xsl:for-each select="/buildinfo/document/set/news[translate(@date,'-','')&lt;=translate($today,'-','') and not(@type='newsletter')]">
         <xsl:sort select="@date" order="descending" />
 
         <!-- A news entry -->
@@ -33,14 +34,4 @@
       </xsl:for-each>
     </xsl:element>
   </xsl:template>
-
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 </xsl:stylesheet>

tags/tagged.xsl

@@ -6,7 +6,8 @@
   
   <xsl:import href="../tools/xsltsl/date-time.xsl" />
   <xsl:import href="../tools/xsltsl/tagging.xsl" />
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
   <!-- 
     For documentation on tagging (e.g. fetching news and events), take a
@@ -34,16 +35,5 @@
     </xsl:call-template>
 	
   </xsl:template>
-  
-  
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 
 </xsl:stylesheet>

tags/tags.xsl

@@ -6,7 +6,8 @@
   
   <xsl:import href="../tools/xsltsl/date-time.xsl" />
   <xsl:import href="../tools/xsltsl/tagging.xsl" />
-  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+  <xsl:import href="../fsfe.xsl" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
   
   <!-- 
     For documentation on tagging (e.g. fetching news and events), take a
@@ -34,16 +35,5 @@
     <xsl:call-template name="all-tags-events"/>
 	
   </xsl:template>
-  
-  
-  <!-- Do not copy <set> or <text> to output at all -->
-  <xsl:template match="set | tags"/>
-
-  <!-- For all other nodes, copy verbatim -->
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
 
 </xsl:stylesheet>

tools/build.pl

@@ -131,11 +131,6 @@ $SIG{CHLD} = 'IGNORE';
 my $parser = XML::LibXML->new('encoding'=>'utf-8');
 my $xslt_parser = XML::LibXSLT->new('encoding'=>'utf-8');
 
-# Parse the global stylesheet
-
-my $global_style_doc = $parser->parse_file($opts{i}."/fsfe.xsl");
-my $global_stylesheet = $xslt_parser->parse_stylesheet($global_style_doc);
-
 #
 # First topic of today: create all directories we need. Instead of creating
 # these as they are used, we create them in a batch at the beginning of each
@@ -431,25 +426,34 @@ sub process {
           }
     	  }
 
-        if ( (stat("$opts{o}/$dir/$file.$lang.html"))[9] >
-             (stat($source))[9] && $opts{u} && ! -f "$opts{i}/$file.xsl" ) {
-           next;
-        }
+			if ( (stat("$opts{o}/$dir/$file.$lang.html"))[9] >
+						(stat($source))[9] && $opts{u} && ! -f "$xsl_file" ) {
+					next;
+			}
 
-        #
-        # Here begins automated magic for those pages which we need to
-        # assemble other sets of informations for first (automatically
-        # updated pages).
-        #
-      	if (-f "$opts{i}/$file.xsl") {
-          #
-          # Settle down please, children. First we remove all previous
-          # document leftovers.
-          #
-          foreach ($root->getElementsByTagName("document")) {
-	          $root->removeChild($_);
-          }
-          $root->appendChild($document);
+      #
+      # Here begins automated magic for those pages which we need to
+      # assemble other sets of informations for first (automatically
+      # updated pages).
+      #
+      #
+      # choose the xsl file we will use
+      if (-f "$opts{i}/$file.xsl") {
+        $xsl_file = "$opts{i}/$file.xsl";
+      } elsif (-f "$opts{i}/$current_dir/default.xsl") {
+        $xsl_file = "$opts{i}/$current_dir/default.xsl";
+      } else {
+        $xsl_file = "$opts{i}/default.xsl";
+      }
+			
+			#
+			# Settle down please, children. First we remove all previous
+			# document leftovers.
+			#
+			foreach ($root->getElementsByTagName("document")) {
+				$root->removeChild($_);
+			}
+			$root->appendChild($document);
 
           # Create the <timestamp> tag automatically for these documents
           my $timestamp = $dom->createElement("timestamp");
@@ -487,231 +491,229 @@ sub process {
             }
           }
 
-          #
-          # With that information, we load the source document and create
-          # a new element in it, called <set>, which will hold the combined
-          # knowledge of all the sets in the source files.
-          #
-          my $sourcedoc = $parser->parse_file($source);
-          $sourcedoc->documentElement->setAttribute("date", $current_date);
-          $sourcedoc->documentElement->setAttribute("lang", $lang);
-          my $auto_data = $sourcedoc->createElement("set");
+      #
+      # With that information, we load the source document and create
+      # a new element in it, called <set>, which will hold the combined
+      # knowledge of all the sets in the source files.
+      #
+      my $sourcedoc = $parser->parse_file($source);
+      $sourcedoc->documentElement->setAttribute("date", $current_date);
+      $sourcedoc->documentElement->setAttribute("lang", $lang);
+      if ($sourcedoc->documentElement->getAttribute("external") eq "yes") {
+        $document->setAttribute("external", "yes");
+      }
+      if ($sourcedoc->documentElement->getAttribute("newsdate")) {
+        $document->setAttribute("newsdate", $sourcedoc->documentElement->getAttribute("newsdate"));
+      }
+      if ($sourcedoc->documentElement->getAttribute("type")) {
+        $document->setAttribute("type", $sourcedoc->documentElement->getAttribute("type"));
+      }
+      
+      
+      my $auto_data = $sourcedoc->createElement("set");
 
-          while (my ($base, $l) = each %files) {
-              if (($dir eq "global") && ($l ne $lang)) {
-	              lock(*TRANSLATIONS);
-                print TRANSLATIONS "$lang $base.$lang.xml $base.$l.xml\n";
-      		      unlock(*TRANSLATIONS);
-              }
-              print STDERR "Loading $base.$l.xml\n" if $opts{d};
-              my $source_data = $parser->parse_file("$base.$l.xml");
-              foreach ($source_data->documentElement->childNodes) {
-                 my $c = $_->cloneNode(1);
-                 # add the filename to nodes (news, events, …) so that we can use it as an identifier (e.g. for RSS)
-                 if (ref($c) eq "XML::LibXML::Element") {
-                   $base =~ /.*[\/_]([^\/_]*$)/;
-                   $c->setAttribute( "filename", $1 );
-                 }
-                 $auto_data->appendChild($c);
-              }
-          }
-          $sourcedoc->documentElement->appendChild($auto_data);
-          
-          #
-          # Get the appropriate textset for this language. If one can't be
-          # found, use the English. (I hope this never happens)
-          #
-          my $textlang = $lang;
-          unless (-f $opts{i}."/tools/texts-content-$textlang.xml") {
-              $textlang = "en";
-          }
-          
-          my $textdoc = $sourcedoc->createElement("textset-content");
-          $auto_data->appendChild($textdoc);
-          clone_document($textdoc, $opts{i}."/tools/texts-content-$textlang.xml");
-          
-          # Get also backup texts from the English file
-          my $textdocbak = $sourcedoc->createElement("textset-content-backup");
-          $auto_data->appendChild($textdocbak);
-          clone_document($textdocbak, $opts{i}."/tools/texts-content-en.xml");
-          
-          # TODO: optimise getting texts-content-xx.xml and texts-content-en.xml,
-          # since it does not depend on the xsl file being treated, we should do it only once!
-          
-          #
-          # Transform the document using the XSL file and then push the
-          # result into the <document> element of the document we're building.
-          #
-          my $style_doc = $parser->parse_file("$opts{i}/$file.xsl");
-          my $stylesheet = $xslt_parser->parse_stylesheet($style_doc);
-          my $results = $stylesheet->transform($sourcedoc);
-
-          foreach ($results->documentElement->childNodes) {
-            my $c = $_->cloneNode(1);
-            $document->appendChild($c);
-          }
-
-          #
-          # Now, while we're just at it, we create the RSS feeds if we want any
-          #
-	        if (-f "$opts{i}/$file.rss.xsl") {
-            my $style_doc = $parser->parse_file("$opts{i}/$file.rss.xsl");
-	          my $stylesheet = $xslt_parser->parse_stylesheet($style_doc);
-	          my $results = $stylesheet->transform($sourcedoc);
-	          $stylesheet->output_file($results, "$opts{o}/$dir/$file.$lang.rss")
-    	      unless $opts{n};
-          }
-
-    		  #
-          # and possibly the corresponding iCal (ics) file
-          #
-  	      if (-f "$opts{i}/$file.ics.xsl") {
-            my $style_doc = $parser->parse_file("$opts{i}/$file.ics.xsl");
-			      my $stylesheet = $xslt_parser->parse_stylesheet($style_doc);
-			      my $results = $stylesheet->transform($sourcedoc);
-			      $stylesheet->output_file($results, "$opts{o}/$dir/$file.$lang.ics")
-			      unless $opts{n};
-          }
-          
-          } else {
-            #
-            # If this wasn't an automatically updating document, we simply
-            # clone the contents of the source file into the document.
-            #
-      	    clone_document($document, $source);
-          }
-
-          #
-          # Find out if this translation is to be regarded as outdated or not.
-          # A translation is deemed outdated if it is more than 2 hours older
-          # than the original. This makes sure a translation committed together
-          # with the original (but maybe a second earlier) isn't marked outdated.
-          #
-          my $originalsource = "$file.".$root->getAttribute("original").".xhtml";
-	        if (( stat("$opts{i}/$originalsource"))[9] > (stat($source))[9] + 7200
-	              and not $cant_be_outdated{$file} ) {
-	          $root->setAttribute("outdated", "yes");
-		        if ($dir eq "global") {
-			        lock(*TRANSLATIONS);
-		          print TRANSLATIONS "$lang $source $originalsource\n";
-			        unlock(*TRANSLATIONS);
-		        }
+			while (my ($base, $l) = each %files) {
+				if (($dir eq "global") && ($l ne $lang)) {
+					lock(*TRANSLATIONS);
+					print TRANSLATIONS "$lang $base.$lang.xml $base.$l.xml\n";
+					unlock(*TRANSLATIONS);
+				}
+				print STDERR "Loading $base.$l.xml\n" if $opts{d};
+				my $source_data = $parser->parse_file("$base.$l.xml");
+				foreach ($source_data->documentElement->childNodes) {
+					my $c = $_->cloneNode(1);
+					# add the filename to nodes (news, events, …) so that we can use it as an identifier (e.g. for RSS)
+					if (ref($c) eq "XML::LibXML::Element") {
+						$base =~ /.*[\/_]([^\/_]*$)/;
+						$c->setAttribute( "filename", $1 );
+					}
+					$auto_data->appendChild($c);
+				}
+			}
+			$sourcedoc->documentElement->appendChild($auto_data);
+			
+			foreach ($sourcedoc->documentElement->childNodes) {
+				my $c = $_->cloneNode(1);
+				$document->appendChild($c);
+			}
+			
+			# beginning of old fsfe.xsl addings
+			
+			#
+			# Find out if this translation is to be regarded as outdated or not.
+			# A translation is deemed outdated if it is more than 2 hours older
+			# than the original. This makes sure a translation committed together
+			# with the original (but maybe a second earlier) isn't marked outdated.
+			#
+			my $originalsource = "$file.".$root->getAttribute("original").".xhtml";
+			if (( stat("$opts{i}/$originalsource"))[9] > (stat($source))[9] + 7200
+						and not $cant_be_outdated{$file} ) {
+					$root->setAttribute("outdated", "yes");
+					if ($dir eq "global") {
+						lock(*TRANSLATIONS);
+						print TRANSLATIONS "$lang $source $originalsource\n";
+						unlock(*TRANSLATIONS);
+					}
 			} else {
 				$root->setAttribute("outdated", "no");
 			}
 
-	#
-	# Get the appropriate textset for this language. If one can't be
-	# found, use the English. (I hope this never happens)
-	#
-	my $textlang = $lang;
-	unless (-f $opts{i}."/tools/texts-$textlang.xml") {
-	    $textlang = "en";
-	}
+			#
+			# Get the appropriate textset for this language. If one can't be
+			# found, use the English. (I hope this never happens)
+			#
+			my $textlang = $lang;
+			unless (-f $opts{i}."/tools/texts-$textlang.xml") {
+					$textlang = "en";
+			}
 
-	my $textdoc = $dom->createElement("textset");
-	$root->appendChild($textdoc);
-	clone_document($textdoc, $opts{i}."/tools/texts-$textlang.xml");
-	
-	#
-	# Read the fundraising text, if it exists.
-	#
-	if (-f $opts{i}."/fundraising.$lang.xml") {
-	    my $fundraisingdoc = $dom->createElement("fundraising");
-	    $root->appendChild($fundraisingdoc);
-	    clone_document($fundraisingdoc, $opts{i}."/fundraising.$lang.xml");
-	} elsif (-f $opts{i}."/fundraising.en.xml") {
-	    my $fundraisingdoc = $dom->createElement("fundraising");
-	    $root->appendChild($fundraisingdoc);
-	    clone_document($fundraisingdoc, $opts{i}."/fundraising.en.xml");
-        }
+			my $textdoc = $dom->createElement("textset");
+			$root->appendChild($textdoc);
+			clone_document($textdoc, $opts{i}."/tools/texts-$textlang.xml");
+			
+			#
+			# Read the fundraising text, if it exists.
+			#
+			if (-f $opts{i}."/fundraising.$lang.xml") {
+				my $fundraisingdoc = $dom->createElement("fundraising");
+				$root->appendChild($fundraisingdoc);
+				clone_document($fundraisingdoc, $opts{i}."/fundraising.$lang.xml");
+			} elsif (-f $opts{i}."/fundraising.en.xml") {
+				my $fundraisingdoc = $dom->createElement("fundraising");
+				$root->appendChild($fundraisingdoc);
+				clone_document($fundraisingdoc, $opts{i}."/fundraising.en.xml");
+			}
 
 
-	#
-	# And then we do the same thing for the menues. But first we take the
-	# global menu here, then we add any information that is specific to
-	# the focus.
-	#
-	foreach ($root->getElementsByTagName("menuset")) {
-	    $root->removeChild($_);
-	}
+			#
+			# And then we do the same thing for the menues. But first we take the
+			# global menu here, then we add any information that is specific to
+			# the focus.
+			#
+			foreach ($root->getElementsByTagName("menuset")) {
+					$root->removeChild($_);
+			}
 
-	my %menu;
-	foreach ('global', $dir) {
-	    if (-f $opts{i}."/tools/menu-$_.xml") {
-		my $menudoc = $parser->parse_file($opts{i}."/tools/menu-$_.xml");
-		foreach my $n ($menudoc->documentElement->getElementsByTagName("menu")) {
-		    $menu{$n->getAttribute("id")} = $n;
+			my %menu;
+			foreach ('global', $dir) {
+					if (-f $opts{i}."/tools/menu-$_.xml") {
+				my $menudoc = $parser->parse_file($opts{i}."/tools/menu-$_.xml");
+				foreach my $n ($menudoc->documentElement->getElementsByTagName("menu")) {
+						$menu{$n->getAttribute("id")} = $n;
+				}
+					}
+			}
+			my $menuroot = $dom->createElement("menuset");
+			while (my ($id, $n) = each %menu) {
+								my $m = $n->cloneNode(1);
+					$menuroot->appendChild($m);
+			}
+			$root->appendChild($menuroot);
+			
+			#
+			# Do the actual transformation.
+			#
+			#my $results = $global_stylesheet->transform($dom);
+			
+			# TODO: optimise getting texts-content-xx.xml and texts-content-en.xml,
+			# since it does not depend on the xsl file being treated, we should do it only once!
+			
+			if ( $file eq $toCompile and $lang eq "en" ) {
+				open (TEST, ">/home/nicolas/FSFE/fsfe-web-out/test.xml");
+				print TEST $dom->toString();
+				close (TEST);
+			}
+			
+			#
+			# Transform the document using the XSL file and then push the
+			# result into the <document> element of the document we're building.
+			#
+			my $style_doc = $parser->parse_file($xsl_file);
+			my $stylesheet = $xslt_parser->parse_stylesheet($style_doc);
+			my $results = $stylesheet->transform($dom);
+			
+# 			foreach ($results->documentElement->childNodes) {
+# 				my $c = $_->cloneNode(1);
+# 				$document->appendChild($c);
+# 			}
+
+			#
+			# Now, while we're just at it, we create the RSS feeds if we want any
+			#
+			if (-f "$opts{i}/$file.rss.xsl") {
+				my $style_doc_rss = $parser->parse_file("$opts{i}/$file.rss.xsl");
+				my $stylesheet_rss = $xslt_parser->parse_stylesheet($style_doc_rss);
+				my $results_rss = $stylesheet_rss->transform($sourcedoc);
+				$stylesheet_rss->output_file($results_rss, "$opts{o}/$dir/$file.$lang.rss") unless $opts{n};
+			}
+			
+			#
+			# and possibly the corresponding iCal (ics) file
+			#
+			if (-f "$opts{i}/$file.ics.xsl") {
+				my $style_doc_ics = $parser->parse_file("$opts{i}/$file.ics.xsl");
+				my $stylesheet_ics = $xslt_parser->parse_stylesheet($style_doc_ics);
+				my $results_ics = $stylesheet_ics->transform($sourcedoc);
+				$stylesheet_ics->output_file($results_ics, "$opts{o}/$dir/$file.$lang.ics") unless $opts{n};
+			}
+
+			#
+			# In post-processing, we replace links pointing back to ourselves
+			# so that they point to the correct language.
+			#
+# 			if (0) {
+			foreach ($results->documentElement->getElementsByTagName("a")) {
+				my $href = $_->getAttribute("href");
+				if ($href =~ /^http:\/\/www.fsfe.org/) {
+					if ($_->textContent != "Our global work") {
+						$href =~ s/http:\/\/www.fsfe.org//;
+					}
+				}
+				if (($href !~ /^http/) && ($href !~ /^#/)) {
+					# Save possible anchor and remove it from URL
+					my $anchor = $href;
+					if (!($anchor =~ s/.*#/#/)) {
+						$anchor = "";
+					}
+					$href =~ s/#.*//;
+					# process URL
+					if (($href =~ /\.html$/) && ($href !~ /\.[a-z][a-z]\.html$/)) {
+						$href =~ s/\.html$/\.$lang.html/;
+					} elsif (($href =~ /\.rss$/) && ($href !~ /\.[a-z][a-z]\.rss$/)) {
+						$href =~ s/\.rss$/\.$lang.rss/;
+					} elsif (($href =~ /\.ics$/) && ($href !~ /\.[a-z][a-z]\.ics$/)) {
+						$href =~ s/\.ics$/\.$lang.ics/;
+					} else {
+						if (-d $opts{i}."/$href") {
+							$href =~ s/\/?$/\/index.$lang.html/;
+						} elsif ($href =~ /\/\w+$/) {
+							$href .= ".$lang.html";
+						}
+					}
+					# replace anchor
+					$href .= $anchor;
+					# For pages running on an external server, use full URL
+					if ($document->getAttribute("external")) {
+						$href = "http://fsfe.org$href";
+					}
+					$_->setAttribute("href", $href);
+				}
+			}
+# 			}
+			
+			print "Writing: $opts{o}/$dir/$file.$lang.html\n" if $opts{d};
+			
+			$stylesheet->output_file($results, "$opts{o}/$dir/$file.$lang.html") unless $opts{n};
+			# Add foo.html.xx link which is used by Apache's MultiViews option when
+			# a user enters foo.html as URL.
+			link("$opts{o}/$dir/$file.$lang.html", "$opts{o}/$dir/$file.html.$lang") unless $opts{n};
 		}
-	    }
 	}
-	my $menuroot = $dom->createElement("menuset");
-	while (my ($id, $n) = each %menu) {
-            my $m = $n->cloneNode(1);
-	    $menuroot->appendChild($m);
-	}
-	$root->appendChild($menuroot);
-
-        #
-        # Do the actual transformation.
-        #
-        my $results = $global_stylesheet->transform($dom);
-
-        #
-        # In post-processing, we replace links pointing back to ourselves
-        # so that they point to the correct language.
-        #
-        foreach ($results->documentElement->getElementsByTagName("a")) {
-          my $href = $_->getAttribute("href");
-          if ($href =~ /^http:\/\/www.fsfe.org/) {
-            if ($_->textContent != "Our global work") {
-              $href =~ s/http:\/\/www.fsfe.org//;
-            }
-          }
-          if (($href !~ /^http/) && ($href !~ /^#/)) {
-	    # Save possible anchor and remove it from URL
-	    my $anchor = $href;
-	    if (!($anchor =~ s/.*#/#/)) {
-	      $anchor = "";
-	    }
-	    $href =~ s/#.*//;
-	    # process URL
-	    if (($href =~ /\.html$/) && ($href !~ /\.[a-z][a-z]\.html$/)) {
-              $href =~ s/\.html$/\.$lang.html/;
-            } elsif (($href =~ /\.rss$/) && ($href !~ /\.[a-z][a-z]\.rss$/)) {
-              $href =~ s/\.rss$/\.$lang.rss/;
-            } elsif (($href =~ /\.ics$/) && ($href !~ /\.[a-z][a-z]\.ics$/)) {
-              $href =~ s/\.ics$/\.$lang.ics/;
-            } else {
-              if (-d $opts{i}."/$href") {
-                $href =~ s/\/?$/\/index.$lang.html/;
-              } elsif ($href =~ /\/\w+$/) {
-                $href .= ".$lang.html";
-              }
-            }
-	    # replace anchor
-	    $href .= $anchor;
-            # For pages running on an external server, use full URL
-            if ($document->getAttribute("external")) {
-              $href = "http://www.fsfe.org$href";
-            }
-            $_->setAttribute("href", $href);
-          }
-        }
-
-	print "Writing: $opts{o}/$dir/$file.$lang.html\n" if $opts{d};
-
-	$global_stylesheet->output_file($results, "$opts{o}/$dir/$file.$lang.html")
-		unless $opts{n};
-        # Add foo.html.xx link which is used by Apache's MultiViews option when
-        # a user enters foo.html as URL.
-        link("$opts{o}/$dir/$file.$lang.html", "$opts{o}/$dir/$file.html.$lang")
-		unless $opts{n};
-    }
-  }
-  print STDERR "\n" unless $opts{q};
+	print STDERR "\n" unless $opts{q};
 }
 
+
+
 # Close the logfile for outdated and missing translations
 close (TRANSLATIONS);
 

tools/texts-ar.xml

@@ -47,4 +47,10 @@
   <text id="menu4/sisters/fsf">إف&#8204;إس&#8204;إف</text>
   <text id="menu4/sisters/fsf_india">إف&#8204;إس&#8204;إف الهند</text>
   <text id="menu4/sisters/fsf_la">إف&#8204;إس&#8204;إف أمريكا اللاتينية</text>
+  
+  <text id="news">آخر الأخبار</text>
+  <text id="events">أحداث قادمة</text>
+  <text id="morenews">أخبار أخرى…</text>
+  <text id="moreevents">أحداث أخرى…</text>
+  
 </textset>

tools/texts-bg.xml

@@ -51,4 +51,9 @@
   <text id="menu3/sisters/fsf">FSF</text>
   <text id="menu3/sisters/fsf_india">FSF India</text>
   <text id="menu3/sisters/fsf_la">FSF Latin America</text>
+  
+  <text id="news">Последни новини</text>
+  <text id="events">Предстоящи събития</text>
+  <text id="morenews">Още новини…</text>
+  <text id="moreevents">Още събития…</text>
 </textset>