Skip to content

Commit

Permalink
Updating final version
Browse files Browse the repository at this point in the history
  • Loading branch information
@kohsah
kohsah committed Mar 9, 2019
1 parent 92d426c commit 19e0004
Show file tree
Hide file tree
Showing 5 changed files with 176 additions and 129 deletions.
Binary file modified release_notes/release_notes.odt
View file
Binary file not shown.
51 changes: 28 additions & 23 deletions schema/akomantoso30.dpp
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!-- =====================================================================
Akoma Ntoso main schema

Release 09/11/2016 - Akoma Ntoso 3.0 WD17 with errata (3rd output)
Release 30/03/2017 - Akoma Ntoso 3.0
Complete version.


technical supervision Fabio Vitali - University of Bologna
legal domain supervision Monica Palmirani - University of Bologna

Expand All @@ -16,12 +16,13 @@

TERMS AND CONDITIONS

This schema is provided by OASIS, the Copyright Holder, under the licence
specified in the file licence.txt that can also be found at the URL xxxx

This schema is provided by OASIS, the Copyright Holder, under licence
cc-by 4.0, that can also be found at the URL
https://creativecommons.org/licenses/by/4.0/legalcode

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

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

<!-- =====================================================================
Expand Down Expand Up @@ -190,7 +191,7 @@



<!-- The mappingAtts attributes represent the reference to the permanent wId (attribute original) of a structure, and to the eId (attribute current) such structure had during the time interval included between an initial temporalGroup (attribute start) and a final temporalGroup (attribute end). -->
<!--- The mappingAtts attributes represent the reference to the permanent wId (attribute original) of a structure, and to the eId (attribute current) such structure had during the time interval included between an initial temporalGroup (attribute start) and a final temporalGroup (attribute end). -->
<!ENTITY ## mappingAtts "
original #wIdRef; #IMPLIED
current #eIdRef; #IMPLIED
Expand Down Expand Up @@ -585,7 +586,8 @@ reiteration|remaking|republication|coordination)" >
<!--- the element mainBody is the container of the main part of all other document types -->
<!ELEMENT mainBody @maincontent; >

<!--- Element statement is used for describing the structure and content of a official documents of a legislative assembly that are not normative in structure (e.g., statements, non-normative resolutions, etc.). -->

<!--- Element statement is used for describing the structure and content of an official document of a body that may or may not be normative in structure (e.g., statements, resolutions, etc.). -->
<!ELEMENT statement @openStructure; >
<!ATTLIST statement xxxUnicityConstraintDirtyTrick #STRING #IMPLIED>

Expand Down Expand Up @@ -764,7 +766,7 @@ reiteration|remaking|republication|coordination)" >

<!--- the element citation is the individual element of the preface that is called citation -->
<!ELEMENT citation @itemType; >
<!--- the element longTitle is the section of the preface or preamble that is called long title -->
<!--- the element longTitle is the section of the preface or coverPage that is called long title -->
<!ELEMENT longTitle @blocksreq; >
<!--- the element formula is a section of the preface or preamble that contains a formulaic expression that is systematically or frequently present in a preface or a preamble and has e precise legal meaning (e.g. an enacting formula). Use the refersTo attribute for the specification of the actual type of formula. -->
<!ELEMENT formula @blocksreq; >
Expand Down Expand Up @@ -1021,18 +1023,21 @@ reiteration|remaking|republication|coordination)" >

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

<!--- the blockContainerType is the type of element blockContainer -->
<!ENTITY @ blockContainerType "@basehierarchy;, (intro?, (componentRef | @@blockElements; | crossHeading)+, wrapUp?)" "##corereq;" >
<!--- the element blockContainer is used as a container of many individual block elements in a block context -->
<!ENTITY @ blockContainerType "@basehierarchy;, (intro?, (componentRef | @@blockElements;)+, wrapUp?)" "##corereq;" >
<!ELEMENT blockContainer @blockContainerType; >

