INTEGRATION: CWS sj05 (1.84.2); FILE MERGED

2004/03/25 17:17:04 sj 1.84.2.5: changed callout-length from integer to length
2004/03/09 13:57:32 sj 1.84.2.4: added same letter heights property for fontwork
2004/02/06 10:23:22 sj 1.84.2.3: name changes
2004/01/27 20:38:17 sj 1.84.2.2: added word-wrap and auto-grow-size attribute
2003/12/19 11:24:27 sj 1.84.2.1: added auto-shape element

1 files changed, 105 insertions, 1 deletions

diff --git a/xmloff/dtd/drawing.mod b/xmloff/dtd/drawing.mod
index b9c44368c880..53cb34728a10 100644
--- a/xmloff/dtd/drawing.mod
+++ b/xmloff/dtd/drawing.mod
@@ -1,5 +1,5 @@
 <!--
-	$Id: drawing.mod,v 1.85 2004-03-30 16:11:47 rt Exp $
+	$Id: drawing.mod,v 1.86 2004-04-02 13:51:06 rt Exp $
 
    The Contents of this file are made available subject to the terms of
    either of the following licenses
@@ -201,6 +201,110 @@
 <!ATTLIST draw:connector %text-anchor;>
 <!ATTLIST draw:connector draw:layer %layerName; #IMPLIED>
 
