issue #28#: removed some ambiguities

4 files changed, 27 insertions, 26 deletions

diff --git a/xmloff/dtd/datastyl.mod b/xmloff/dtd/datastyl.mod
index f4c24fa4feab..a1dcc1db507b 100644
--- a/xmloff/dtd/datastyl.mod
+++ b/xmloff/dtd/datastyl.mod
@@ -1,6 +1,6 @@
 <!--
 
-   $Id: datastyl.mod,v 1.2 2000-10-18 17:24:56 sab Exp $
+   $Id: datastyl.mod,v 1.3 2000-10-24 11:21:33 mib Exp $
 
    The Contents of this file are made available subject to the terms of
    either of the following licenses
@@ -56,26 +56,26 @@
 
 <!-- data styles -->
 <!ENTITY % any-number "( number:number | number:scientific-number | number:fraction )">
-<!ENTITY % number-style-content "( number:text | (number:text?,%any-number;,number:text?) )">
+<!ENTITY % number-style-content "( (number:text,(%any-number;,number:text?)?) | (%any-number;,number:text?) )">
 <!ELEMENT number:number-style ( style:properties?, %number-style-content;, style:map* )>
 <!ELEMENT number:number EMPTY>
 <!ELEMENT number:scientific-number EMPTY>
 <!ELEMENT number:fraction EMPTY>
 
 <!ENTITY % currency-symbol-and-text "number:currency-symbol,number:text?">