<!--- the element blocklist is used as a container of many individual item elements put in a list -->
<!ELEMENT blockList (listIntroduction?, item+, listWrapUp?) >
<!ATTLIST blockList ##corereq; >
<!-- The element item is a container belonging to a list -->

<!--- the blockListType is the type of element blockList -->
<!ENTITY @ blockListType "(listIntroduction?, item+, listWrapUp?)" "##corereq;" >
<!--- the element blockList is used as in a block context as a container of many individual item elements to be treated as in a list -->
<!ELEMENT blockList @blockListType; >
<!--- The element item is a container belonging to a blockList -->
<!ELEMENT item @itemType; >
<!--- the element listIntroduction is an optional element of list before any item of the list itself. -->
<!--- the element listIntroduction is an optional element of blockList before any item of the list itself. -->
<!ELEMENT listIntroduction @inline; >
<!--- the element listWrapUp is an optional element of list after all items of the list itself. -->
<!--- the element listWrapUp is an optional element of blockList after all items of the list itself. -->
<!ELEMENT listWrapUp @inline; >


Expand Down Expand Up @@ -1282,7 +1287,7 @@ the break of a word at the end of the line with the attribute breakWith. -->
<!--- the element embeddedText is an inline element containing a string used as an extract from another document. Attribute quote is used to specify the quote character used in the original; no quote attribute implies that the quote is left in the text; quote="" implies that there is no quote character. -->
<!ELEMENT embeddedText @inline; >
<!ATTLIST embeddedText ##quote; ##linkopt; >
<!--- the element embeddedStructure is a subFlow element containing a full structure used as an extract from another document or position. Attribute quote is used to specify the quote character used in the original; no quote attribute implies that the quote is left in the text; quote="" implies that there is no quote character. Attribute for is used in a mmod or rmod to point to the eId of the corresponding ref element. -->
<!--- the element embeddedStructure is a subFlow element containing a full structure used as an extract from another document or position. Attribute quote is used to specify the quote character used in the original; no quote attribute implies that the quote is left in the text; quote="" implies that there is no quote character. -->
<!ELEMENT embeddedStructure @subFlowStructure;>
<!ATTLIST embeddedStructure ##quote; ##linkopt; >

Expand Down Expand Up @@ -1466,7 +1471,7 @@ the break of a word at the end of the line with the attribute breakWith. -->
<!ENTITY @ booleanValueType "@metaopt;" "##booleanvalue;" >
<!--- The element FRBRthis is the metadata property containing the IRI of the specific component of the document -->
<!ELEMENT FRBRthis @valueType;>
<!--- The element FRBRuri is the metadata property containing the IRI of the whole document in the respective level of the FRBR hierarchy -->
<!--- The element FRBRuri is the metadata property containing the IRI of the whole document. -->
<!ELEMENT FRBRuri @valueType;>
<!--- The element FRBRalias is the metadata property containing additional well-known names of the document in the respective level of the FRBR hierarchy -->
<!ELEMENT FRBRalias @valueType; >
Expand Down Expand Up @@ -1687,23 +1692,23 @@ restrictions?, judicial?, parliamentary?,
<!ELEMENT mappings (mapping)+ >
<!ATTLIST mappings ##source; >

<!-- The element mapping contains a reference to the permanent wId (attribute original) of a structure, and to the eId (attribute current) such structure had during the time interval included between an initial temporalGroup and a final temporalGroup. This is useful for tracking the evolving ids of documents frequently renumbered (e,g., bills). Every single element whose wId does not match its eId needs to be represented here. -->
<!--- The element mapping contains a reference to the permanent wId (attribute original) of a structure, and to the eId (attribute current) such structure had during the time interval included between an initial temporalGroup and a final temporalGroup. This is useful for tracking the evolving ids of documents frequently renumbered (e,g., bills). Every single element whose wId does not match its eId needs to be represented here. -->
<!ELEMENT mapping @metareq; >
<!ATTLIST mapping ##mappingAtts; >

