Skip to content

Commit

Permalink
Release 2015-09-17
Browse files Browse the repository at this point in the history
  • Loading branch information
@kohsah
kohsah committed Apr 5, 2016
1 parent 7087d8e commit b9271dd
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 18 deletions.
Binary file modified release_notes/release_notes.odt
View file
Binary file not shown.
11 changes: 6 additions & 5 deletions schema/akomantoso30.dpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- =====================================================================
Akoma Ntoso main schema

Release 10/09/2015 - Akoma Ntoso 3.0 WD15
Release 17/09/2015 with errata - Akoma Ntoso 3.0 WD16
Complete version.


Expand All @@ -21,7 +21,7 @@

===================================================================== -->

<!TARGETNS 'http://docs.oasis-open.org/legaldocml/ns/akn/3.0/WD15'>
<!TARGETNS 'http://docs.oasis-open.org/legaldocml/ns/akn/3.0/WD16'>
<!TARGETNS xml 'http://www.w3.org/XML/1998/namespace'>

<!-- =====================================================================
Expand Down Expand Up @@ -367,6 +367,7 @@ reiteration|remaking|republication|coordination)" >
<!ENTITY ## quote "
startQuote #STRING #IMPLIED
endQuote #STRING #IMPLIED
inlineQuote #STRING #IMPLIED
">


Expand Down Expand Up @@ -626,7 +627,7 @@ reiteration|remaking|republication|coordination)" >
<!ATTLIST documentCollection xxxUnicityConstraintDirtyTrick #STRING #IMPLIED>

<!--- the type collectionBodyType specifies a content model of a container of a list of other documents (e.g, acts, bills, amendments, etc.) possibly interspersed with interstitial elements with content that does not form an individual document -->
<!ENTITY @ collectionBodyType (component+)>
<!ENTITY @ collectionBodyType "(component+)" "##coreopt;">
<!--- the element collectionBody is the container of a list of other documents (e.g, acts, bills, amendments, etc.) possibly interspersed with interstitial elements with content that does not form an individual document -->
<!ELEMENT collectionBody @collectionBodyType; >

Expand Down Expand Up @@ -1525,7 +1526,7 @@ the break of a word at the end of the line with the attribute breakWith. -->



<!--- The element publication is the metadata container specifying a publication event for the FRBR expression of the document. -->
<!--- The element publication is the metadata container specifying an official publication event for the FRBR expression of the document. -->
<!ELEMENT publication @metaopt; >
<!ATTLIST publication ##date; ##show; ##name; ##number; ##refers; >

Expand Down Expand Up @@ -1799,7 +1800,7 @@ restrictions?, judicial?, parliamentary?,

<!--- The element notes is a metadata container of all the note elements used as footnotes and endnotes in the document. -->
<!ELEMENT notes (note)+>
<!ATTLIST notes ##source; >
<!ATTLIST notes ##source; ##xmllang; >
<!--- The element note is a metadata element containing the text of the footnote and endnote specified. -->
<!ELEMENT note @subFlowStructure;>

Expand Down
9 changes: 5 additions & 4 deletions schema/akomantoso30.dtd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- =====================================================================
Akoma Ntoso main schema

Release 10/09/2015 - Akoma Ntoso 3.0 WD15
Release 17/09/2015 with errata - Akoma Ntoso 3.0 WD16
Complete version.


Expand Down Expand Up @@ -351,7 +351,7 @@ Attribute groups: attribute "type"



<!ENTITY % quote " startQuote %STRING; #IMPLIED endQuote %STRING; #IMPLIED" >
<!ENTITY % quote " startQuote %STRING; #IMPLIED endQuote %STRING; #IMPLIED inlineQuote %STRING; #IMPLIED" >



Expand Down Expand Up @@ -511,7 +511,7 @@ Reference: http://www.xmlpatterns.com/ConsistentElementSetMain.shtml

<!ENTITY % akomaNtosoType "((%documentType;),components?)" >

<!ELEMENT akomaNtoso %akomaNtosoType; ><!ATTLIST akomaNtoso xmlns CDATA #FIXED "http://docs.oasis-open.org/legaldocml/ns/akn/3.0/WD15"
<!ELEMENT akomaNtoso %akomaNtosoType; ><!ATTLIST akomaNtoso xmlns CDATA #FIXED "http://docs.oasis-open.org/legaldocml/ns/akn/3.0/WD16"
xmlns:xml CDATA #FIXED "http://www.w3.org/XML/1998/namespace" >


Expand Down Expand Up @@ -576,6 +576,7 @@ Reference: http://www.xmlpatterns.com/ConsistentElementSetMain.shtml
<!ENTITY % collectionBodyType "(component+)" >

<!ELEMENT collectionBody %collectionBodyType; >
<!ATTLIST collectionBody %coreopt; >



Expand Down Expand Up @@ -2033,7 +2034,7 @@ Metadata elements for all documents

<!ELEMENT notes (note)+>

<!ATTLIST notes %source; >
<!ATTLIST notes %source; %xmllang; >

<!ELEMENT note %subFlowStructure; >
<!ATTLIST note %corereq; >
Expand Down
11 changes: 6 additions & 5 deletions schema/akomantoso30.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
&lt;!-- =====================================================================
Akoma Ntoso main schema

