----------------------------------------------------------------------

Added Makefile for xsltproc (if anyone can unify both of them, great!) added background.xhmlt translation in french. Small modifiction to navigation.fr.xsl to reference french pages Committing in . Modified Files: Makefile background.xhtml index.fr.xhtml navigation.fr.xsl Added Files: Makefile.xsltproc background.fr.xhtml ---------------------------------------------------------------------- svn path=/trunk/; revision=360
2001-05-07 00:08:39 +00:00 · 2001-05-07 00:08:39 +00:00 · c12e0d987e
commit c12e0d987e
parent 6390badef2
6 changed files with 149 additions and 22 deletions
--- a/22
+++ b/22
@ -9,23 +9,17 @@
 # libxslt + libxml2 (xsltproc)
 # http://www.xmlsoft.org/
 #
-# XML validator
-# -------------
-# apt-get install rxp
-# or
-# ftp://ftp.cogsci.ed.ac.uk/pub/richard/rxp-1.2.3.tar.gz
-#
-XSLTPROC = sabcmd
+XSLTPROC = xsltproc

 FSFFRANCE = http://france.fsfeurope.org
-FSFEUROPE = http://www.fsfeurope.org
+FSFEUROPE = . # http://www.fsfeurope.org
 FSF       = http://www.fsf.org
 GNU       = http://www.gnu.org

 XSLTOPTS = \
-	'$$fsffrance=$(FSFFRANCE)' \
-	'$$fsf=$(FSF)' \
-	'$$gnu=$(GNU)'
+	--param fsffrance $(FSFFRANCE) \
+	--param fsf $(FSF) \
+	--param gnu $(GNU)

 ENPAGES = $(shell find * -path 'fr' -prune -o -regex '[^\.]*\.xhtml' -print | sed "s/xhtml$$/html/")

@ -42,7 +36,7 @@ $(ENPAGES): %.html: %.xhtml fsfe.xsl navigation.en.xsl
 	filebase=`basename $$base` ; \
 	dir=`dirname $$path` ; \
 	root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \
