--- a/RelaxNG/publidoc.rnc dim. mai 24 19:12:25 2015 +0200
+++ b/RelaxNG/publidoc.rnc mer. mai 27 22:29:05 2015 +0200
@@ -196,7 +196,7 @@
top.head = element head { top.head.content }
top.head.content =
- (title, shorttitle?, subtitle*)?
+ (title & shorttitle? & subtitle*)?
& identifier*
& copyright*
& collection?
@@ -254,7 +254,7 @@
division.head = element head { division.head.content }
division.head.content =
- (title, shorttitle?, subtitle*)?
+ (title & shorttitle? & subtitle*)?
& indexset?
& abstract?
& annotation?
@@ -289,7 +289,7 @@
component.head = element head { component.head.content }
component.head.content =
- (title, shorttitle?, subtitle*)?
+ (title & shorttitle? & subtitle*)?
& contributors?
& date?
& place?
@@ -325,7 +325,7 @@
section.head = element head { section.head.content }
section.head.content =
- (title, shorttitle?, subtitle*)?
+ (title & shorttitle? & subtitle*)?
& keywordset?
& subjectset?
& indexset?
@@ -380,7 +380,7 @@
block.head = element head { block.head.content }
block.head.content =
- (title, shorttitle?, subtitle*)?
+ (title & shorttitle? & subtitle*)?
& indexset?
& annotation?
--- a/RelaxNG/publimeta.rnc dim. mai 24 19:12:25 2015 +0200
+++ b/RelaxNG/publimeta.rnc mer. mai 27 22:29:05 2015 +0200
@@ -38,7 +38,7 @@
lang.attribute = attribute xml:lang { xsd:language }
metadata.content =
- (title, shorttitle?, subtitle*)?
+ (title & shorttitle? & subtitle*)?
& identifier*
& copyright*
& collection?
--- a/RelaxNG/publiquiz.rnc dim. mai 24 19:12:25 2015 +0200
+++ b/RelaxNG/publiquiz.rnc mer. mai 27 22:29:05 2015 +0200
@@ -245,9 +245,9 @@
category.head = element head { category.head.content }
category.head.content =
- title,
- shorttitle?,
- subtitle*
+ title
+ & shorttitle?
+ & subtitle*
# ~~~~~~ categories
categories = element categories { categories.attributes, categories.content }
--- a/RelaxNG/publiset.rnc dim. mai 24 19:12:25 2015 +0200
+++ b/RelaxNG/publiset.rnc mer. mai 27 22:29:05 2015 +0200
@@ -237,7 +237,7 @@
remap.attributes
composition.head.content =
- (title, shorttitle?, subtitle*)?
+ (title & shorttitle? & subtitle*)?
& identifier*
& copyright*
& collection?