-<!ENTITY % number-and-text "number:number,number:text?">
-<!ENTITY % currency-style-content "( number:text | (number:text?,%number-and-text;,
-	(number:text?,%currency-symbol-and-text;)?) | (%currency-symbol-and-text;,(%number-and-text;)?))">
+<!ENTITY % number-and-text "(number:number,number:text?)">
+<!ENTITY % currency-style-content "( (number:text,(%number-and-text;,(number:text?,%currency-symbol-and-text;)?)?) | (%number-and-text;,(number:text?,%currency-symbol-and-text;)?) | (%currency-symbol-and-text;,%number-and-text;?) )">
+
 <!ELEMENT number:currency-style ( style:properties?, %currency-style-content;, style:map* )>
 <!ELEMENT number:currency-symbol (#PCDATA)>
 <!ATTLIST number:currency-symbol number:language CDATA #IMPLIED>
 <!ATTLIST number:currency-symbol number:country CDATA #IMPLIED>
 
-<!ENTITY % percentage-style-content "( number:text | (number:text?,%number-and-text;) )">
+<!ENTITY % percentage-style-content "( (number:text,%number-and-text;?) | %number-and-text; )">
 <!ELEMENT number:percentage-style ( style:properties?, %percentage-style-content;, style:map* )>
 
 <!ENTITY % any-date "( number:day | number:month | number:year | number:day-of-week | number:week-of-year | number:quarter| number:hours | number:am-pm | number:minutes | number:seconds )">
-<!ENTITY % date-style-content "( number:text | (number:text?,(%any-date;,number:text?)+) )">
+<!ENTITY % date-style-content "( (number:text,(%any-date;,number:text?)+) | (%any-date;,number:text?)+ )">
 <!ELEMENT number:date-style ( style:properties?, %date-style-content;, style:map* )>
 <!ELEMENT number:day EMPTY>
 <!ATTLIST number:day number:style (short|long) "short">
@@ -91,7 +91,7 @@
 <!ATTLIST number:quarter number:style (short|long) "short">
 
 <!ENTITY % any-time "( number:hours | number:am-pm | number:minutes | number:seconds )">
-<!ENTITY % time-style-content "( number:text | (number:text?,(%any-time;,number:text?)+) )">
+<!ENTITY % time-style-content "( (number:text,(%any-time;,number:text?)+) | (%any-time;,number:text?)+)">
 <!ELEMENT number:time-style ( style:properties?, %time-style-content;, style:map* )>
 <!ELEMENT number:hours EMPTY>
 <!ATTLIST number:hours number:style (short|long) "short">
@@ -102,11 +102,11 @@
 <!ATTLIST number:seconds number:decimal-places %integer; "0">
 <!ELEMENT number:am-pm EMPTY>
 
-<!ENTITY % boolean-style-content "(number:text| (number:text?,number:boolean,number:text?))">
+<!ENTITY % boolean-style-content "( (number:text,(number:boolean,number:text?)?) | (number:boolean,number:text?) )">
 <!ELEMENT number:boolean-style ( style:properties?,%boolean-style-content;, style:map* )>
 <!ELEMENT number:boolean EMPTY>
 
-<!ENTITY % text-style-content "(number:text| (number:text?,number:text-content, number:text?))">
+<!ENTITY % text-style-content "( (number:text,(number:text-content,number:text?)?) | (number:text-content,number:text?) )">
 <!ELEMENT number:text-style ( style:properties?,%text-style-content;, style:map* )>
 <!ELEMENT number:text (#PCDATA)>
 <!ELEMENT number:text-content EMPTY>
diff --git a/xmloff/dtd/drawing.mod b/xmloff/dtd/drawing.mod
index ac510ac000c4..980def2ae0ea 100644
--- a/xmloff/dtd/drawing.mod
+++ b/xmloff/dtd/drawing.mod
@@ -1,5 +1,5 @@
 <!--
-	$Id: drawing.mod,v 1.3 2000-10-19 10:13:54 dr Exp $
+	$Id: drawing.mod,v 1.4 2000-10-24 11:21:33 mib Exp $
 
    The Contents of this file are made available subject to the terms of
    either of the following licenses
@@ -192,7 +192,7 @@
 <!ATTLIST style:properties draw:marker-end-width %length; #IMPLIED>
 <!ATTLIST style:properties draw:marker-start-center %boolean; #IMPLIED>
 <!ATTLIST style:properties draw:marker-end-center %boolean; #IMPLIED>
-<!ATTLIST style:properties svg:stroke-opacity (%float;|%percentage;) #IMPLIED>
+<!ATTLIST style:properties svg:stroke-opacity %floatOrPercentage; #IMPLIED>
 <!ATTLIST style:properties svg:stroke-linejoin (miter|round|bevel|middle|none|inherit) #IMPLIED>
 
 <!-- fill attributes -->
@@ -208,7 +208,8 @@
 <!ATTLIST style:properties draw:refX %percentage; #IMPLIED>
 <!ATTLIST style:properties draw:refY %percentage; #IMPLIED>
 <!ATTLIST style:properties draw:tile-repeat-offset CDATA #IMPLIED>
-<!ATTLIST style:properties draw:transparency (none|%float;|%percentage;) #IMPLIED>
+<!ENTITY % noneOrFloatOrPercentage "CDATA">
+<!ATTLIST style:properties draw:transparency %noneOrFloatOrPercentage; #IMPLIED>
 <!ATTLIST style:properties draw:transparency-name %styleName; #IMPLIED>
 
 <!-- graphic attributes -->
@@ -243,10 +244,10 @@
 <!ATTLIST style:presentation-page-layout style:name %styleName; #REQUIRED>
 <!ELEMENT presentation:placeholder EMPTY >
 <!ATTLIST presentation:placeholder presentation:object (title|outline|subtitle|text|graphic|object|chart|orgchart|page|notes|handout) #REQUIRED>
-<!ATTLIST presentation:placeholder svg:x (%coordinate;|%percentage;) #REQUIRED>
-<!ATTLIST presentation:placeholder svg:y (%coordinate;|%percentage;) #REQUIRED>
-<!ATTLIST presentation:placeholder svg:width (%length;|%percentage;) #REQUIRED>
-<!ATTLIST presentation:placeholder svg:height (%length;|%percentage;) #REQUIRED>
+<!ATTLIST presentation:placeholder svg:x %coordinateOrPercentage; #REQUIRED>
+<!ATTLIST presentation:placeholder svg:y %coordinateOrPercentage; #REQUIRED>
+<!ATTLIST presentation:placeholder svg:width %lengthOrPercentage; #REQUIRED>
+<!ATTLIST presentation:placeholder svg:height %lengthOrPercentage; #REQUIRED>
 
 <!-- presentation page attributes -->
 <!ATTLIST style:properties presentation:transition-type (manual|automatic|semi-automatic) #IMPLIED >
diff --git a/xmloff/dtd/dtypes.mod b/xmloff/dtd/dtypes.mod
index 5abee70fa75c..ea40d72beafb 100644
--- a/xmloff/dtd/dtypes.mod
+++ b/xmloff/dtd/dtypes.mod
@@ -1,5 +1,5 @@
 <!--
-	$Id: dtypes.mod,v 1.3 2000-10-19 10:13:54 dr Exp $
+	$Id: dtypes.mod,v 1.4 2000-10-24 11:21:33 mib Exp $
 
    The Contents of this file are made available subject to the terms of
    either of the following licenses
@@ -136,6 +136,9 @@
 <!ENTITY % lengthOrPercentage	"CDATA">
 <!ENTITY % positiveLengthOrPercentage	"CDATA">
 
+<!-- a float or a percentage -->
+<!ENTITY % floatOrPercentage	"CDATA">
+
 <!-- a text encoding -->
 <!ENTITY % textEncoding	"CDATA">
 
@@ -150,6 +153,8 @@
 <!-- an svg coordinate in different distance formats -->
 <!ENTITY % coordinate "CDATA">
 
+<!ENTITY % coordinateOrPercentage	"CDATA">
+
 <!ENTITY % shapes "(draw:rect|draw:line|draw:polyline|draw:polygon|draw:polygonpath|draw:circle|draw:ellipse|draw:g|draw:page-thumbnail|text:text-box)" >
 
 <!ENTITY % anchorType "(page|frame|paragraph|char|as-char)">
diff --git a/xmloff/dtd/table.mod b/xmloff/dtd/table.mod
index f8556cbdf945..6c49bd177329 100644
--- a/xmloff/dtd/table.mod
+++ b/xmloff/dtd/table.mod
@@ -1,6 +1,5 @@
-<!-- edited with XML Spy v3.0 NT (http://www.xmlspy.com) by Jumper (Star Office GmbH) -->
 <!--
-	$Id: table.mod,v 1.8 2000-10-24 09:54:22 dr Exp $
+	$Id: table.mod,v 1.9 2000-10-24 11:21:33 mib Exp $
 
    The Contents of this file are made available subject to the terms of
    either of the following licenses
@@ -57,12 +56,8 @@
 <!ENTITY % table-header-columns "table:table-header-columns">
 <!ENTITY % table-rows "( table:table-rows | table:table-row+ )">
 <!ENTITY % table-header-rows "table:table-header-rows">
-<!ENTITY % table-column-groups "( %table-header-columns; |
-            (%table-columns;, %table-header-columns;, %table-columns;?) |
-			(%table-header-columns;?, %table-columns;) )">
-<!ENTITY % table-row-groups "( %table-header-rows; |
-            (%table-rows;, %table-header-rows;, %table-rows;?) |
-			(%table-header-rows;?, %table-rows;) )">
+<!ENTITY % table-column-groups "( (%table-columns;,(%table-header-columns;,%table-columns;?)?) | (%table-header-columns;,%table-columns;?) )">
+<!ENTITY % table-row-groups "( (%table-rows;,(%table-header-rows;,%table-rows;?)?) | (%table-header-rows;,%table-rows;?) )">
 <!ELEMENT table:table (table:scenario?, %table-column-groups;, %table-row-groups;)>
 <!ATTLIST table:table
 	table:name %string; #REQUIRED