<report version="Release 10/09/2015 - Akoma Ntoso 3.0 WD15"/>
<report version="Release 17/09/2015 with errata - Akoma Ntoso 3.0 WD16"/>

technical supervision Fabio Vitali - University of Bologna
legal domain supervision Monica Palmirani - University of Bologna
Expand All @@ -32,7 +32,7 @@

===================================================================== -->

&lt;!TARGETNS 'http://docs.oasis-open.org/legaldocml/ns/akn/3.0/WD15'>
&lt;!TARGETNS 'http://docs.oasis-open.org/legaldocml/ns/akn/3.0/WD16'>
&lt;!TARGETNS xml 'http://www.w3.org/XML/1998/namespace'>

&lt;!-- =====================================================================
Expand Down Expand Up @@ -378,6 +378,7 @@ reiteration|remaking|republication|coordination)" >
&lt;!ENTITY ## quote "
startQuote #STRING #IMPLIED
endQuote #STRING #IMPLIED
inlineQuote #STRING #IMPLIED
">

<include if="table">
Expand Down Expand Up @@ -637,7 +638,7 @@ reiteration|remaking|republication|coordination)" >
&lt;!ATTLIST documentCollection xxxUnicityConstraintDirtyTrick #STRING #IMPLIED>

&lt;!--- the type collectionBodyType specifies a content model of a container of a list of other documents (e.g, acts, bills, amendments, etc.) possibly interspersed with interstitial elements with content that does not form an individual document -->
&lt;!ENTITY @ collectionBodyType (component+)>
&lt;!ENTITY @ collectionBodyType "(component+)" "##coreopt;">
&lt;!--- the element collectionBody is the container of a list of other documents (e.g, acts, bills, amendments, etc.) possibly interspersed with interstitial elements with content that does not form an individual document -->
&lt;!ELEMENT collectionBody @collectionBodyType; >
</include>
Expand Down Expand Up @@ -1536,7 +1537,7 @@ the break of a word at the end of the line with the attribute breakWith. -->

<include desc="Basic metadata elements for libraries: $publication and $classification"/>

&lt;!--- The element publication is the metadata container specifying a publication event for the FRBR expression of the document. -->
&lt;!--- The element publication is the metadata container specifying an official publication event for the FRBR expression of the document. -->
&lt;!ELEMENT publication @metaopt; >
&lt;!ATTLIST publication ##date; ##show; ##name; ##number; ##refers; >

Expand Down Expand Up @@ -1810,7 +1811,7 @@ the break of a word at the end of the line with the attribute breakWith. -->

&lt;!--- The element notes is a metadata container of all the note elements used as footnotes and endnotes in the document. -->
&lt;!ELEMENT notes (note)+>
&lt;!ATTLIST notes ##source; >
&lt;!ATTLIST notes ##source; ##xmllang; >
&lt;!--- The element note is a metadata element containing the text of the footnote and endnote specified. -->
&lt;!ELEMENT note @subFlowStructure;>

Expand Down
11 changes: 7 additions & 4 deletions schema/akomantoso30.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns="http://docs.oasis-open.org/legaldocml/ns/akn/3.0/WD15"
<xsd:schema xmlns="http://docs.oasis-open.org/legaldocml/ns/akn/3.0/WD16"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://docs.oasis-open.org/legaldocml/ns/akn/3.0/WD15"
targetNamespace="http://docs.oasis-open.org/legaldocml/ns/akn/3.0/WD16"
elementFormDefault="qualified">


Expand All @@ -12,7 +12,7 @@
=====================================================================
Akoma Ntoso main schema

Release 10/09/2015 - Akoma Ntoso 3.0 WD15
Release 17/09/2015 with errata - Akoma Ntoso 3.0 WD16
Complete version.


Expand Down Expand Up @@ -1609,6 +1609,7 @@ The attributes startQuote and endQuote are used in quotedText, quotedStructure,

<xsd:attribute name="startQuote" type="xsd:string"/>
<xsd:attribute name="endQuote" type="xsd:string"/>
<xsd:attribute name="inlineQuote" type="xsd:string"/>
</xsd:attributeGroup>

<xsd:attributeGroup name="cellattrs">
Expand Down Expand Up @@ -2695,6 +2696,7 @@ the type collectionBodyType specifies a content model of a container of a list o
<xsd:sequence>
<xsd:element ref="component" minOccurs="1" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attributeGroup ref="coreopt"/>
</xsd:complexType>

<xsd:element name="collectionBody" type="collectionBodyType">
Expand Down Expand Up @@ -6657,7 +6659,7 @@ The element preservation is the metadata property containing an arbitrary list o
<type>Element</type>
<name>publication</name>
<comment>
The element publication is the metadata container specifying a publication event for the FRBR expression of the document.</comment>
The element publication is the metadata container specifying an official publication event for the FRBR expression of the document.</comment>
</xsd:documentation>
</xsd:annotation>

Expand Down Expand Up @@ -7986,6 +7988,7 @@ The element TLCreference is a generic metadata reference to the Akoma Ntoso IRI
<xsd:element ref="note"/>
</xsd:sequence>
<xsd:attributeGroup ref="source"/>
<xsd:attributeGroup ref="xmllang"/>
</xsd:complexType>
</xsd:element>

Expand Down

0 comments on commit b9271dd

Please sign in to comment.