<!--- The element otherReferences is a metadata container of legal references to other documents that for any reason cannot be placed in the body of the document. This is mainly meant for implicit references that are expressed as metadata or for alternative uris of normal references. -->
<!ELEMENT otherReferences (implicitReference | alternativeReference)+ >
<!ATTLIST otherReferences ##source; >

<!-- The element implicitReference contains a legal reference to a document that is not explicitly mentioned in the content of the document. -->
<!--- The element implicitReference contains a legal reference to a document that is not explicitly mentioned in the content of the document. -->
<!ELEMENT implicitReference @anyOtherType; >
<!ATTLIST implicitReference
for #eIdRef; #IMPLIED
##refers;
##showopt;
>

<!-- The element alternativeReference contains an alternative reference (e.g., using a different namespace) for a legal reference. -->
<!--- The element alternativeReference contains an alternative reference (e.g., using a different namespace) for a legal reference. -->
<!ELEMENT alternativeReference @anyOtherType; >
<!ATTLIST alternativeReference
for #eIdRef; #IMPLIED
Expand Down Expand Up @@ -1753,11 +1758,11 @@ restrictions?, judicial?, parliamentary?,
<!ELEMENT temporalData (temporalGroup+) >
<!ATTLIST temporalData ##source; >

<!-- The element temporalGroup contains a list of time Intervals that need to be applied together to an element of the document that is associated to time information. Each temporal group can contain any number of time interval associated via the refersTo to a different time-specific concept. -->
<!--- The element temporalGroup contains a list of time Intervals that need to be applied together to an element of the document that is associated to time information. Each temporal group can contain any number of time interval associated via the refersTo to a different time-specific concept. -->
<!ELEMENT temporalGroup (timeInterval+) >
<!ATTLIST temporalGroup ##core; ##idreq; >

<!-- The element timeInterval contains all the data needed to identify a specific time interval. It is built either with two dates or with a date and a duration (exactly two of the 'start', 'end' and 'duration' attributes can be specified). Values of the 'start' and 'end' attributes are NOT dates, but references to event elements in the corresponding metadata section. The refers attribute is a reference to a temporal concept belonging to the Akoma Ntoso ontology and specified in the references section -->
<!--- The element timeInterval contains all the data needed to identify a specific time interval. It is built either with two dates or with a date and a duration (exactly two of the 'start', 'end' and 'duration' attributes can be specified). Values of the 'start' and 'end' attributes are NOT dates, but references to event elements in the corresponding metadata section. The refers attribute is a reference to a temporal concept belonging to the Akoma Ntoso ontology and specified in the references section -->
<!ELEMENT timeInterval @metaopt; >
<!ATTLIST timeInterval
##interval;
Expand Down
31 changes: 18 additions & 13 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 09/11/2016 - Akoma Ntoso 3.0 WD17 with errata (3rd output)
Release 30/03/2017 - Akoma Ntoso 3.0
Complete version.


Expand All @@ -19,8 +19,9 @@ mentions.

TERMS AND CONDITIONS

This schema is provided by OASIS, the Copyright Holder, under the licence
specified in the file licence.txt that can also be found at the URL xxxx
This schema is provided by OASIS, the Copyright Holder, under licence
cc-by 4.0, that can also be found at the URL
https://creativecommons.org/licenses/by/4.0/legalcode

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

Expand Down Expand Up @@ -184,7 +185,7 @@ Attribute groups



<!-- The mappingAtts attributes represent the reference to the permanent wId (attribute original) of a structure, and to the eId (attribute current) such structure had during the time interval included between an initial temporalGroup (attribute start) and a final temporalGroup (attribute end). -->

<!ENTITY % wIdRef "%ANYURI;" >
<!ENTITY % EwIdRef "(%EANYURI;)" ><!ENTITY % mappingAtts " original %wIdRef; #IMPLIED current %eIdRef; #IMPLIED start %eventRefRef; #IMPLIED end %eventRefRef; #IMPLIED" >

