[svn] r2263@freebird: fabien | 2006-01-27 17:43:45 -0500
Validate everything now. HTML is now XHTML.
--- a/Makefile Thu Jan 26 16:51:38 2006 -0500
+++ b/Makefile Fri Feb 03 16:27:40 2006 -0500
@@ -11,8 +11,9 @@
TARGETS=jeuderologie rpgtheory $(FR_ARTICLES) $(EN_ARTICLES) $(UNPUBLISHED)
HTML_FILES=index.en.html index.fr.html
SGML_CATALOG_FILES=/etc/sgml/catalog
-xml_validate=xmllint --xinclude --postvalid --noout $(1)
-html_validate=true
+export SGML_CATALOG_FILES
+xml_validate=xmllint --xinclude --valid --noout $(1)
+html_validate=xmllint --valid --noout $(1)
make_subdir= \
[ -d $(2) ] || mkdir -p $(2) ; \
@@ -25,6 +26,10 @@
rpgtheory.xml: $(addsuffix .xml, $(EN_ARTICLES))
+validate-jeuderologie: $(addsuffix -validate, $(FR_ARTICLES))
+
+validate-rpgtheory: $(addsuffix -validate, $(EN_ARTICLES))
+
$(addsuffix -validate,$(TARGETS)):
$(call xml_validate,$(subst -validate,.xml,$@))
--- a/index.en.html Thu Jan 26 16:51:38 2006 -0500
+++ b/index.en.html Fri Feb 03 16:27:40 2006 -0500
@@ -1,8 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/1999/xhtml">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
- <link title="Version française" href="index.fr.html" hreflang="fr" type="text/html" rel="Traduction">
+ <link title="Version française" href="index.fr.html" hreflang="fr" type="text/html" rel="Traduction"/>
<title>RPG Theory Articles</title>
</head>
<body>
@@ -47,7 +48,7 @@
characterization of mechanics, helping us to discuss and
evaluate different systems, and, with the help of other
tools, finally create a real science of role-playing game
- design.<p>
+ design.</p>
<ul>
<li><a href="colors/colors/">Online version</a></li>
<li><a href="colors/colors.html">HTML version</a></li>
@@ -60,7 +61,7 @@
<h2>French articles</h2>
<p>A complete version of all French articles are available
- href="jeuderologie/jeuderologie/">online</a>, as well as in <a
+ <a href="jeuderologie/jeuderologie/">online</a>, as well as in <a
href="jeuderologie/jeuderologie.pdf">PDF</a>, <a
href="jeuderologie/jeuderologie.html">HTML</a> or <a
href="jeuderologie/jeuderologie.txt">text</a> format. By
@@ -69,7 +70,7 @@
<p>Last version: January 20th, 2006</p>
- <dl lang="fr">
+ <dl xml:lang="fr">
<dt><a href="credo/">Le Credo des Harmonies</a></dt>
<dd>
<p>Dernière version: 11 février 2003</p>
@@ -134,3 +135,21 @@
</dl>
</body>
</html>
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: xml
+sgml-omittag:nil
+sgml-shorttag:nil
+sgml-namecase-general:nil
+sgml-general-insert-case:lower
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:nil
+sgml-parent-document:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+sgml-default-dtd-file:"/home/fabien/.sgml/xhtml-1.1.ced"
+End:
+-->
--- a/index.fr.html Thu Jan 26 16:51:38 2006 -0500
+++ b/index.fr.html Fri Feb 03 16:27:40 2006 -0500
@@ -1,8 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html lang="fr">
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/1999/xhtml">
+<html xml:lang="fr">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
- <link title="English version" href="index.en.html" hreflang="en" type="text/html" rel="Translation">
+ <link title="English version" href="index.en.html" hreflang="en" type="text/html" rel="Translation"/>
<title>Articles de jeuderôlogie</title>
</head>
<body>
@@ -86,9 +87,9 @@
<p><em>Une typologie des mécaniques du jeu de rôle</em></p>
- <p>La conception de jeux de rôle est un art, <quote>un système
+ <p>La conception de jeux de rôle est un art, <cite>un système
de principes et de règles pour obtenir un effet
- désiré</quote>. Toutefois, c'est un art encore dans ses
+ désiré</cite>. Toutefois, c'est un art encore dans ses
débuts. Bien que plusieurs modèles existent déjà pour
décrire l'expérience d'une partie de jeu de rôle, très peu a
été fait en regard aux mécaniques. Nous avons la
@@ -134,3 +135,21 @@
</body>
</html>
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: xml
+sgml-omittag:nil
+sgml-shorttag:nil
+sgml-namecase-general:nil
+sgml-general-insert-case:lower
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.sgml/xhtml-1.1.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- a/jeuderologie.xml Thu Jan 26 16:51:38 2006 -0500
+++ b/jeuderologie.xml Fri Feb 03 16:27:40 2006 -0500
@@ -1,7 +1,15 @@
<?xml version="1.0"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd">
-<book id="jeuderologie" lang="fr"
+ "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd"
+[
+ <!ENTITY % local.common.attrib
+ "xmlns:xi CDATA #IMPLIED
+ xml:base CDATA #IMPLIED">
+ <!ELEMENT xi:include EMPTY>
+ <!ATTLIST xi:include href CDATA #REQUIRED>
+ <!ENTITY % local.article.class "|xi:include">
+]>
+<book id="jeuderologie" lang="fr"
xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo>
<title>Articles de jeuderôlogie</title>
--- a/rpgtheory.xml Thu Jan 26 16:51:38 2006 -0500
+++ b/rpgtheory.xml Fri Feb 03 16:27:40 2006 -0500
@@ -1,6 +1,14 @@
<?xml version="1.0"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd">
+ "/usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd"
+[
+ <!ENTITY % local.common.attrib
+ "xmlns:xi CDATA #IMPLIED
+ xml:base CDATA #IMPLIED">
+ <!ELEMENT xi:include EMPTY>
+ <!ATTLIST xi:include href CDATA #REQUIRED>
+ <!ENTITY % local.article.class "|xi:include">
+]>
<book
xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo>