xml:id -> id
authorPatrick PIERRE <patrick.pierre@prismallia.fr>
mar., 12 juin 2012 11:39:05 +0200
changeset 117 fb3173d57512
parent 116 bd4ff455b83f
child 118 8d2b19e168e1
xml:id -> id
RelaxNG/Examples/Documents/les_miserables.xml
RelaxNG/Examples/Documents/torture_test.xml
RelaxNG/Examples/Quiz/blanks-fill.xml
RelaxNG/Examples/Quiz/blanks-fill_strict.xml
RelaxNG/Examples/Quiz/blanks-select.xml
RelaxNG/Examples/Quiz/blanks-select_multiple.xml
RelaxNG/Examples/Quiz/choices-check.xml
RelaxNG/Examples/Quiz/choices-radio.xml
RelaxNG/Examples/Quiz/composite.xml
RelaxNG/Examples/Quiz/matching.xml
RelaxNG/Examples/Quiz/point.xml
RelaxNG/Examples/Quiz/point_radio.xml
RelaxNG/Examples/Quiz/production.xml
RelaxNG/Examples/Quiz/sort.xml
RelaxNG/Examples/Sets/composition.xml
RelaxNG/Examples/Sets/proba.xml
RelaxNG/Examples/Sets/selection.xml
RelaxNG/Examples/Topics/centre_pompidou.xml
RelaxNG/Examples/Topics/chasseurs.xml
RelaxNG/Examples/Topics/portugal_ue.xml
RelaxNG/Examples/Topics/prince_belge.xml
RelaxNG/Examples/Topics/proba01.xml
RelaxNG/publidoc.rnc
RelaxNG/publiquiz.rnc
RelaxNG/publiset.rnc
Xxe/Css/publidoc.css
Xxe/Css/publiquiz.css
--- a/RelaxNG/Examples/Documents/les_miserables.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Documents/les_miserables.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Id$ -->
 <publidoc  version="1.0">
-  <document xml:id="les_miserables" xml:lang="fr">
+  <document id="les_miserables" xml:lang="fr">
     <head>
       <title>Les Misérables (extraits)</title>
       <contributors>
--- a/RelaxNG/Examples/Documents/torture_test.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Documents/torture_test.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <publidoc version="1.0">
-  <document xml:id="torture_test" xml:lang="fr">
+  <document id="torture_test" xml:lang="fr">
     <head>
       <title>Torture test</title>
       <subtitle>Test des capacités de <name>publidoc</name></subtitle>
--- a/RelaxNG/Examples/Quiz/blanks-fill.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Quiz/blanks-fill.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <publiquiz version="1.0">
-  <quiz xml:id="blanks-fill" xml:lang="fr">
+  <quiz id="blanks-fill" xml:lang="fr">
     <head>
       <title>Exercice à trous</title>
     </head>
--- a/RelaxNG/Examples/Quiz/blanks-fill_strict.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Quiz/blanks-fill_strict.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <publiquiz version="1.0">
-  <quiz xml:id="blanks-fill_strict" xml:lang="fr">
+  <quiz id="blanks-fill_strict" xml:lang="fr">
     <head>
       <title>Exercice à trous strict</title>
     </head>
--- a/RelaxNG/Examples/Quiz/blanks-select.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Quiz/blanks-select.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <publiquiz version="1.0">
-  <quiz xml:id="blanks-select" xml:lang="fr">
+  <quiz id="blanks-select" xml:lang="fr">
     <head>
       <title>Exercice à trous avec suggestions</title>
     </head>
--- a/RelaxNG/Examples/Quiz/blanks-select_multiple.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Quiz/blanks-select_multiple.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <publiquiz version="1.0">
-  <quiz xml:id="blanks-select_multiple" xml:lang="fr">
+  <quiz id="blanks-select_multiple" xml:lang="fr">
     <head>
       <title>Exercice à trous avec suggestions réutilisables</title>
     </head>
--- a/RelaxNG/Examples/Quiz/choices-check.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Quiz/choices-check.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <publiquiz version="1.0">
-  <quiz xml:id="choices-check" xml:lang="fr">
+  <quiz id="choices-check" xml:lang="fr">
     <head>
       <title>Exercice QCM cases à cocher</title>
     </head>