Expand Down Expand Up @@ -511,7 +512,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/WD17"
<!ELEMENT akomaNtoso %akomaNtosoType; ><!ATTLIST akomaNtoso xmlns CDATA #FIXED "http://docs.oasis-open.org/legaldocml/ns/akn/3.0"
xmlns:xml CDATA #FIXED "http://www.w3.org/XML/1998/namespace" >


Expand All @@ -529,6 +530,7 @@ Reference: http://www.xmlpatterns.com/ConsistentElementSetMain.shtml
<!ATTLIST mainBody %coreopt; >



<!ELEMENT statement %openStructure; >
<!ATTLIST statement %name; %contains; >

Expand Down Expand Up @@ -1057,15 +1059,18 @@ main document, the list item and the titled block
===================================================================== -->


<!ENTITY % blockContainerType "(%basehierarchy;,(intro?,(componentRef | %blockElements;)+,wrapUp?))" >
<!ENTITY % blockContainerType "(%basehierarchy;,(intro?,(componentRef | %blockElements; | crossHeading)+,wrapUp?))" >

<!ELEMENT blockContainer %blockContainerType; >
<!ATTLIST blockContainer %corereq; >


<!ELEMENT blockList (listIntroduction?,item+,listWrapUp?)>

<!ENTITY % blockListType "(listIntroduction?,item+,listWrapUp?)" >

<!ELEMENT blockList %blockListType; >
<!ATTLIST blockList %corereq; >
<!-- The element item is a container belonging to a list -->

<!ELEMENT item %itemType; >
<!ATTLIST item %corereq; >

Expand Down Expand Up @@ -1880,7 +1885,7 @@ Metadata elements for all documents

<!ATTLIST mappings %source; >

<!-- The element mapping contains a reference to the permanent wId (attribute original) of a structure, and to the eId (attribute current) such structure had during the time interval included between an initial temporalGroup and a final temporalGroup. This is useful for tracking the evolving ids of documents frequently renumbered (e,g., bills). Every single element whose wId does not match its eId needs to be represented here. -->

<!ELEMENT mapping %metareq; >
<!ATTLIST mapping %core; %idreq; >

Expand All @@ -1891,13 +1896,13 @@ Metadata elements for all documents

<!ATTLIST otherReferences %source; >

<!-- The element implicitReference contains a legal reference to a document that is not explicitly mentioned in the content of the document. -->

<!ELEMENT implicitReference %anyOtherType; >
<!ATTLIST implicitReference %core; %idopt; %linkopt; >

<!ATTLIST implicitReference for %eIdRef; #IMPLIED %refers; %showopt; >

<!-- The element alternativeReference contains an alternative reference (e.g., using a different namespace) for a legal reference. -->

<!ELEMENT alternativeReference %anyOtherType; >
<!ATTLIST alternativeReference %core; %idopt; %linkopt; >

Expand Down Expand Up @@ -1960,12 +1965,12 @@ Metadata elements for all documents

<!ATTLIST temporalData %source; >

<!-- The element temporalGroup contains a list of time Intervals that need to be applied together to an element of the document that is associated to time information. Each temporal group can contain any number of time interval associated via the refersTo to a different time-specific concept. -->

<!ELEMENT temporalGroup (timeInterval+)>

<!ATTLIST temporalGroup %core; %idreq; >

<!-- The element timeInterval contains all the data needed to identify a specific time interval. It is built either with two dates or with a date and a duration (exactly two of the 'start', 'end' and 'duration' attributes can be specified). Values of the 'start' and 'end' attributes are NOT dates, but references to event elements in the corresponding metadata section. The refers attribute is a reference to a temporal concept belonging to the Akoma Ntoso ontology and specified in the references section -->

<!ELEMENT timeInterval %metaopt; >
<!ATTLIST timeInterval %core; %idopt; >

Expand Down

0 comments on commit 19e0004

Please sign in to comment.