diff options
| author | Daniel Vogelheim <dvo@openoffice.org> | 2001-01-15 16:17:24 +0000 |
|---|---|---|
| committer | Daniel Vogelheim <dvo@openoffice.org> | 2001-01-15 16:17:24 +0000 |
| commit | 4552d57fd9078f9bc7b704f66c17b4cc105e88c6 (patch) | |
| tree | 34111cd2bd69a2a61b7caf2b45f0194ef4dec1ac /xmloff | |
| parent | 8dc8989289f867751dd9e2c248fe8fc8e4054184 (diff) | |
- added: text:script text field
- fixed: office:annotation moved from table.mod to office.mod, changed attributes
- added: office:annotation text field
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/dtd/office.mod | 10 | ||||
| -rw-r--r-- | xmloff/dtd/table.mod | 9 | ||||
| -rw-r--r-- | xmloff/dtd/text.mod | 10 |
3 files changed, 18 insertions, 11 deletions
diff --git a/xmloff/dtd/office.mod b/xmloff/dtd/office.mod index 0c3c5624e7c2..e5a7ced4523a 100644 --- a/xmloff/dtd/office.mod +++ b/xmloff/dtd/office.mod @@ -1,5 +1,5 @@ <!-- - $Id: office.mod,v 1.23 2001-01-05 10:23:08 mib Exp $ + $Id: office.mod,v 1.24 2001-01-15 17:17:24 dvo Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -158,3 +158,11 @@ <!ATTLIST office:dde-source office:name CDATA #IMPLIED> <!ATTLIST office:dde-source table:conversion-mode (into-default-style-data-style|into-english-number|let-text) "into-default-style-data-style" > +<!-- annotations --> +<!-- limitation: in the current implementation, only plain text inside of + paragraphs is supported --> +<!ELEMENT office:annotation (text:p)*> +<!ATTLIST office:annotation office:author %string; #REQUIRED> +<!ATTLIST office:annotation office:create-date %date; #IMPLIED> +<!ATTLIST office:annotation office:create-date-string %string; #IMPLIED> +<!ATTLIST office:annotation office:display %boolean; "false"> diff --git a/xmloff/dtd/table.mod b/xmloff/dtd/table.mod index beeb74c8ec92..e1123f3171e2 100644 --- a/xmloff/dtd/table.mod +++ b/xmloff/dtd/table.mod @@ -1,5 +1,5 @@ <!-- - $Id: table.mod,v 1.20 2000-12-15 14:04:20 mib Exp $ + $Id: table.mod,v 1.21 2001-01-15 17:17:24 dvo Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -242,13 +242,6 @@ table:last-column-spanned %positiveInteger; #REQUIRED table:last-row-spanned %positiveInteger; #REQUIRED > -<!ELEMENT office:annotation (%cString;)> -<!ATTLIST office:annotation - office:author %string; #REQUIRED - office:create-date %date; #IMPLIED - office:create-date-string %string; #IMPLIED - office:display %boolean; "true" -> <!ELEMENT table:detective (table:highlighted-range*,table:operation*)> <!ELEMENT table:highlighted-range EMPTY> <!ATTLIST table:highlighted-range diff --git a/xmloff/dtd/text.mod b/xmloff/dtd/text.mod index 02909748c895..5c42f7324bfb 100644 --- a/xmloff/dtd/text.mod +++ b/xmloff/dtd/text.mod @@ -1,5 +1,5 @@ <!-- - $Id: text.mod,v 1.18 2001-01-12 18:26:52 dvo Exp $ + $Id: text.mod,v 1.19 2001-01-15 17:17:24 dvo Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -127,7 +127,9 @@ text:character-count | text:table-count | text:image-count | - text:object-count" > + text:object-count | + office:annotation | + text:script" > <!ENTITY % inline-text "(#PCDATA| @@ -1049,3 +1051,7 @@ indices, and there may be only one text:index-title element. <!ELEMENT text:linenumbering-separator (#PCDATA)> <!ATTLIST text:linenumbering-separator text:increment %nonNegativeInteger; #IMPLIED> +<!ELEMENT text:script (#PCDATA)> +<!ATTLIST text:script script:language CDATA #REQUIRED> +<!ATTLIST text:script xlink:href CDATA #IMPLIED> +<!ATTLIST text:script xlink:type (simple) #FIXED "simple"> |