--- a/RelaxNG/Examples/Quiz/choices-radio.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Quiz/choices-radio.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <publiquiz version="1.0">
-  <quiz xml:id="choices-radio" xml:lang="fr">
+  <quiz id="choices-radio" xml:lang="fr">
     <head>
       <title>Exercice QCM radio</title>
     </head>
--- a/RelaxNG/Examples/Quiz/composite.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Quiz/composite.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <publiquiz version="1.0">
-  <quiz xml:id="composite" xml:lang="fr">
+  <quiz id="composite" xml:lang="fr">
     <head>
       <title>Exercice composite</title>
     </head>
--- a/RelaxNG/Examples/Quiz/matching.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Quiz/matching.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <publiquiz version="1.0">
-  <quiz xml:id="matching" xml:lang="fr">
+  <quiz id="matching" xml:lang="fr">
     <head>
       <title>Exercice d'appariement</title>
     </head>
--- a/RelaxNG/Examples/Quiz/point.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Quiz/point.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <publiquiz version="1.0">
-  <quiz xml:id="point" xml:lang="fr">
+  <quiz id="point" xml:lang="fr">
     <head>
       <title>Exercice de pointage</title>
     </head>
--- a/RelaxNG/Examples/Quiz/point_radio.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Quiz/point_radio.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <publiquiz version="1.0">
-  <quiz xml:id="point_radio" xml:lang="fr">
+  <quiz id="point_radio" xml:lang="fr">
     <head>
       <title>Exercice de pointage radio</title>
     </head>
--- a/RelaxNG/Examples/Quiz/production.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Quiz/production.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <publiquiz version="1.0">
-  <quiz xml:id="production" xml:lang="fr">
+  <quiz id="production" xml:lang="fr">
     <head>
       <title>Exercice de production</title>
     </head>
--- a/RelaxNG/Examples/Quiz/sort.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Quiz/sort.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <publiquiz version="1.0">
-  <quiz xml:id="sort" xml:lang="fr">
+  <quiz id="sort" xml:lang="fr">
     <head>
       <title>Exercice de tri</title>
     </head>
--- a/RelaxNG/Examples/Sets/composition.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Sets/composition.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!-- $Id$ -->
 <publiset version="1.0">
-  <composition xml:id="composition" as="publidoc" attributes="version=1.0">
-    <division as="document" attributes="xml:id=composition xml:lang=fr">
+  <composition id="composition" as="publidoc" attributes="version=1.0">
+    <division as="document" attributes="id=composition xml:lang=fr">
       <head transform="composition.xsl">
         <title>Exemple d'assemblage de sujets</title>
         <identifier type="ean">9781449328030</identifier>
--- a/RelaxNG/Examples/Sets/proba.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Sets/proba.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!-- $Id$ -->
 <publiset version="1.0">
-  <composition xml:id="proba" as="publiquiz" attributes="version=1.0">
-    <division as="document" attributes="xml:id=proba xml:lang=fr">
+  <composition id="proba" as="publiquiz" attributes="version=1.0">
+    <division as="document" attributes="id=proba xml:lang=fr">
       <head>
         <title>Exemple d'assemblage de sujets et de quiz</title>
         <keywordset>
--- a/RelaxNG/Examples/Sets/selection.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Sets/selection.xml	mar. juin 12 11:39:05 2012 +0200
@@ -2,7 +2,7 @@
 <!-- $Id$ -->
 <publiset version="1.0">
   <!-- ============================ SÉLECTION 1 =========================== -->
-  <selection xml:id="selection1" xml:lang="fr">
+  <selection id="selection1" xml:lang="fr">
     <head>
       <title>Première sélection</title>
     </head>
@@ -24,7 +24,7 @@
   </selection>
 
   <!-- ============================ SÉLECTION 2 =========================== -->
-  <selection xml:id="selection2" xml:lang="fr">
+  <selection id="selection2" xml:lang="fr">
     <head>
       <title>Deuxième sélection</title>
     </head>
--- a/RelaxNG/Examples/Topics/centre_pompidou.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Topics/centre_pompidou.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <publidoc version="1.0">
-  <topic type="event" xml:id="centre_pompidou" xml:lang="fr-FR">
+  <topic id="centre_pompidou" type="event" xml:lang="fr-FR">
     <head>
       <title>Un nouveau Centre Pompidou après vingt-sept mois de travaux</title>
       <subtitle>Paris, samedi 1<sup>er</sup></subtitle>
