jwg12 ifc4 style where rules

[aothms]

Correct usage of Window|Door Style in WR

[aothms]

--- tmp/a/IFC.exp	2022-07-08 16:51:14.579597600 +0200
+++ tmp/b/IFC.exp	2022-07-10 19:58:16.865931400 +0200
@@ -5971,42 +5971,34 @@
 	LiningToPanelOffsetY : OPTIONAL IfcLengthMeasure;
  WHERE
 	WR31 : NOT(EXISTS(LiningDepth) AND NOT(EXISTS(LiningThickness)));
 	WR32 : NOT(EXISTS(ThresholdDepth) AND NOT(EXISTS(ThresholdThickness)));
 	WR33 : (EXISTS(TransomOffset) AND EXISTS(TransomThickness)) XOR
 (NOT(EXISTS(TransomOffset)) AND NOT(EXISTS(TransomThickness)));
 	WR34 : (EXISTS(CasingDepth) AND EXISTS(CasingThickness)) XOR
 (NOT(EXISTS(CasingDepth)) AND NOT(EXISTS(CasingThickness)));
 	WR35 : (EXISTS(SELF\IfcPropertySetDefinition.DefinesType[1])) 
 AND 
-(
- ('IFC4X3_DEV.IFCDOORTYPE' IN TYPEOF(SELF\IfcPropertySetDefinition.DefinesType[1]))
-  OR
- ('IFC4X3_DEV.IFCDOORSTYLE' IN TYPEOF(SELF\IfcPropertySetDefinition.DefinesType[1]))
-);
+('IFC4X3_DEV.IFCDOORTYPE' IN TYPEOF(SELF\IfcPropertySetDefinition.DefinesType[1]));
 END_ENTITY;
 
 ENTITY IfcDoorPanelProperties
  SUBTYPE OF (IfcPreDefinedPropertySet);
 	PanelDepth : OPTIONAL IfcPositiveLengthMeasure;
 	PanelOperation : IfcDoorPanelOperationEnum;
 	PanelWidth : OPTIONAL IfcNormalisedRatioMeasure;
 	PanelPosition : IfcDoorPanelPositionEnum;
 	ShapeAspectStyle : OPTIONAL IfcShapeAspect;
  WHERE
 	ApplicableToType : (EXISTS(SELF\IfcPropertySetDefinition.DefinesType[1])) 
 AND 
-(
- ('IFC4X3_DEV.IFCDOORTYPE' IN TYPEOF(SELF\IfcPropertySetDefinition.DefinesType[1]))
-  OR
- ('IFC4X3_DEV.IFCDOORSTYLE' IN TYPEOF(SELF\IfcPropertySetDefinition.DefinesType[1]))
-);
+('IFC4X3_DEV.IFCDOORTYPE' IN TYPEOF(SELF\IfcPropertySetDefinition.DefinesType[1]));
 END_ENTITY;
 
 ENTITY IfcDoorType
  SUBTYPE OF (IfcBuiltElementType);
 	PredefinedType : IfcDoorTypeEnum;
 	OperationType : IfcDoorTypeOperationEnum;
 	ParameterTakesPrecedence : OPTIONAL IfcBoolean;
 	UserDefinedOperationType : OPTIONAL IfcLabel;
  WHERE
 	CorrectPredefinedType : (PredefinedType <> IfcDoorTypeEnum.USERDEFINED) OR