+<!ELEMENT draw:custom-shape (draw:thumbnail?, draw:enhanced-geometry?, ( office:events?, %draw-text;)?)>
+<!ATTLIST draw:custom-shape %draw-position;>
+<!ATTLIST draw:custom-shape %draw-size;>
+<!ATTLIST draw:custom-shape %draw-end-position;>
+<!ATTLIST draw:custom-shape %draw-table-background;>
+<!ATTLIST draw:custom-shape %draw-style-name;>
+<!ATTLIST draw:custom-shape %draw-transform;>
+<!ATTLIST draw:custom-shape %draw-zindex;>
+<!ATTLIST draw:custom-shape draw:id %draw-shape-id;>
+<!ATTLIST draw:custom-shape %text-anchor;>
+<!ATTLIST draw:custom-shape draw:layer %layerName;>
+<!ATTLIST draw:custom-shape draw:engine %CDATA #IMPLIED>
+<!ATTLIST draw:custom-shape draw:data %CDATA #IMPLIED>
+<!ELEMENT draw:enhanced-geometry draw:equation*,draw:handle*>
+<!ENTITY % custom-shape-type "(NonPrimitive|Rectangle|RoundRectangle|Ellipse|Diamond|IsocelesTriangle|RightTriangle|Parallelogram|Trapezoid|Hexagon|Octagon|Plus|Star|Arrow|ThickArrow|HomePlate|Cube|Balloon|Seal|Arc|Line|Plaque|Can|Donut|TextSimple|TextOctagon|TextHexagon|TextCurve|TextWave|TextRing|TextOnCurve|TextOnRing|StraightConnector1|BentConnector2|BentConnector3|BentConnector4|BentConnector5|CurvedConnector2|CurvedConnector3|CurvedConnector4|CurvedConnector5|Callout1|Callout2|Callout3|AccentCallout1|AccentCallout2|AccentCallout3|BorderCallout1|BorderCallout2|BorderCallout3|AccentBorderCallout1|AccentBorderCallout2|AccentBorderCallout3|Ribbon|Ribbon2|Chevron|Pentagon|NoSmoking|Seal8|Seal16|Seal32|WedgeRectCallout|WedgeRRectCallout|WedgeEllipseCallout|Wave|FoldedCorner|LeftArrow|DownArrow|UpArrow|LeftRightArrow|UpDownArrow|IrregularSeal1|IrregularSeal2|LightningBolt|Heart|PictureFrame|QuadArrow|LeftArrowCallout|RightArrowCallout|UpArrowCallout|DownArrowCallout|LeftRightArrowCallout|UpDownArrowCallout|QuadArrowCallout|Bevel|LeftBracket|RightBracket|LeftBrace|RightBrace|LeftUpArrow|BentUpArrow|BentArrow|Seal24|StripedRightArrow|NotchedRightArrow|BlockArc|SmileyFace|VerticalScroll|HorizontalScroll|CircularArrow|NotchedCircularArrow|UturnArrow|CurvedRightArrow|CurvedLeftArrow|CurvedUpArrow|CurvedDownArrow|CloudCallout|EllipseRibbon|EllipseRibbon2|FlowChartProcess|FlowChartDecision|FlowChartInputOutput|FlowChartPredefinedProcess|FlowChartInternalStorage|FlowChartDocument|FlowChartMultidocument|FlowChartTerminator|FlowChartPreparation|FlowChartManualInput|FlowChartManualOperation|FlowChartConnector|FlowChartPunchedCard|FlowChartPunchedTape|FlowChartSummingJunction|FlowChartOr|FlowChartCollate|FlowChartSort|FlowChartExtract|FlowChartMerge|FlowChartOfflineStorage|FlowChartOnlineStorage|FlowChartMagneticTape|FlowChartMagneticDisk|FlowChartMagneticDrum|FlowChartDisplay|FlowChartDelay|TextPlainText|TextStop|TextTriangle|TextTriangleInverted|TextChevron|TextChevronInverted|TextRingInside|TextRingOutside|TextArchUpCurve|TextArchDownCurve|TextCircleCurve|TextButtonCurve|TextArchUpPour|TextArchDownPour|TextCirclePour|TextButtonPour|TextCurveUp|TextCurveDown|TextCascadeUp|TextCascadeDown|TextWave1|TextWave2|TextWave3|TextWave4|TextInflate|TextDeflate|TextInflateBottom|TextDeflateBottom|TextInflateTop|TextDeflateTop|TextDeflateInflate|TextDeflateInflateDeflate|TextFadeRight|TextFadeLeft|TextFadeUp|TextFadeDown|TextSlantUp|TextSlantDown|TextCanUp|TextCanDown|FlowChartAlternateProcess|FlowChartOffpageConnector|Callout90|AccentCallout90|BorderCallout90|AccentBorderCallout90|LeftRightUpArrow|Sun|Moon|BracketPair|BracePair|Seal4|DoubleWave|ActionButtonBlank|ActionButtonHome|ActionButtonHelp|ActionButtonInformation|ActionButtonForwardNext|ActionButtonBackPrevious|ActionButtonEnd|ActionButtonBeginning|ActionButtonReturn|ActionButtonDocument|ActionButtonSound|ActionButtonMovie|HostControl|TextBox)" >
+<!ATTLIST draw:enhanced-geometry draw:predefined-type %custom-shape-type; #REQUIRED>
+<!ATTLIST draw:enhanced-geometry draw:coordinate-origin-x %coordinate; "0">
+<!ATTLIST draw:enhanced-geometry draw:coordinate-origin-y %coordinate; "0">
+<!ATTLIST draw:enhanced-geometry draw:coordinate-origin-width %coordinate; #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:coordinate-origin-height %coordinate; #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:mirror-vertical %boolean; "false">
+<!ATTLIST draw:enhanced-geometry draw:mirror-horizontal %boolean; "false">
+<!ATTLIST style:properties draw:word-wrap %boolean; #IMPLIED>
+<!ATTLIST style:properties draw:auto-grow-size %boolean; #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:text-rotate-angle %float; #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:extrusion-allowed %boolean; "false">
+<!ATTLIST draw:enhanced-geometry draw:text-path-allowed %boolean; "false">
+<!ATTLIST draw:enhanced-geometry draw:concentric-gradient-fill-allowed %boolean; "false">
+<!ATTLIST draw:enhanced-geometry draw:extrusion (on|off) "off">
+<!ENTITY % point3D "CDATA">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-auto-rotation-center %boolean; "false">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-background-depth %length; "36pt">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-brightness %percentage; #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:extrusion-diffusity %percentage; "0%">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-edge %integer; "1">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-facet %integer; "30">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-foreground-depth %length; "0">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-light-face %boolean; "true">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-light-harsh1 %boolean; "true">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-light-harsh2 %boolean; "true">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-light-level1 %percentage; #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:extrusion-light-level2 %percentage; #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:extrusion-light-direction1 %vector3D; #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:extrusion-light-direction2 %vector3D; #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:extrusion-metal %boolean; "false">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-plane (xy|zx|yz) "xy">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-render-mode (solid|wireframe|boundingcube) "solid">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-rotation-angle-x %float; "0">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-rotation-angle-y %float; "0">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-rotation-center-x %percentage; "50%">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-rotation-center-y %percentage; "50%">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-rotation-center-z %percentage; "50%">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-shininess %percentage; "50%">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-skew %percentage; "50%">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-skew-angle %float; "45">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-specularity %percentage; "0%">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-parallel %boolean; "true">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-viewpoint %point3D; #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:extrusion-origin-x %percentage; "0">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-origin-x %percentage; "0">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-origin-y %percentage; "0">
+<!ATTLIST draw:enhanced-geometry draw:extrusion-color %boolean; "false">
+<!ATTLIST style:properties draw:secondary-fill-color %color; #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:enhanced-path CDATA #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:path-stretchpoint-x %coordinate; "0">
+<!ATTLIST draw:enhanced-geometry draw:path-stretchpoint-y %coordinate; "0">
+<!ATTLIST draw:enhanced-geometry draw:text-frames CDATA #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:glue-points CDATA #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:glue-point-type (none|segments|rectangle) "none">
+<!ATTLIST draw:enhanced-geometry draw:glue-point-leaving-directions CDATA #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:text-path (on|off) "off">
+<!ATTLIST draw:enhanced-geometry draw:text-path-fit-text %boolean; "false">
+<!ATTLIST draw:enhanced-geometry draw:text-path-fit-shape %boolean; "false">
+<!ATTLIST draw:enhanced-geometry draw:text-path-scale-x %boolean; "false">
+<!ATTLIST draw:enhanced-geometry draw:text-path-same-letter-heights %boolean; "false">
+<!ATTLIST draw:enhanced-geometry draw:adjustments CDATA #IMPLIED>
+<!ELEMENT draw:equation EMPTY>
+<!ATTLIST draw:equation draw:formula CDATA #IMPLIED>
+<!ELEMENT draw:handle EMPTY>
+<!ATTLIST draw:handle draw:handle-mirror-vertical %boolean; "false">
+<!ATTLIST draw:handle draw:handle-mirror-horizontal %boolean; "false">
+<!ATTLIST draw:handle draw:handle-switched %boolean; "false">
+<!ATTLIST draw:handle draw:handle-position CDATA; #REQUIRED>
+<!ATTLIST draw:handle draw:handle-range-x-minimum CDATA; #IMPLIED>
+<!ATTLIST draw:handle draw:handle-range-x-maximum CDATA; #IMPLIED>
+<!ATTLIST draw:handle draw:handle-range-y-minimum CDATA; #IMPLIED>
+<!ATTLIST draw:handle draw:handle-range-y-maximum CDATA; #IMPLIED>
+<!ATTLIST draw:handle draw:handle-polar CDATA; #IMPLIED>
+<!ATTLIST draw:handle draw:handle-radius-range-minimum CDATA; #IMPLIED>
+<!ATTLIST draw:handle draw:handle-radius-range-maximum CDATA; #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:callout (on|off) "off">
+<!ATTLIST draw:enhanced-geometry draw:callout-accent-bar %boolean; "false">
+<!ATTLIST draw:enhanced-geometry draw:callout-angle %float; #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:callout-distance %length; #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:callout-drop (top|center|bottom) #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:callout-drop-automatic %boolean; "false">
+<!ATTLIST draw:enhanced-geometry draw:callout-gap %length; #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:callout-length %length; #IMPLIED>
+<!ATTLIST draw:enhanced-geometry draw:callout-length-specified %boolean; "false">
+<!ATTLIST draw:enhanced-geometry draw:callout-flip-x %boolean; "false">
+<!ATTLIST draw:enhanced-geometry draw:callout-flip-y %boolean; "false">
+<!ATTLIST draw:enhanced-geometry draw:callout-text-border %boolean; "true">
+<!ATTLIST draw:enhanced-geometry draw:callout-type (rectangle|roundrectangle|oval|cloud) "rectangle">
+
 <!ELEMENT draw:control EMPTY>
 <!ATTLIST draw:control %draw-style-name;>
 <!ATTLIST draw:control %draw-position; >