--- a/RelaxNG/Examples/Topics/chasseurs.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Topics/chasseurs.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <publidoc version="1.0">
-  <topic xml:id="chasseurs" type="event" xml:lang="fr">
+  <topic id="chasseurs" type="event" xml:lang="fr">
     <head>
       <title>Les chasseurs d'oiseaux contestent la loi</title>
       <subtitle>Baie de Somme, mardi 1<sup>er</sup></subtitle>
--- a/RelaxNG/Examples/Topics/portugal_ue.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Topics/portugal_ue.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <publidoc version="1.0">
-  <topic xml:id="portugal_ue" type="flash" xml:lang="fr">
+  <topic id="portugal_ue" type="flash" xml:lang="fr">
     <head>
       <title>Janvier 2000</title>
       <subtitle>Lisbonne, samedi 1<sup>er</sup></subtitle>
--- a/RelaxNG/Examples/Topics/prince_belge.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Topics/prince_belge.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <publidoc version="1.0">
-  <topic xml:id="prince_belge" type="photo" xml:lang="fr">
+  <topic id="prince_belge" type="photo" xml:lang="fr">
     <head>
       <title>Janvier 2000</title>
       <date value="2000-01"/>
--- a/RelaxNG/Examples/Topics/proba01.xml	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/Examples/Topics/proba01.xml	mar. juin 12 11:39:05 2012 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <publidoc version="1.0">
-  <topic xml:id="proba01" xml:lang="fr">
+  <topic id="proba01" xml:lang="fr">
     <head>
       <title>Qu'est-ce qu'une probabilité ?</title>
       <keywordset>
--- a/RelaxNG/publidoc.rnc	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/publidoc.rnc	mar. juin 12 11:39:05 2012 +0200
@@ -47,7 +47,7 @@
 document.attributes =
    document.id.attribute
  & lang.attribute?
-document.id.attribute = attribute xml:id { xsd:ID }
+document.id.attribute = attribute id { xsd:NMTOKEN }
 lang.attribute = attribute xml:lang { xsd:language }
 
 document.content =
@@ -62,7 +62,7 @@
    topic.id.attribute
  & topic.type.attribute?
  & lang.attribute?
-topic.id.attribute = attribute xml:id { xsd:ID }
+topic.id.attribute = attribute id { xsd:NMTOKEN }
 topic.type.attribute = attribute type { xsd:NCName }
 
 top.topic.content =
@@ -111,9 +111,10 @@
 topic = element topic { topic.attributes, topic.content }
 
 topic.attributes =
-   topic.id.attribute?
+   topic.xmlid.attribute?
  & topic.type.attribute?
  & lang.attribute?
+topic.xmlid.attribute = attribute xml:id { xsd:ID }
 
 topic.content =
    component.head?,
--- a/RelaxNG/publiquiz.rnc	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/publiquiz.rnc	mar. juin 12 11:39:05 2012 +0200
@@ -38,6 +38,7 @@
 top.quiz.attributes =
    quiz.id.attribute
  & lang.attribute?
+quiz.id.attribute = attribute id { xsd:NMTOKEN }
 
 
 # =============================================================================
@@ -49,9 +50,9 @@
 quiz = element quiz { quiz.attributes, quiz.content }
 
 quiz.attributes =
-   quiz.id.attribute?
+   quiz.xmlid.attribute?
  & lang.attribute?
-quiz.id.attribute = attribute xml:id { xsd:ID }
+quiz.xmlid.attribute = attribute xml:id { xsd:ID }
 
 quiz.content =
    component.head?,
--- a/RelaxNG/publiset.rnc	mer. juin 06 18:16:53 2012 +0200
+++ b/RelaxNG/publiset.rnc	mar. juin 12 11:39:05 2012 +0200
@@ -35,7 +35,7 @@
  & xslt.attribute?
  & remap.attributes
  & lang.attribute?
-composition.id.attribute = attribute xml:id { xsd:ID }
+composition.id.attribute = attribute id { xsd:NMTOKEN }
 path.attribute = attribute path { xsd:anyURI }
 xslt.attribute = attribute xslt { xsd:anyURI }
 xpath.attribute = attribute xpath { text }
@@ -73,7 +73,7 @@
    selection.id.attribute
  & path.attribute?
  & lang.attribute?
-selection.id.attribute = attribute xml:id { xsd:ID }
+selection.id.attribute = attribute id { xsd:NMTOKEN }
 
 selection.content =
    selection.head?,
