diff options
Diffstat (limited to 'xmloff/dtd')
-rw-r--r-- | xmloff/dtd/drawing.mod | 37 | ||||
-rw-r--r-- | xmloff/dtd/dtypes.mod | 4 | ||||
-rw-r--r-- | xmloff/dtd/office.mod | 9 | ||||
-rw-r--r-- | xmloff/dtd/style.mod | 5 |
4 files changed, 35 insertions, 20 deletions
diff --git a/xmloff/dtd/drawing.mod b/xmloff/dtd/drawing.mod index ff1d53e12178..1c654173b9c3 100644 --- a/xmloff/dtd/drawing.mod +++ b/xmloff/dtd/drawing.mod @@ -1,5 +1,5 @@ <!-- - $Id: drawing.mod,v 1.1 2000-09-29 16:16:03 mh Exp $ + $Id: drawing.mod,v 1.2 2000-10-10 10:41:12 cl Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -59,8 +59,14 @@ <!ENTITY % draw-position "svg:x %coordinate; #IMPLIED svg:y %coordinate; #IMPLIED"> <!ENTITY % draw-size "svg:width %coordinate; #IMPLIED svg:height %coordinate; #IMPLIED"> <!ENTITY % draw-transform "svg:transform CDATA #IMPLIED"> -<!ENTITY % draw-viewbox "svg:viewbox CDATA #REQUIRED"> -<!ENTITY % draw-style-name "draw:style-name %styleName; #REQUIRED"> +<!ENTITY % draw-viewbox "svg:viewBox CDATA #REQUIRED"> +<!ENTITY % draw-style-name "draw:style-name %styleName; #IMPLIED presentation:style-name %styleName; #IMPLIED"> + +<!-- commont presentation shape attributes --> +<!ENTITY % presentation-style-name "presentation:style-name %styleName; #IMPLIED"> +<!ENTITY % presentation-classes "(title|outline|subtitle|text|graphic|object|chart|table|orgchart|page|notes)" > +<!-- ENTITY % presentation-class "presentation:class %presentation-classes; #IMPLIED" --> +<!ENTITY % presentation-class "presentation:class %presentation-classes; #IMPLIED presentation:placeholder (true|false) #IMPLIED"> <!-- Drawing shapes --> <!ELEMENT draw:rect (text:p)*> @@ -118,11 +124,18 @@ <!ELEMENT draw:g (%shapes;)* > <!ATTLIST draw:g %draw-transform; > -<!-- commont presentation shape attributes --> -<!ENTITY % presentation-style-name "presentation:style-name %styleName; #IMPLIED"> -<!ENTITY % presentation-classes "title|outline|subtitle|text|graphic|object|chart|table|orgchart|page|notes" > -<!ENTITY % presentation-class "presentation:class %presentation-classes; #IMPLIED"> +<!ELEMENT draw:page-thumbnail EMPTY> +<!ATTLIST draw:page-thumbnail %draw-position; > +<!ATTLIST draw:page-thumbnail %draw-size; > +<!ATTLIST draw:page-thumbnail %draw-style-name; > +<!ATTLIST draw:page-thumbnail %presentation-class; > +<!ELEMENT text:text-box (text:p)*> +<!ATTLIST text:text-box %draw-position; > +<!ATTLIST text:text-box %draw-size; > +<!ATTLIST text:text-box %draw-style-name; > +<!ATTLIST text:text-box %presentation-class; > +<!ATTLIST text:text-box %draw-transform; > <!-- graphic style elements --> <!ELEMENT draw:gradient EMPTY > @@ -173,8 +186,8 @@ <!ATTLIST style:properties svg:stroke-dasharray CDATA #IMPLIED> <!ATTLIST style:properties svg:stroke-width %length; #IMPLIED> <!ATTLIST style:properties svg:stroke-color %color; #IMPLIED> -<!ATTLIST style:properties draw:marker-start (none|%uriReference;) #IMPLIED> -<!ATTLIST style:properties draw:marker-end (none|%uriReference;) #IMPLIED> +<!ATTLIST style:properties draw:marker-start %styleName; #IMPLIED> +<!ATTLIST style:properties draw:marker-end %styleName; #IMPLIED> <!ATTLIST style:properties draw:marker-start-width %length; #IMPLIED> <!ATTLIST style:properties draw:marker-end-width %length; #IMPLIED> <!ATTLIST style:properties draw:marker-start-center %boolean; #IMPLIED> @@ -209,10 +222,10 @@ <!-- shadow attributes --> <!ATTLIST style:properties draw:shadow (visible|hidden) #IMPLIED> -<!ATTLIST style:properties draw:shadow-distance-x %length; #IMPLIED> -<!ATTLIST style:properties draw:shadow-distance-y %length; #IMPLIED> +<!ATTLIST style:properties draw:shadow-offset-x %length; #IMPLIED> +<!ATTLIST style:properties draw:shadow-offset-y %length; #IMPLIED> <!ATTLIST style:properties draw:shadow-color %color; #IMPLIED> -<!ATTLIST style:properties draw:shadow-transparency (%float;|%percentage;) #IMPLIED> +<!ATTLIST style:properties draw:shadow-transparency CDATA #IMPLIED> <!-- Master page --> <!ELEMENT style:master-page (style:style*,(%shapes;)*,presentation:notes?) > diff --git a/xmloff/dtd/dtypes.mod b/xmloff/dtd/dtypes.mod index 3f1dd69af36e..dc215993c880 100644 --- a/xmloff/dtd/dtypes.mod +++ b/xmloff/dtd/dtypes.mod @@ -1,5 +1,5 @@ <!-- - $Id: dtypes.mod,v 1.1 2000-09-29 16:16:03 mh Exp $ + $Id: dtypes.mod,v 1.2 2000-10-10 10:42:02 cl Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -145,6 +145,6 @@ <!-- an svg coordinate in different distance formats --> <!ENTITY % coordinate "CDATA"> -<!ENTITY % shapes "(draw:rect|draw:line|draw:polyline|draw:polygon|draw:polygonpath|draw:circle|draw:ellipse|draw:g)" > +<!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/office.mod b/xmloff/dtd/office.mod index e6f9d853a3c6..386974ed2bac 100644 --- a/xmloff/dtd/office.mod +++ b/xmloff/dtd/office.mod @@ -1,5 +1,5 @@ <!-- - $Id: office.mod,v 1.1 2000-09-29 16:16:04 mh Exp $ + $Id: office.mod,v 1.2 2000-10-10 10:43:12 cl Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -103,7 +103,8 @@ <!ENTITY % styles "(style:style|text:list-style|number:number-style| number:currency-style|number:percentage-style|number:date-style| - number:time-style|number:boolean-style|number:text-style)"> + number:time-style|number:boolean-style|number:text-style| + draw:gradient|draw:hatch|draw:fill-image|draw:marker)"> <!-- Validity constraint: The elements text:outline-style, @@ -117,13 +118,13 @@ <!ELEMENT office:automatic-styles (%styles;)*> -<!ELEMENT office:master-styles EMPTY> +<!ELEMENT office:master-styles (style:master-page)* > <!ENTITY % text-decls "text:variable-decls?, text:sequence-decls?, text:user-field-decls?, text:dde-connection-decls?" > <!ENTITY % body "(%text-decls;,table:content-validations?,(text:h|text:p|text:ordered-list| - text:unordered-list|table:table|chart:chart| + text:unordered-list|table:table|chart:chart|draw:page| draw:a|draw:text-box|draw:image)*,table:named-expressions?, table:database-ranges?,table:data-pilot-tables?)"> <!ELEMENT office:body %body;> diff --git a/xmloff/dtd/style.mod b/xmloff/dtd/style.mod index 0f295c5a4dc8..39110a20dd7a 100644 --- a/xmloff/dtd/style.mod +++ b/xmloff/dtd/style.mod @@ -1,5 +1,5 @@ <!-- - $Id: style.mod,v 1.3 2000-10-10 06:25:23 sab Exp $ + $Id: style.mod,v 1.4 2000-10-10 10:44:37 cl Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -59,7 +59,7 @@ <!ATTLIST style:style style:name %styleName; #REQUIRED> <!ENTITY % styleFamily "(paragraph|text| - table|table-column|table-row|table-cell|table-page|chart|graphics)"> + table|table-column|table-row|table-cell|table-page|chart|graphics|default|drawing-page|presentation)"> <!ATTLIST style:style style:family %styleFamily; #REQUIRED> <!ATTLIST style:style style:parent-style-name %styleName; #IMPLIED> @@ -262,3 +262,4 @@ <!ATTLIST style:column style:rel-width CDATA #IMPLIED> <!ATTLIST style:column fo:margin-left %positiveLength; #IMPLIED> <!ATTLIST style:column fo:margin-right %positiveLength; #IMPLIED> + |