Mercurial Mercurial > Publidoc / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
indexset
authorPatrick PIERRE
ven., 16 janv. 2015 11:22:43 +0100
changeset 361 edbbf787aaa2
parent 360 77f406396cfc
child 362 c9c19db11584
indexset
Data/Sets/composition.xml file | annotate | diff | comparison | revisions
RelaxNG/publiset.rnc file | annotate | diff | comparison | revisions 
--- a/Data/Sets/composition.xml	mar. déc. 23 17:38:30 2014 +0100
+++ b/Data/Sets/composition.xml	ven. janv. 16 11:22:43 2015 +0100
@@ -41,7 +41,9 @@
       <division path="../Topics" xslt="composition.xsl">
         <head>
           <title>Les événements</title>
-          <index><entry>événements</entry></index>
+          <indexset>
+            <index><entry>événements</entry></index>
+          </indexset>
           <abstract>
             <p>Où l'on évoque pêle-mêle quelques sujets d'actualité.</p>
           </abstract>
@@ -55,7 +57,9 @@
         <head>
           <title>Les brèves</title>
           <subtitle>Europe</subtitle>
-          <index><entry>brèves</entry><entry>Europe</entry></index>
+          <indexset>
+            <index><entry>brèves</entry><entry>Europe</entry></index>
+          </indexset>
         </head>
         <file xslt="composition.xsl" path="../Topics">portugal_ue.xml</file>
       </division>
@@ -64,7 +68,9 @@
       <division>
         <head>
           <title>Les photographies avec légende</title>
-          <index><entry>photographie</entry></index>
+          <indexset>
+            <index><entry>photographie</entry></index>
+          </indexset>
         </head>
         <division as="topic" path="../Topics">
           <file xpath="topic/section">a380.xml</file>
--- a/RelaxNG/publiset.rnc	mar. déc. 23 17:38:30 2014 +0100
+++ b/RelaxNG/publiset.rnc	ven. janv. 16 11:22:43 2015 +0100
@@ -152,6 +152,11 @@
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ index ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+# ~~~~~~ indexset
+indexset = element indexset { indexset.content }
+
+indexset.content = head.index+
+
 # ~~~~~~ index
 head.index = element index { head.index.content }
 
@@ -229,7 +234,7 @@
  & (source, source?)?
  & keywordset?
  & subjectset?
- & head.index*
+ & indexset?
  & abstract?
  & cover?
 
@@ -259,6 +264,13 @@
 #                                DIVISION LEVEL
 # =============================================================================
 
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ division.head ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+division.head = element head { division.head.content }
+
+division.head.content =
+   (title, shorttitle?, subtitle*)?
+ & indexset?
+
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ division ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # ~~~~~~ division
@@ -285,13 +297,6 @@
    selection.head?,
    (selection.division | selection.file | link)+
 
-# ~~~~~~ division.head
-division.head = element head { division.head.content }
-
-division.head.content =
-   (title, shorttitle?, subtitle*)?
- & head.index*
-
 
 # =============================================================================
 #                                  FILE LEVEL
Publidoc