-	$(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
+	$(XSLTPROC) $(XSLTOPTS) '--param fsfeurope '$$root '--param filebase '$$filebase fsfe.xsl $$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
 	rm -f $$base.html-temp

 $(FRPAGES): %.html: %.xhtml fsfe.xsl navigation.fr.xsl
@ -52,7 +46,7 @@ $(FRPAGES): %.html: %.xhtml fsfe.xsl navigation.fr.xsl
 	filebase=`basename $$base` ; \
 	dir=`dirname $$path` ; \
 	root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \
-	$(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
+	$(XSLTPROC) $(XSLTOPTS) '--param fsfeurope '$$root '--param filebase '$$filebase fsfe.xsl $$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
 	rm -f $$base.html-temp

 $(DEPAGES): %.html: %.xhtml fsfe.xsl navigation.de.xsl
@ -62,7 +56,7 @@ $(DEPAGES): %.html: %.xhtml fsfe.xsl navigation.de.xsl
 	filebase=`basename $$base` ; \
 	dir=`dirname $$path` ; \
 	root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \
-	$(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase '$$path='$$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
+	$(XSLTPROC) $(XSLTOPTS) '--param fsfeurope='$$root '--param filebase='$$filebase fsfe.xsl $$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
 	rm -f $$base.html-temp

 # remove html files for which an xhtml version exists (exclude fr/)
--- a/Makefile.xsltproc
+++ b/Makefile.xsltproc
@ -0,0 +1,66 @@
+# Authors: Loic Dachary <loic@gnu.org> and Jaime Villate <villate@gnu.org>
+#
+# XML/XSLT processor (validator)
+# -------------------------
+#
+# sablotron (sabcmd)
+# apt-get install sablotron
+#
+# libxslt + libxml2 (xsltproc)
+# http://www.xmlsoft.org/
+#
+XSLTPROC = xsltproc
+
+FSFFRANCE = http://france.fsfeurope.org
+FSFEUROPE = . # http://www.fsfeurope.org
+FSF       = http://www.fsf.org
+GNU       = http://www.gnu.org
+
+XSLTOPTS = \
+	--param fsffrance $(FSFFRANCE) \
+	--param fsf $(FSF) \
+	--param gnu $(GNU)
+
+ENPAGES = $(shell find * -path 'fr' -prune -o -regex '[^\.]*\.xhtml' -print | sed "s/xhtml$$/html/")
+
+FRPAGES = $(shell find * -path 'fr' -prune -o -regex '.*\.fr\.xhtml' -print | sed "s/xhtml$$/html/")
+
+DEPAGES = $(shell find * -path 'fr' -prune -o -regex '.*\.de\.xhtml' -print | sed "s/xhtml$$/html/")
+
+all: $(ENPAGES) $(FRPAGES) $(DEPAGES)
+
+$(ENPAGES): %.html: %.xhtml fsfe.xsl navigation.en.xsl
+	@echo "Building $@ ..."; \
+	path=$< ; \
+	base=`expr $$path : '\(.*\).xhtml'` ; \
+	filebase=`basename $$base` ; \
+	dir=`dirname $$path` ; \
+	root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \
+	$(XSLTPROC) $(XSLTOPTS) '--param fsfeurope '$$root '--param filebase '$$filebase fsfe.xsl $$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
+	rm -f $$base.html-temp
+
+$(FRPAGES): %.html: %.xhtml fsfe.xsl navigation.fr.xsl
+	@echo "Building $@ ..."; \
+	path=$< ; \
+	base=`expr $$path : '\(.*\).xhtml'` ; \
+	filebase=`basename $$base` ; \
+	dir=`dirname $$path` ; \
+	root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \
+	$(XSLTPROC) $(XSLTOPTS) '--param fsfeurope '$$root '--param filebase '$$filebase fsfe.xsl $$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
+	rm -f $$base.html-temp
+
+$(DEPAGES): %.html: %.xhtml fsfe.xsl navigation.de.xsl
+	@echo "Building $@ ..."; \
+	path=$< ; \
+	base=`expr $$path : '\(.*\).xhtml'` ; \
+	filebase=`basename $$base` ; \
+	dir=`dirname $$path` ; \
+	root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \
+	$(XSLTPROC) $(XSLTOPTS) '--param fsfeurope='$$root '--param filebase='$$filebase fsfe.xsl $$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; s/\$$//g if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
+	rm -f $$base.html-temp
+
+# remove html files for which an xhtml version exists (exclude fr/)
+clean:
+	rm -f $(ENPAGES) $(FRPAGES) $(DEPAGES)
+
+
--- a/background.fr.xhtml
+++ b/background.fr.xhtml
@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<!DOCTYPE html
+          PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang="fr">
+  <head>
+    <title>FSF Europe - Background</title>
+  </head>
+  <body>
+
+    <div> <!-- The header will be inserted here -->
+      <center>
+	[
+	<!-- Please update as needed and keep it in alphabetical order -->
+	<a href="background.html">English</a> |
+	Français
+	]
+      </center>
+
+<!-- Begin page content -->
+          <h2>Fond</h2>
+
+          <p> Vous trouverez dans cette section des informations
+	sur le Logiciel Libre, le Projet GNU, la Free Software Foundation
+	et la FSF Europe
+	  </p>
+          <ul>
+            <li>
+              <p><a href="documents/preamble.fr.html">Préambule</a></p>
+            </li>    
+            <li>
+              <p> <a href="documents/freesoftware.fr.html">
+		Qu'est-ce que le logiciel libre?</a></p>
+            </li>
+            <li>
+              <p> <a href="documents/gnuproject.fr.html">Qu'est-ce que
+		le Projet GNU?</a></p>
+            </li>
+            <li>
+              <p><a href="documents/doi.fr.html">Déclaration d'Intention -
+              FSF Europe</a></p>
+            </li>
+          </ul>
+<!-- End page content -->
+
+    </div> <!-- The footer will be inserted here -->
+
+    Last update:
+    <!-- timestamp start -->
+    $Date$ $Author$
+    <!-- timestamp end -->
+
+  </body>
+</html>
+<!--
+Local Variables: ***
+mode: xml ***
+End: ***
+-->
--- a/background.xhtml
+++ b/background.xhtml
@ -12,7 +12,8 @@
      <center>
 	[
 	<!-- Please update as needed and keep it in alphabetical order -->
-	English
+	English |
+	<a href="background.fr.html">Français</a>
 	]
      </center>

--- a/index.fr.xhtml
+++ b/index.fr.xhtml
@ -29,6 +29,13 @@
          centrée sur le <a href="http://www.gnu.org/">
          Projet GNU</a>, sans y être toutefois
          limitée.</p>
+
+          <p> Les activités de la <b>FSF Europe</b> ont débuté le
+	  10 mars 2001. Vous trouverez des informations générales
+	  sur le logiciel libre, la "Free Software Fundation" et la
+	  FSF Europe dans <a href="background.fr.html">section background</a>
+          </p>
+
 <!-- End page content -->

    </div> <!-- The footer will be inserted here -->
--- a/navigation.fr.xsl
+++ b/navigation.fr.xsl
@ -51,8 +51,8 @@
 	    <a class="TopTitle">Free Software - l'entreprise et l'individu sur un pied d'égalité</a>
 	  </td>
 	  <td align="right" valign="top" class="TopBody">
-	    <a href="{$fsfeurope}/documents/freesoftware.html" class="T2">What's&nbsp;Free&nbsp;Software?</a><br/>
-	    <a href="{$fsfeurope}/documents/gnuproject.html" class="T2">What's&nbsp;the&nbsp;GNU&nbsp;Project?</a><br/>
+	    <a href="{$fsfeurope}/documents/freesoftware.fr.html" class="T2">Qu'est-ce que le Logiciel Libre?</a><br/>
+	    <a href="{$fsfeurope}/documents/gnuproject.fr.html" class="T2">Qu'est-ce que le Projet GNU?</a><br/>
 	  </td>
 	</tr>
    </table>
@ -74,16 +74,16 @@
            </tr>
            <tr>
              <td align="right"><br/>
-              <a href="{$fsfeurope}/index.html" class="T2">Home</a><br/>
-              <a href="{$fsfeurope}/contact/index.html"
+              <a href="{$fsfeurope}/index.fr.html" class="T2">Home</a><br/>
+              <a href="{$fsfeurope}/contact/index.fr.html"
                    class="T2">Contact</a><br/>
-              <a href="{$fsfeurope}/background.html"
+              <a href="{$fsfeurope}/background.fr.html"
                   class="T2">Background</a><br/>
-              <a href="{$fsfeurope}/mailman/listinfo/index.fr.html"
+              <a href="{$fsfeurope}/mailman/index.fr.html"
                   class="T2">Mailing Lists</a><br/>
              <a href="{$fsfeurope}/press/index.fr.html"
                   class="T2">Press section</a><br/>
-              <a href="{$fsfeurope}/gbn/index.html"
+              <a href="{$fsfeurope}/gbn/index.fr.html"
                   class="T2">GNU Business Network</a><br/>
              <br/></td>
            </tr>