fixture fixes

gistfile1.txt

@@ -183,6 +183,7 @@ elementFormDefault="qualified"
         <xs:enumeration value="IntensityValue"/>
         <xs:enumeration value="IntensityValueFine"/>
         <xs:enumeration value="PositionPan"/>
+        <xs:enumeration value="PositionPanCounterClockwise"/>
         <xs:enumeration value="PositionPanFine"/>
         <xs:enumeration value="PositionTilt"/>
         <xs:enumeration value="PositionTiltFine"/>
@@ -229,12 +230,17 @@ elementFormDefault="qualified"
         <xs:enumeration value="ShutterClose" />
         <xs:enumeration value="StrobeSlowToFast" />
         <xs:enumeration value="StrobeFastToSlow" />
-        <xs:enumeration value="PulseSlowToFast" />
-        <xs:enumeration value="PulseFastToSlow" />
-        <xs:enumeration value="StrobeFreq" />
+        <xs:enumeration value="StrobeRandom" />
+        <xs:enumeration value="PulseInSlowToFast" />
+        <xs:enumeration value="PulseInFastToSlow" />
+        <xs:enumeration value="PulseOutSlowToFast" />
+        <xs:enumeration value="PulseOutFastToSlow" />
+        <xs:enumeration value="StrobeFrequency" />
         <xs:enumeration value="StrobeFreqRange" />
-        <xs:enumeration value="PulseFreq" />
-        <xs:enumeration value="PulseFreqRange" />
+        <xs:enumeration value="PulseInFrequency" />
+        <xs:enumeration value="PulseOutFrequency" />
+        <xs:enumeration value="PulseInFreqRange" />
+        <xs:enumeration value="PulseOutFreqRange" />
         <xs:enumeration value="RotationClockwise" />
         <xs:enumeration value="RotationCounterClockwise" />
         <xs:enumeration value="TiltContinuous" />
@@ -242,6 +248,7 @@ elementFormDefault="qualified"
         <xs:enumeration value="ColorDoubleMacro" />
         <xs:enumeration value="ColorWheelIndex" />
         <xs:enumeration value="GoboMacro" />
+        <xs:enumeration value="GoboShakeMacro" />
         <xs:enumeration value="GenericPicture" />
         <xs:enumeration value="Alias" />
     </xs:restriction>

---------------------- resources/schemas/fixturesmap.xsd ----------------------
index 412dfd7..a86fd8f 100644
@@ -35,15 +35,15 @@ elementFormDefault="qualified"
 <xs:element name="FixturesMap">
     <xs:complexType>
         <xs:sequence>
-            <xs:element name="fixture" type="fixtureType" maxOccurs="unbounded"/>
+            <xs:element name="F" type="fixtureType" maxOccurs="unbounded"/>
         </xs:sequence>
      </xs:complexType>
 </xs:element>
 
 <xs:complexType name="fixtureType">
-   <xs:attribute name="path" type="xs:string" use="required"/>
-   <xs:attribute name="mf" type="xs:string" use="required"/>
-   <xs:attribute name="md" type="xs:string" use="required"/>
+   <xs:attribute name="n" type="xs:string" use="required"/>
+   <xs:attribute name="m" type="xs:string" use="required"/>
+   <xs:attribute name="d" type="xs:string" use="required"/>
 </xs:complexType>
 
 </xs:schema>