lib/asciidoctor/gb/biblio.rng in asciidoctor-gb-0.3.1 vs lib/asciidoctor/gb/biblio.rng in asciidoctor-gb-0.3.2
- old
+ new
@@ -35,11 +35,11 @@
</element>
</define>
<define name="edition">
<a:documentation>ISO-15924: Latn</a:documentation>
<element name="edition">
- <data type="int"/>
+ <text/>
</element>
</define>
<define name="LocalizedString">
<optional>
<!-- multiple languages and scripts possible: comma delimit them if so -->
@@ -100,13 +100,16 @@
<element name="role">
<optional>
<attribute name="type">
<choice>
<value>author</value>
- <value>edition</value>
+ <value>performer</value>
<value>publisher</value>
- <text/>
+ <value>editor</value>
+ <value>adapter</value>
+ <value>translator</value>
+ <value>distributor</value>
</choice>
</attribute>
</optional>
<zeroOrMore>
<ref name="roledescription"/>
@@ -143,23 +146,31 @@
</optional>
</element>
</define>
<define name="fullname">
<element name="name">
+ <choice>
+ <group>
+ <zeroOrMore>
+ <ref name="prefix"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="forename"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="initial"/>
+ </zeroOrMore>
+ <ref name="surname"/>
+ <zeroOrMore>
+ <ref name="addition"/>
+ </zeroOrMore>
+ </group>
+ <ref name="completeName"/>
+ </choice>
<zeroOrMore>
- <ref name="prefix"/>
+ <ref name="biblionote"/>
</zeroOrMore>
- <zeroOrMore>
- <ref name="forename"/>
- </zeroOrMore>
- <zeroOrMore>
- <ref name="initial"/>
- </zeroOrMore>
- <ref name="surname"/>
- <zeroOrMore>
- <ref name="addition"/>
- </zeroOrMore>
</element>
</define>
<define name="prefix">
<element name="prefix">
<ref name="LocalizedString"/>
@@ -183,10 +194,15 @@
<define name="forename">
<element name="forename">
<ref name="LocalizedString"/>
</element>
</define>
+ <define name="completeName">
+ <element name="completename">
+ <ref name="LocalizedString"/>
+ </element>
+ </define>
<define name="affiliation">
<element name="affiliation">
<optional>
<ref name="affiliationname"/>
</optional>
@@ -208,10 +224,13 @@
</define>
<define name="organization">
<element name="organization">
<ref name="orgname"/>
<optional>
+ <ref name="subdivision"/>
+ </optional>
+ <optional>
<ref name="abbreviation"/>
</optional>
<optional>
<ref name="uri"/>
</optional>
@@ -226,10 +245,15 @@
<define name="orgname">
<element name="name">
<ref name="LocalizedString"/>
</element>
</define>
+ <define name="subdivision">
+ <element name="subdivision">
+ <ref name="LocalizedString"/>
+ </element>
+ </define>
<define name="abbreviation">
<element name="abbreviation">
<ref name="LocalizedString"/>
</element>
</define>
@@ -344,23 +368,25 @@
</choice>
</element>
</define>
<define name="locality">
<element name="locality">
- <!-- attribute type { ( "section" | "clause" | "part" | "paragraph" | "chapter" | "page" | "whole" | "table" | "annex" | "figure" | "note" | "example" | ("locality:", text) ) }, -->
- <attribute name="type">
- <ref name="LocalityType"/>
- </attribute>
- <ref name="referenceFrom"/>
- <optional>
- <ref name="referenceTo"/>
- </optional>
+ <ref name="BibItemLocality"/>
</element>
</define>
+ <define name="BibItemLocality">
+ <attribute name="type">
+ <ref name="LocalityType"/>
+ </attribute>
+ <ref name="referenceFrom"/>
+ <optional>
+ <ref name="referenceTo"/>
+ </optional>
+ </define>
<define name="LocalityType">
<data type="string">
- <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|example|locality:[a-zA-Z0-9_]+</param>
+ <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|example|volume|issue|locality:[a-zA-Z0-9_]+</param>
</data>
</define>
<define name="referenceFrom">
<element name="referenceFrom">
<text/>
@@ -396,10 +422,22 @@
<value>presentation</value>
<value>thesis</value>
<value>techreport</value>
<value>standard</value>
<value>unpublished</value>
+ <value>map</value>
+ <value>electronic resource</value>
+ <value>audiovisual</value>
+ <value>film</value>
+ <value>video</value>
+ <value>broadcast</value>
+ <value>graphic work</value>
+ <value>music</value>
+ <value>patent</value>
+ <value>inbook</value>
+ <value>incollection</value>
+ <value>inproceedings</value>
</choice>
</define>
<define name="BibliographicItem">
<optional>
<attribute name="type">
@@ -440,24 +478,45 @@
<ref name="abstract"/>
</optional>
<optional>
<ref name="status"/>
</optional>
- <zeroOrMore>
+ <optional>
<ref name="copyright"/>
- </zeroOrMore>
+ </optional>
<zeroOrMore>
<ref name="docrelation"/>
</zeroOrMore>
+ <zeroOrMore>
+ <ref name="series"/>
+ </zeroOrMore>
+ <optional>
+ <ref name="medium"/>
+ </optional>
+ <zeroOrMore>
+ <ref name="bplace"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="extent"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="accesslocation"/>
+ </zeroOrMore>
+ <optional>
+ <ref name="bclassification"/>
+ </optional>
+ <optional>
+ <ref name="validity"/>
+ </optional>
</define>
<define name="btitle">
<element name="title">
- <ref name="FormattedString"/>
+ <ref name="TypedTitleString"/>
</element>
</define>
<define name="bsource">
- <element name="source">
+ <element name="link">
<ref name="TypedUri"/>
</element>
</define>
<define name="formattedref">
<element name="formattedref">
@@ -467,16 +526,72 @@
<define name="link">
<element name="link">
<ref name="TypedUri"/>
</element>
</define>
+ <define name="validity">
+ <element name="validity">
+ <optional>
+ <ref name="validityBegins"/>
+ </optional>
+ <optional>
+ <ref name="validityEnds"/>
+ </optional>
+ <optional>
+ <ref name="validityRevision"/>
+ </optional>
+ </element>
+ </define>
+ <define name="validityBegins">
+ <element name="validityBegins">
+ <data type="dateTime"/>
+ </element>
+ </define>
+ <define name="validityEnds">
+ <element name="validityEnds">
+ <data type="dateTime"/>
+ </element>
+ </define>
+ <define name="validityRevision">
+ <element name="revision">
+ <data type="dateTime"/>
+ </element>
+ </define>
+ <define name="TypedTitleString">
+ <optional>
+ <attribute name="type">
+ <ref name="TitleType"/>
+ </attribute>
+ </optional>
+ <ref name="FormattedString"/>
+ </define>
+ <define name="TitleType">
+ <choice>
+ <value>alternative</value>
+ <value>original</value>
+ <value>unofficial</value>
+ <value>subtitle</value>
+ <value>main</value>
+ </choice>
+ </define>
<define name="TypedUri">
<optional>
<attribute name="type"/>
</optional>
<data type="anyURI"/>
</define>
+ <define name="DateType">
+ <optional>
+ <attribute name="text"/>
+ </optional>
+ <optional>
+ <choice>
+ <data type="gYear"/>
+ <data type="date"/>
+ </choice>
+ </optional>
+ </define>
<define name="bdate">
<element name="date">
<attribute name="type">
<choice>
<value>published</value>
@@ -485,13 +600,14 @@
<value>implemented</value>
<value>obsoleted</value>
<value>confirmed</value>
<value>updated</value>
<value>issued</value>
+ <value>transmitted</value>
+ <value>copied</value>
</choice>
</attribute>
- <!-- ( ( bfrom, bto? ) | date_on ) -->
<choice>
<group>
<element name="from">
<choice>
<data type="gYear"/>
@@ -514,42 +630,133 @@
</choice>
</element>
</choice>
</element>
</define>
- <define name="bfrom">
- <element name="from">
+ <define name="docidentifier">
+ <element name="docidentifier">
+ <optional>
+ <attribute name="type"/>
+ </optional>
+ <text/>
+ </element>
+ </define>
+ <define name="bclassification">
+ <element name="classification">
+ <optional>
+ <attribute name="type"/>
+ </optional>
+ <text/>
+ </element>
+ </define>
+ <define name="bplace">
+ <element name="place">
+ <text/>
+ </element>
+ </define>
+ <define name="medium">
+ <element name="medium">
+ <optional>
+ <ref name="form"/>
+ </optional>
+ <optional>
+ <ref name="size"/>
+ </optional>
+ <optional>
+ <ref name="scale"/>
+ </optional>
+ </element>
+ </define>
+ <define name="form">
+ <element name="form">
+ <text/>
+ </element>
+ </define>
+ <define name="size">
+ <element name="size">
+ <text/>
+ </element>
+ </define>
+ <define name="scale">
+ <element name="scale">
+ <text/>
+ </element>
+ </define>
+ <define name="accesslocation">
+ <element name="accesslocation">
+ <text/>
+ </element>
+ </define>
+ <define name="extent">
+ <element name="extent">
+ <ref name="BibItemLocality"/>
+ </element>
+ </define>
+ <define name="series">
+ <element name="series">
+ <optional>
+ <attribute name="type">
+ <choice>
+ <value>main</value>
+ <value>alt</value>
+ </choice>
+ </attribute>
+ </optional>
<choice>
- <data type="gYear"/>
- <data type="date"/>
+ <ref name="btitle"/>
+ <ref name="formattedref"/>
</choice>
+ <ref name="bplace"/>
+ <ref name="seriesorganization"/>
+ <optional>
+ <ref name="abbreviation"/>
+ </optional>
+ <optional>
+ <ref name="seriesfrom"/>
+ </optional>
+ <optional>
+ <ref name="seriesto"/>
+ </optional>
+ <optional>
+ <ref name="seriesnumber"/>
+ </optional>
+ <optional>
+ <ref name="seriespartnumber"/>
+ </optional>
</element>
</define>
- <define name="bto">
- <element name="to">
+ <define name="seriesorganization">
+ <element name="organization">
+ <text/>
+ </element>
+ </define>
+ <define name="seriesfrom">
+ <element name="from">
<choice>
+ <data type="dateTime"/>
<data type="gYear"/>
- <data type="date"/>
</choice>
</element>
</define>
- <define name="date_on">
- <element name="on">
+ <define name="seriesto">
+ <element name="to">
<choice>
+ <data type="dateTime"/>
<data type="gYear"/>
- <data type="date"/>
</choice>
</element>
</define>
- <define name="docidentifier">
- <element name="docidentifier">
- <optional>
- <attribute name="type"/>
- </optional>
+ <define name="seriesnumber">
+ <element name="number">
<text/>
</element>
</define>
+ <define name="seriespartnumber">
+ <element name="partnumber">
+ <text/>
+ </element>
+ </define>
<define name="biblionote">
<element name="note">
<ref name="FormattedString"/>
</element>
</define>
@@ -584,20 +791,21 @@
</define>
<define name="docrelation">
<element name="relation">
<attribute name="type">
<choice>
- <value>parent</value>
- <value>child</value>
<value>obsoletes</value>
<value>updates</value>
<value>updatedBy</value>
<value>complements</value>
<value>derivedFrom</value>
+ <value>translatedFrom</value>
<value>adoptedFrom</value>
<value>equivalent</value>
<value>identical</value>
<value>nonequivalent</value>
+ <value>includedIn</value>
+ <value>includes</value>
</choice>
</attribute>
<element name="bibitem">
<ref name="BibliographicItem"/>
</element>