Mercurial Mercurial > Publidoc / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
copyright
authorPatrick PIERRE <patrick.pierre@prismallia.fr>
mer., 20 juil. 2011 15:05:37 +0200
changeset 39 7faa356bad3e
parent 38 3c8b406be906
child 40 7cfe2d4957c6
copyright
RelaxNG/publidoc.rnc file | annotate | diff | comparison | revisions
RelaxNG/publidoc.rng file | annotate | diff | comparison | revisions
RelaxNG/publiset.rnc file | annotate | diff | comparison | revisions
RelaxNG/publiset.rng file | annotate | diff | comparison | revisions
Xml/Documents/torture_test.xml file | annotate | diff | comparison | revisions
Xml/Sets/composition.xml file | annotate | diff | comparison | revisions 
--- a/RelaxNG/publidoc.rnc	mer. juil. 20 14:38:48 2011 +0200
+++ b/RelaxNG/publidoc.rnc	mer. juil. 20 15:05:37 2011 +0200
@@ -63,6 +63,7 @@
    (title, subtitle?)?
  & identifier*
  & language?
+ & copyright?
  & author*
  & publisher?
  & date?
@@ -115,6 +116,12 @@
    lang.attribute
 lang.attribute = attribute xml:lang { xsd:language }
 
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ copyright ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+copyright = element copyright { copyright.content }
+
+copyright.content = inlines
+
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ author, publisher ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # ~~~~~~ author
@@ -427,11 +434,6 @@
 image.content =
    copyright?
 
-# ~~~~~~ copyright
-copyright = element copyright { copyright.content }
-
-copyright.content = inlines
-
 
 # =============================================================================
 #                                 INLINE LEVEL
--- a/RelaxNG/publidoc.rng	mer. juil. 20 14:38:48 2011 +0200
+++ b/RelaxNG/publidoc.rng	mer. juil. 20 15:05:37 2011 +0200
@@ -135,6 +135,9 @@
       <optional>
         <ref name="language"/>
       </optional>
+      <optional>
+        <ref name="copyright"/>
+      </optional>
       <zeroOrMore>
         <ref name="author"/>
       </zeroOrMore>
@@ -276,6 +279,15 @@
       <data type="language"/>
     </attribute>
   </define>
+  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ copyright ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+  <define name="copyright">
+    <element name="copyright">
+      <ref name="copyright.content"/>
+    </element>
+  </define>
+  <define name="copyright.content">
+    <ref name="inlines"/>
+  </define>
   <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ author, publisher ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
   <!-- ~~~~~~ author -->
   <define name="author">
@@ -923,15 +935,6 @@
       <ref name="copyright"/>
     </optional>
   </define>
-  <!-- ~~~~~~ copyright -->
-  <define name="copyright">
-    <element name="copyright">
-      <ref name="copyright.content"/>
-    </element>
-  </define>
-  <define name="copyright.content">
-    <ref name="inlines"/>
-  </define>
   <!--
     =============================================================================
                                     INLINE LEVEL
--- a/RelaxNG/publiset.rnc	mer. juil. 20 14:38:48 2011 +0200
+++ b/RelaxNG/publiset.rnc	mer. juil. 20 15:05:37 2011 +0200
@@ -76,6 +76,7 @@
    (title, subtitle?)?
  & identifier*
  & language?
+ & copyright?
  & author*
  & publisher?
  & source?
@@ -110,6 +111,12 @@
 language.attributes = lang.attribute
 lang.attribute = attribute xml:lang { xsd:language }
 
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ copyright ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+copyright = element copyright { copyright.content }
+
+copyright.content = inlines
+
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ author, publisher ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # ~~~~~~ author
--- a/RelaxNG/publiset.rng	mer. juil. 20 14:38:48 2011 +0200
+++ b/RelaxNG/publiset.rng	mer. juil. 20 15:05:37 2011 +0200
@@ -153,6 +153,9 @@
       <optional>
         <ref name="language"/>
       </optional>
+      <optional>
+        <ref name="copyright"/>
+      </optional>
       <zeroOrMore>
         <ref name="author"/>
       </zeroOrMore>
@@ -233,6 +236,15 @@
       <data type="language"/>
     </attribute>
   </define>
+  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ copyright ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+  <define name="copyright">
+    <element name="copyright">
+      <ref name="copyright.content"/>
+    </element>
+  </define>
+  <define name="copyright.content">
+    <ref name="inlines"/>
+  </define>
   <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ author, publisher ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
   <!-- ~~~~~~ author -->
   <define name="author">
--- a/Xml/Documents/torture_test.xml	mer. juil. 20 14:38:48 2011 +0200
+++ b/Xml/Documents/torture_test.xml	mer. juil. 20 15:05:37 2011 +0200
@@ -8,6 +8,7 @@
       <identifier type="ean">9782351840114</identifier>
       <identifier type="uri">http://www.prismallia.fr/Xml/torture_test</identifier>
       <language xml:lang="fr"/>
+      <copyright>Prismallia, Paris, 2011</copyright>
       <author>
         <firstname>Patrick</firstname><lastname>PIERRE</lastname>
       </author>
--- a/Xml/Sets/composition.xml	mer. juil. 20 14:38:48 2011 +0200
+++ b/Xml/Sets/composition.xml	mer. juil. 20 15:05:37 2011 +0200
@@ -7,6 +7,7 @@
         <title>Exemple d'assemblage de sujets</title>
         <identifier type="ean">9782351840114</identifier>
         <language xml:lang="fr"/>
+        <copyright>Prismallia, Paris, 2011</copyright>
         <author>
           <firstname>Patrick</firstname><lastname>PIERRE</lastname>
         </author>
Publidoc