Author: jeremias
Date: Fri Jan 30 11:25:57 2009
New Revision: 739242
URL: http://svn.apache.org/viewvc?rev=739242&view=rev
Log:
Bookmarks are now in the doc navigation namespace, so move the definition and
update it.
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-nav.xsd
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-nav.xsd
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-nav.xsd?rev=739242&r1=739241&r2=739242&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-nav.xsd
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-nav.xsd
Fri Jan 30 11:25:57 2009
@@ -21,8 +21,57 @@
targetNamespace="http://xmlgraphics.apache.org/fop/intermediate/document-navigation";
xmlns:nav="http://xmlgraphics.apache.org/fop/intermediate/document-navigation";
xmlns:if="http://xmlgraphics.apache.org/fop/intermediate";>
+
<xs:import schemaLocation="fop-intermediate-format-ng-datatypes.xsd"
namespace="http://xmlgraphics.apache.org/fop/intermediate"/>
+
+ <xs:element name="bookmark-tree">
+ <xs:complexType>
+ <xs:sequence minOccurs="1" maxOccurs="unbounded">
+ <xs:element ref="nav:bookmark"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="bookmark">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="nav:actionType">
+ <xs:sequence>
+ <xs:element ref="nav:bookmark" maxOccurs="unbounded"
minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="title" type="xs:string"/>
+ <xs:attribute name="starting-state">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="show"/>
+ <xs:enumeration value="hide"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <!-- Not yet implemented:
+ <xs:attribute name="color" type="if:colorType"/>
+ <xs:attribute name="font-style">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="normal"/>
+ <xs:enumeration value="italic"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="font-weight">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="normal"/>
+ <xs:enumeration value="bold"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ -->
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
<xs:element name="link">
<xs:complexType>
<xs:complexContent>
@@ -32,6 +81,7 @@
</xs:complexContent>
</xs:complexType>
</xs:element>
+
<xs:complexType name="actionType">
<xs:choice>
<xs:element ref="nav:goto-uri"/>
@@ -42,6 +92,14 @@
<xs:complexType>
<xs:attributeGroup ref="nav:idAtts"/>
<xs:attribute name="uri" type="xs:anyURI" use="required"/>
+ <xs:attribute name="show-destination" use="optional" default="replace">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="new"/>
+ <xs:enumeration value="replace"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:complexType>
</xs:element>
<xs:element name="goto-xy">
@@ -51,15 +109,16 @@
<xs:attributeGroup ref="nav:posAtts"/>
</xs:complexType>
</xs:element>
+
<xs:attributeGroup name="posAtts">
<xs:attribute name="x" type="if:lengthType" default="0"/>
<xs:attribute name="y" type="if:lengthType" default="0"/>
</xs:attributeGroup>
<xs:attributeGroup name="idAtts">
- <xs:attribute name="id" type="xs:ID"/>
+ <xs:attribute name="id" type="xs:NCName"/>
</xs:attributeGroup>
<xs:attributeGroup name="refDef">
<xs:attributeGroup ref="nav:idAtts"/>
- <xs:attribute name="idref" type="xs:IDREF"/>
+ <xs:attribute name="idref" type="xs:NCName"/>
</xs:attributeGroup>
</xs:schema>
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd?rev=739242&r1=739241&r2=739242&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd
Fri Jan 30 11:25:57 2009
@@ -40,60 +40,16 @@
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<!--xs:element ref="x:xmpmeta" xmlns:x="adobe:ns:meta/"/-->
- <xs:element ref="mf:bookmark-tree"/>
<xs:any namespace="##other" processContents="lax"/>
</xs:choice>
</xs:complexType>
</xs:element>
- <xs:element name="trailer" type="mf:anyContent"/>
- <xs:element name="bookmark-tree">
+ <xs:element name="trailer">
<xs:complexType>
- <xs:sequence minOccurs="1" maxOccurs="unbounded">
- <xs:element ref="mf:bookmark"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="bookmark">
- <xs:complexType>
- <xs:sequence minOccurs="1" maxOccurs="1">
- <xs:element name="bookmark-title">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="color" type="mf:colorType"/>
- <xs:attribute name="font-style">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="normal"/>
- <xs:enumeration value="italic"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="font-weight">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="normal"/>
- <xs:enumeration value="bold"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element ref="mf:bookmark" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="external-destination" type="xs:anyURI"/>
- <xs:attribute name="internal-destination" type="xs:NCName">
- </xs:attribute>
- <xs:attribute name="starting-state">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="show"/>
- <xs:enumeration value="hide"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <!--xs:element ref="nav:bookmark-tree"/-->
+ <xs:any namespace="##other" processContents="lax"/>
+ </xs:choice>
</xs:complexType>
</xs:element>
<xs:element name="page-sequence">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