@@ -9658,22 +9650,20 @@
 END_ENTITY;
 
 ENTITY IfcRelAssociatesMaterial
  SUBTYPE OF (IfcRelAssociates);
 	RelatingMaterial : IfcMaterialSelect;
  WHERE
 	AllowedElements : SIZEOF(QUERY(temp <* SELF\IfcRelAssociates.RelatedObjects | (
   SIZEOF(TYPEOF(temp) * [   
     'IFC4X3_DEV.IFCELEMENT', 
     'IFC4X3_DEV.IFCELEMENTTYPE',
-    'IFC4X3_DEV.IFCWINDOWSTYLE',
-    'IFC4X3_DEV.IFCDOORSTYLE',
     'IFC4X3_DEV.IFCSTRUCTURALMEMBER',
     'IFC4X3_DEV.IFCPORT']) = 0) 
 )) = 0;
 	NoVoidElement : SIZEOF(QUERY(temp <* SELF\IfcRelAssociates.RelatedObjects | 
   ('IFC4X3_DEV.IFCFEATUREELEMENTSUBTRACTION' IN TYPEOF(temp)) OR 
   ('IFC4X3_DEV.IFCVIRTUALELEMENT' IN TYPEOF(temp)) 
 )) = 0;
 END_ENTITY;
 
 ENTITY IfcRelAssociatesProfileDef
@@ -12173,42 +12163,34 @@
 	ShapeAspectStyle : OPTIONAL IfcShapeAspect;
 	LiningOffset : OPTIONAL IfcLengthMeasure;
 	LiningToPanelOffsetX : OPTIONAL IfcLengthMeasure;
 	LiningToPanelOffsetY : OPTIONAL IfcLengthMeasure;
  WHERE
 	WR31 : NOT(EXISTS(LiningDepth) AND NOT(EXISTS(LiningThickness)));
 	WR32 : NOT(NOT(EXISTS(FirstTransomOffset)) AND EXISTS(SecondTransomOffset));
 	WR33 : NOT(NOT(EXISTS(FirstMullionOffset)) AND EXISTS(SecondMullionOffset));
 	WR34 : (EXISTS(SELF\IfcPropertySetDefinition.DefinesType[1])) 
 AND 
-(
- ('IFC4X3_DEV.IFCWINDOWTYPE' IN TYPEOF(SELF\IfcPropertySetDefinition.DefinesType[1]))
-  OR
- ('IFC4X3_DEV.IFCWINDOWSTYLE' IN TYPEOF(SELF\IfcPropertySetDefinition.DefinesType[1]))
-);
+('IFC4X3_DEV.IFCWINDOWTYPE' IN TYPEOF(SELF\IfcPropertySetDefinition.DefinesType[1]));
 END_ENTITY;
 
 ENTITY IfcWindowPanelProperties
  SUBTYPE OF (IfcPreDefinedPropertySet);
 	OperationType : IfcWindowPanelOperationEnum;
 	PanelPosition : IfcWindowPanelPositionEnum;
 	FrameDepth : OPTIONAL IfcPositiveLengthMeasure;
 	FrameThickness : OPTIONAL IfcPositiveLengthMeasure;
 	ShapeAspectStyle : OPTIONAL IfcShapeAspect;
  WHERE
 	ApplicableToType : (EXISTS(SELF\IfcPropertySetDefinition.DefinesType[1])) 
 AND 
-(
- ('IFC4X3_DEV.IFCWINDOWTYPE' IN TYPEOF(SELF\IfcPropertySetDefinition.DefinesType[1]))
-  OR
- ('IFC4X3_DEV.IFCWINDOWSTYLE' IN TYPEOF(SELF\IfcPropertySetDefinition.DefinesType[1]))
-);
+('IFC4X3_DEV.IFCWINDOWTYPE' IN TYPEOF(SELF\IfcPropertySetDefinition.DefinesType[1]));
 END_ENTITY;
 
 ENTITY IfcWindowType
  SUBTYPE OF (IfcBuiltElementType);
 	PredefinedType : IfcWindowTypeEnum;
 	PartitioningType : IfcWindowTypePartitioningEnum;
 	ParameterTakesPrecedence : OPTIONAL IfcBoolean;
 	UserDefinedPartitioningType : OPTIONAL IfcLabel;
  WHERE
 	CorrectPredefinedType : (PredefinedType <> IfcWindowTypeEnum.USERDEFINED) OR