Skip to content

Commit ec662e2

Browse files
meiXXImeiXXI
authored
Merge pull request #214 from cip4/vista
Add PositionRef to StripMark
2 parents 0e892b2 + 7dd2af1 commit ec662e2

2 files changed

Lines changed: 34 additions & 4 deletions

File tree

‎src/main/resources/org/cip4/lib/xjdf/binding.xjb‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@
8383
<xjb:baseType name="org.cip4.lib.xjdf.schema.Position"/>
8484
</xjb:property>
8585
</xjb:bindings>
86+
<xjb:bindings node="//xs:element[@name='StripMark']//xs:attribute[@name='PositionRef']">
87+
<xjb:property name="position">
88+
<xjb:baseType name="org.cip4.lib.xjdf.schema.Position"/>
89+
</xjb:property>
90+
</xjb:bindings>
8691
<xjb:bindings node="//xs:element[@name='FillMark']//xs:attribute[@name='KnockoutRefs']">
8792
<xjb:property name="knockouts">
8893
<xjb:baseType name="org.cip4.lib.xjdf.schema.Resource"/>

‎src/main/resources/org/cip4/lib/xjdf/schema/jdfschema_2_x.xsd‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
XJDF Schema 2.x.124-SNAPSHOT-4b7c1c1 (2025-02-26 21:27:44Z)
4+
XJDF Schema 2.x.133-SNAPSHOT-cdee6d2 (2025-11-05 12:24:31Z)
55
66
CIP4 Organization
77
https://www.cip4.org
@@ -15,7 +15,7 @@
1515
License: https://github.com/cip4/XJDF-Schema/blob/main/LICENSE.md
1616
1717
-->
18-
<xs:schema targetNamespace="http://www.CIP4.org/JDFSchema_2_0" xmlns="http://www.CIP4.org/JDFSchema_2_0" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.x.124-SNAPSHOT-4b7c1c1">
18+
<xs:schema targetNamespace="http://www.CIP4.org/JDFSchema_2_0" xmlns="http://www.CIP4.org/JDFSchema_2_0" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.x.133-SNAPSHOT-cdee6d2">
1919
<xs:simpleType name="language">
2020
<xs:restriction base="xs:string"/>
2121
</xs:simpleType>
@@ -312,6 +312,12 @@
312312
<xs:enumeration value="UV"/>
313313
</xs:restriction>
314314
</xs:simpleType>
315+
<xs:simpleType name="FeedSheetLay">
316+
<xs:restriction base="xs:NMTOKEN">
317+
<xs:enumeration value="Leading"/>
318+
<xs:enumeration value="Trailing"/>
319+
</xs:restriction>
320+
</xs:simpleType>
315321
<xs:simpleType name="SheetLay">
316322
<xs:restriction base="xs:NMTOKEN">
317323
<xs:enumeration value="Center"/>
@@ -3697,6 +3703,7 @@
36973703
<xs:extension base="SpecificResource">
36983704
<xs:sequence>
36993705
<xs:element maxOccurs="unbounded" minOccurs="0" ref="IdentificationField"/>
3706+
<xs:element maxOccurs="unbounded" minOccurs="0" ref="SurfaceMark"/>
37003707
</xs:sequence>
37013708
<xs:attribute name="Automation" type="EnumAutomation" use="optional"/>
37023709
<xs:attribute name="CartonTopFlaps" type="XYPair" use="optional"/>
@@ -3780,6 +3787,7 @@
37803787
<xs:complexContent>
37813788
<xs:extension base="SpecificResource">
37823789
<xs:attribute name="Drying" type="EnumDrying" use="optional"/>
3790+
<xs:attribute name="FeedSheetLay" type="FeedSheetLay" use="optional"/>
37833791
<xs:attribute name="FirstSurface" type="Side" use="optional"/>
37843792
<xs:attribute name="FountainSolution" use="optional">
37853793
<xs:simpleType>
@@ -3970,6 +3978,7 @@
39703978
</xs:restriction>
39713979
</xs:simpleType>
39723980
</xs:attribute>
3981+
<xs:attribute name="FeedSheetLay" type="FeedSheetLay" use="optional"/>
39733982
<xs:attribute name="ManualFeed" type="xs:boolean" use="optional"/>
39743983
<xs:attribute name="PageDelivery" use="optional">
39753984
<xs:simpleType>
@@ -4378,6 +4387,7 @@
43784387
<xs:attribute name="Anchor" type="Anchor" use="optional"/>
43794388
<xs:attribute name="Automated" type="xs:boolean" use="optional"/>
43804389
<xs:attribute name="ExpansionBox" type="rectangle" use="optional"/>
4390+
<xs:attribute name="FeedSheetLay" type="FeedSheetLay" use="optional"/>
43814391
<xs:attribute name="FilmRef" type="xs:IDREF" use="optional"/>
43824392
<xs:attribute name="InnermostShingling" type="xs:float" use="optional"/>
43834393
<xs:attribute name="MaxCollect" type="xs:int" use="optional"/>
@@ -4896,8 +4906,10 @@
48964906
<xs:enumeration value="CIP3Multiple"/>
48974907
<xs:enumeration value="CIP3Single"/>
48984908
</xs:restriction>
4899-
</xs:simpleType>
4909+
</xs:simpleType>
49004910
</xs:attribute>
4911+
<xs:attribute name="Resolution" type="XYPair" use="optional"/>
4912+
<xs:attribute name="Size" type="XYPair" use="optional"/>
49014913
</xs:extension>
49024914
</xs:complexContent>
49034915
</xs:complexType>
@@ -5381,9 +5393,9 @@
53815393
<xs:complexType>
53825394
<xs:sequence>
53835395
<xs:element maxOccurs="1" minOccurs="0" ref="BarcodeReproParams"/>
5384-
<xs:element maxOccurs="unbounded" minOccurs="0" ref="FillMark"/>
53855396
<xs:element maxOccurs="unbounded" minOccurs="0" ref="ColorControlStrip"/>
53865397
<xs:element maxOccurs="unbounded" minOccurs="0" ref="CutMark"/>
5398+
<xs:element maxOccurs="unbounded" minOccurs="0" ref="FillMark"/>
53875399
<xs:element maxOccurs="unbounded" minOccurs="0" ref="IdentificationField"/>
53885400
<xs:element maxOccurs="1" minOccurs="0" ref="JobField"/>
53895401
<xs:element maxOccurs="1" minOccurs="0" ref="RefAnchor"/>
@@ -5400,13 +5412,26 @@
54005412
<xs:attribute name="MarkName" type="xs:NMTOKEN" use="optional"/>
54015413
<xs:attribute name="Offset" type="XYPair" use="optional"/>
54025414
<xs:attribute name="Orientation" type="Orientation" use="optional"/>
5415+
<xs:attribute name="PositionRef" type="xs:IDREF" use="optional"/>
54035416
<xs:attribute name="RelativeHeight" type="xs:float" use="optional"/>
54045417
<xs:attribute name="RelativeWidth" type="xs:float" use="optional"/>
54055418
<xs:attribute name="StripMarkDetails" type="xs:string" use="optional"/>
54065419
<xs:attribute name="VerticalFitPolicy" type="EnumFitPolicy" use="optional"/>
54075420
<xs:anyAttribute namespace="##other" processContents="lax"/>
54085421
</xs:complexType>
54095422
</xs:element>
5423+
<xs:element name="SurfaceMark">
5424+
<xs:complexType>
5425+
<xs:sequence>
5426+
<xs:element maxOccurs="unbounded" minOccurs="0" ref="ColorControlStrip"/>
5427+
<xs:element maxOccurs="unbounded" minOccurs="0" ref="CutMark"/>
5428+
<xs:element maxOccurs="unbounded" minOccurs="0" ref="RegisterMark"/>
5429+
<xs:element maxOccurs="unbounded" minOccurs="0" ref="ScavengerArea"/>
5430+
</xs:sequence>
5431+
<xs:attribute name="Surface" type="Face" use="required"/>
5432+
<xs:anyAttribute namespace="##other" processContents="lax"/>
5433+
</xs:complexType>
5434+
</xs:element>
54105435
<xs:element name="TabDimensions">
54115436
<xs:complexType>
54125437
<xs:attribute name="TabEdge" type="Edge" use="optional"/>

0 commit comments

Comments
 (0)