# HG changeset patch
# User Patrick PIERRE
# Date 1434186872 -7200
# Node ID 954f6aef52d682efab19dd61e6bfa228a382547d
# Parent 72874dd7eb8db4cf9e03f43058bced2cad3b9bf0
ID optionnel
diff -r 72874dd7eb8d -r 954f6aef52d6 Data/Documents/les_miserables.xml
--- a/Data/Documents/les_miserables.xml sam. juin 13 09:36:13 2015 +0200
+++ b/Data/Documents/les_miserables.xml sam. juin 13 11:14:32 2015 +0200
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id$ -->
-<publidoc version="1.0">
+<publidoc version="1.0">
<document id="les_miserables" xml:lang="fr">
<head>
<title>Les Misérables (extraits)</title>
diff -r 72874dd7eb8d -r 954f6aef52d6 Data/Documents/torture_test.xml
--- a/Data/Documents/torture_test.xml sam. juin 13 09:36:13 2015 +0200
+++ b/Data/Documents/torture_test.xml sam. juin 13 11:14:32 2015 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Id$ -->
<publidoc version="1.0">
- <document id="torture_test" xml:lang="fr" type="example">
+ <document xml:lang="fr" type="example">
<head>
<title>Torture test</title>
<shorttitle>Test</shorttitle>
diff -r 72874dd7eb8d -r 954f6aef52d6 RelaxNG/publidoc.rnc
--- a/RelaxNG/publidoc.rnc sam. juin 13 09:36:13 2015 +0200
+++ b/RelaxNG/publidoc.rnc sam. juin 13 11:14:32 2015 +0200
@@ -216,7 +216,7 @@
document = element document { document.attributes, document.content }
document.attributes =
- document.id.attribute
+ document.id.attribute?
& document.type.attribute?
& lang.attribute?
document.id.attribute = attribute id { xsd:NMTOKEN }
@@ -232,7 +232,7 @@
top.topic = element topic { top.topic.attributes, top.topic.content }
top.topic.attributes =
- topic.id.attribute
+ topic.id.attribute?
& topic.type.attribute?
& lang.attribute?
topic.id.attribute = attribute id { xsd:NMTOKEN }
diff -r 72874dd7eb8d -r 954f6aef52d6 RelaxNG/publiquiz.rnc
--- a/RelaxNG/publiquiz.rnc sam. juin 13 09:36:13 2015 +0200
+++ b/RelaxNG/publiquiz.rnc sam. juin 13 11:14:32 2015 +0200
@@ -37,7 +37,7 @@
top.quiz = element quiz { top.quiz.attributes, top.quiz.content }
top.quiz.attributes =
- quiz.id.attribute
+ quiz.id.attribute?
& quiz.type.attribute?
& lang.attribute?
quiz.id.attribute = attribute id { xsd:NMTOKEN }