--- a/Xxe/Css/publidoc.css	mer. juin 06 18:16:53 2012 +0200
+++ b/Xxe/Css/publidoc.css	mar. juin 12 11:39:05 2012 +0200
@@ -216,32 +216,32 @@
 }
 publidoc > document:before {
   content: add-attribute-button() " Document"
-           " – ID = " text-field(attribute, "xml:id", columns, 15, color, white);
+           " – ID = " text-field(attribute, "id", columns, 15, color, white);
 }
-publidoc > document[xml|id][xml|lang]:before {
+publidoc > document[id][xml|lang]:before {
   content: "Document"
-           " – ID = " text-field(attribute, "xml:id", columns, 15, color, white)
+           " – ID = " text-field(attribute, "id", columns, 15, color, white)
            " – Langue principale  = " combo-box(attribute, "xml:lang", font-size, 75%,
              values, "en\A fr\A fr-FR\A es", color, white);
 }
-publidoc > topic[xml|id]:before {
+publidoc > topic[id]:before {
   content: add-attribute-button() " Topic"
-           " – ID = " text-field(attribute, "xml:id", columns, 15, color, white);
+           " – ID = " text-field(attribute, "id", columns, 15, color, white);
 }
 publidoc > topic[xml|id][type]:before {
   content: add-attribute-button() " Topic"
-           " – ID = " text-field(attribute, "xml:id", columns, 15, color, white)
+           " – ID = " text-field(attribute, "id", columns, 15, color, white)
            " – Type = " text-field(attribute, type, columns, 10, color, white);
 }
-publidoc > topic[xml|id][xml|lang]:before {
+publidoc > topic[id][xml|lang]:before {
   content: add-attribute-button() " Topic"
-           " – ID = " text-field(attribute, "xml:id", columns, 15, color, white)
+           " – ID = " text-field(attribute, "id", columns, 15, color, white)
            " – Langue principale = " combo-box(attribute, "xml:lang", font-size, 75%,
              values, "en\A fr\A fr-FR\A es", color, white);
 }
-publidoc > topic[xml|id][type][xml|lang]:before {
+publidoc > topic[id][type][xml|lang]:before {
   content: "Topic"
-           " – ID = " text-field(attribute, "xml:id", columns, 15, color, white)
+           " – ID = " text-field(attribute, "id", columns, 15, color, white)
            " – Type = " text-field(attribute, type, columns, 10, color, white)
            " – Langue principale = " combo-box(attribute, "xml:lang", font-size, 75%,
              values, "en\A fr\A fr-FR\A es", color, white);
--- a/Xxe/Css/publiquiz.css	mer. juin 06 18:16:53 2012 +0200
+++ b/Xxe/Css/publiquiz.css	mar. juin 12 11:39:05 2012 +0200
@@ -59,21 +59,21 @@
 }
 publiquiz > document:before {
   content: add-attribute-button() " Document"
-           " – ID = " text-field(attribute, "xml:id", columns, 15, color, white);
+           " – ID = " text-field(attribute, "id", columns, 15, color, white);
 }
-publiquiz > document[xml|id][xml|lang]:before {
+publiquiz > document[id][xml|lang]:before {
   content: "Document"
-           " – ID = " text-field(attribute, "xml:id", columns, 15, color, white)
+           " – ID = " text-field(attribute, "id", columns, 15, color, white)
            " – Langue principale  = " combo-box(attribute, "xml:lang", font-size, 75%,
              values, "en\A fr\A fr-FR\A es", color, white);
 }
-publiquiz > quiz[xml|id]:before {
+publiquiz > quiz[id]:before {
   content: add-attribute-button() " Quiz"
-           " – ID = " text-field(attribute, "xml:id", columns, 15, color, white);
+           " – ID = " text-field(attribute, "id", columns, 15, color, white);
 }
-publiquiz > quiz[xml|id][xml|lang]:before {
+publiquiz > quiz[id][xml|lang]:before {
   content: "Quiz"
-           " – ID = " text-field(attribute, "xml:id", columns, 15, color, white)
+           " – ID = " text-field(attribute, "id", columns, 15, color, white)
            " – Langue principale  = " combo-box(attribute, "xml:lang", font-size, 75%,
              values, "en\A fr\A fr-FR\A es", color, white);
 }