From a38bf7ab627341eb8a973d96bf3814adb594a3f2 Mon Sep 17 00:00:00 2001 From: Matt Garrish Date: Fri, 7 May 2021 17:07:46 -0400 Subject: [PATCH 01/12] switch all IRI references to URL --- epub33/core/index.html | 193 ++++++++++++---------- epub33/core/vocab/item-properties.html | 16 +- epub33/core/vocab/itemref-properties.html | 3 +- epub33/core/vocab/link.html | 3 +- epub33/core/vocab/meta-property.html | 8 +- epub33/core/vocab/overlays.html | 4 +- epub33/core/vocab/rendering.html | 4 +- epub33/rs/index.html | 80 ++++++--- 8 files changed, 173 insertions(+), 138 deletions(-) diff --git a/epub33/core/index.html b/epub33/core/index.html index 155c79cfd..0e8e078ab 100644 --- a/epub33/core/index.html +++ b/epub33/core/index.html @@ -1140,8 +1140,8 @@

Introduction

metadata.

  • -

    A manifest — identifies via IRI [[RFC3987]], and - describes via MIME media type [[RFC4839]], the set of Publication Resources.

    +

    A manifest — identifies via URL [[URL]], and describes + via MIME media type [[RFC4839]], the set of Publication Resources.

  • A spine — an ordered sequence of ID references to top-level @@ -1226,7 +1226,8 @@

    Shared Attributes
    href
    -

    An absolute or relative IRI reference [[RFC3987]] to a resource.

    +

    A valid URL string + [[URL]] that references a resource.

    <link rel="record"
       href="meta/9780000000001.xml" 
@@ -1302,8 +1303,10 @@ 
    Shared Attributes
    
 							
 							
    
 								
    Establishes an association between the current expression and the element or resource
-									identified by its value. The value of the attribute must be a relative IRI
-									[[RFC3987]] that references the resource or element being described.
    
+									identified by its value. EPUB Creators MUST use, as the value, a relative-URL-with-fragment string [[URL]] that references the resource or
+									element they are describing.
    
 								
 
 								
    
 							
 
-							
    Each item element identifies a Publication Resource by the IRI
-								[[RFC3987]] in its href attribute. EPUB Creators MAY use absolute or
-								relative IRIs, but they MUST ensure each IRI is unique within the manifest
-								scope after resolution to an absolute IRI [[EPUB-RS-33]].
    
+							
    Each item element identifies a Publication Resource by the URL
+								[[URL]] in its href attribute. EPUB Creators MAY use absolute- or relative-URL string
+								[[URL]], but they MUST ensure each URL is unique within the manifest scope
+								after resolution
+									to an absolute URL [[EPUB-RS-33]].
    
 
 							
    The Publication Resource identified by an item
 								element MUST conform to the applicable specification(s) as inferred from the MIME media
@@ -2750,9 +2751,7 @@ 
    The item Element
    
 
 							
    The Manifest Properties
 									Vocabulary is the default vocabulary for the
-									properties attribute. If any of the attribute's values do not include a
-								prefix, the following IRI [[RFC3987]] stem MUST be used to generate the resulting IRI
-								for them: http://idpf.org/epub/vocab/package/item/#
    
+									properties attribute.
    
 
 							
    EPUB Creators MAY add terms from other vocabularies as defined in .
    
@@ -3182,9 +3181,7 @@ 
    The itemref Element
    
 
 							
    The Spine
 									Properties Vocabulary is the default vocabulary
-								for the properties attribute. If any of the attribute's values do not
-								include a prefix, the following IRI [[RFC3987]] stem MUST be used to generate the
-								resulting IRI for them: http://idpf.org/epub/vocab/package/itemref/#
    
+								for the properties attribute.
    
 
 							
    EPUB Creators MAY add terms from other vocabularies as defined in .
    
@@ -3295,16 +3292,21 @@ 
    The collection Element
    
 							
    Each specialization MUST define a role value that uniquely
 								identifies all conformant collection elements. EPUB Creators MUST identify
 								the role of each collection element in its role attribute,
-								whose value MUST be one or more NMTOKENs [[XMLSCHEMA-2]] and/or absolute IRIs
-								[[RFC3987]].
    
+								whose value MUST be one or more NMTOKENs [[XMLSCHEMA-2]] and/or absolute-URL-with-fragment strings [[URL]].
    
 
 							
    This specification reserves the use of NMTOKEN values for roles defined in EPUB
 								specifications. NMTOKEN values not defined by a recognized specification are not valid.
 								This section does not define any roles.
    
 
 							
    Third parties MAY define custom roles for the collection element, but they
-								MUST identify such roles using absolute IRIs. Custom roles MUST NOT incorporate the
-								string "idpf.org" in the host component of their identifying IRI.
    
+								MUST identify such roles using absolute-URL-with-fragment strings [[URL]]. Custom roles MUST NOT incorporate
+								the string "idpf.org" in the host component [[URL]] of their
+								identifying URL.
    
 
 
 							
    
@@ -4499,8 +4501,8 @@ 
    The nav Element: Restrictions
    
 								rendering of the link label.
  • -

    The IRI reference provided in the href attribute of - the a element:

    +

    The URL [[URL]] reference provided in the href + attribute of the a element:

    diff --git a/epub33/core/vocab/overlays.html b/epub33/core/vocab/overlays.html index 5cf159828..f8dcd0a78 100644 --- a/epub33/core/vocab/overlays.html +++ b/epub33/core/vocab/overlays.html @@ -5,8 +5,8 @@

    Media Overlays Vocabulary

    element's property attribute.

    -

    The base IRI for referencing this vocabulary is - http://www.idpf.org/epub/vocab/overlays/#.

    +

    The base URL [[URL]] for referencing + this vocabulary is http://www.idpf.org/epub/vocab/overlays/#.

    The prefix "media:" is reserved for use with properties in this vocabulary and does not have to be declared in the Package Document.

    diff --git a/epub33/core/vocab/rendering.html b/epub33/core/vocab/rendering.html index cec1c874e..ffeba289a 100644 --- a/epub33/core/vocab/rendering.html +++ b/epub33/core/vocab/rendering.html @@ -10,8 +10,8 @@

    Package Rendering Vocabulary

    System). If a Reading System supports the desired rendering, these properties enable the user to be presented the content as the EPUB Creator optimally designed it.

    -

    The base IRI for referencing these properties is - http://www.idpf.org/vocab/rendition/#.

    +

    The base URL [[URL]] for referencing + these properties is http://www.idpf.org/vocab/rendition/#.

    The "rendition:" prefix is reserved for use with the package rendering properties and does not have to be declared in the diff --git a/epub33/rs/index.html b/epub33/rs/index.html index 19fba9c96..d34a64664 100644 --- a/epub33/rs/index.html +++ b/epub33/rs/index.html @@ -275,16 +275,20 @@

    Package Document Processing

    href="https://www.w3.org/TR/epub-33/#sec-package-doc">Package Document [[EPUB-33]].

    -

    Resolving Relative IRIs

    +

    Resolving Relative URLs

    -

    To obtain an absolute IRI reference from a relative IRI reference [[RFC3987]] in the Package - Document, Reading Systems MUST use the Base IRI [[RFC3986]] of the Package Document.

    +

    To obtain an absolute-URL-with-fragment string [[URL]] from a relative-URL-with-fragment + string [[URL]] in the Package Document, Reading Systems MUST use the base URL [[URL]] of the Package + Document.

    -

    The Base IRI of the Package Document is the combination of the Base IRI of the EPUB Container +

    The base URL of the Package Document is the combination of the base URL of the EPUB Container together with the path to Package Document (relative to the Root Directory) when an EPUB Publication is zipped.

    -

    This specification does not require a specific IRI scheme for referencing the path to the Package +

    This specification does not require a specific URL scheme for referencing the path to the Package Document within the EPUB Container.

    @@ -372,6 +376,10 @@

    Metadata

    Reading Systems SHOULD ignore all meta elements whose property attributes define expressions they do not recognize. A Reading System MUST NOT fail when encountering unknown expressions.

    +

    If the property attribute's value does not include a prefix, Reading Systems + MUST use the following base URL + [[URL]] to generate the resulting URL: + http://idpf.org/epub/vocab/package/meta/#

    @@ -395,6 +403,10 @@

    Metadata

    before, within or after the package metadata elements).

    Reading Systems MUST ignore any instructions contained in linked resources related to the layout and rendering of the EPUB Publication.

    +

    If any of the rel or properties attributes' values do not include a + prefix, Reading Systems MUST use the following base URL [[URL]] to generate + the resulting URL: http://idpf.org/epub/vocab/package/link/#

    Proprietary Metadata
    @@ -409,8 +421,11 @@

    Metadata

    Manifest

    -

    When an href attribute contains a relative IRI, Reading Systems MUST use the IRI of the - Package Document as the base when resolving to an absolute IRI.

    +

    When an href attribute contains a relative-URL string [[URL]], Reading + Systems MUST use the URL of the Package Document as the base URL [[URL]] when resolving to an + absolute-URL string [[URL]].

    Reading Systems MAY optimize the rendering depending on the properties set in the properties attribute (e.g., disable a rendering process or use a fallback). Reading @@ -437,6 +452,10 @@

    Manifest

    Reading Systems MUST terminate the fallback chain at the first reference to a manifest item it has already encountered.

    + +

    If any of the property attribute's values do not include a prefix, Reading Systems MUST + use the following base URL [[URL]] to + generate the resulting URL: http://idpf.org/epub/vocab/package/item/#

    @@ -464,6 +483,10 @@

    Spine

    page-progression-direction attribute defines the flow direction from one fixed-layout page to the next.

    +

    If any of the spine itemref attribute's values do not include a prefix, Reading Systems + MUST use the following base URL [[URL]] + to generate the resulting URL: http://idpf.org/epub/vocab/package/itemref/#

    +

    Reading Systems MUST ignore all metadata properties expressed in spine itemref properties attribute that they do not recognize.

    @@ -1084,21 +1107,24 @@

    Open Container Format Processing

    OCF Abstract Container

    -

    Relative IRIs for Referencing Other Components

    +

    Relative URLs for Referencing Other Components

    -

    For relative IRI references, Reading Systems MUST determine the Base IRI [[RFC3986]] according to - the relevant language specifications for the given file formats. For example, CSS defines how +

    For relative-URL-with-fragment strings [[URL]], Reading Systems MUST determine the base URL [[URL]] according to the + relevant language specifications for the given file formats. For example, CSS defines how relative IRI references work in the context of CSS style sheets and property declarations [[CSSSnapshot]].

    -

    Some language specifications reference Requests For Comments that preceded [[RFC3987]], in - which case the earlier RFC applies for content in that particular language.

    +

    Some language specifications reference Requests + For Comments that preceded [[URL]], in which case the earlier RFC applies for + content in that particular language.

    Unlike most language specifications, Reading Systems MUST use the Root Directory of the - OCF Abstract Container as the default Base IRI as the Base IRI for all files within the - META-INF directory.

    + OCF Abstract Container as the base + URL [[URL]] for all files within the META-INF directory.

    @@ -1334,7 +1360,8 @@
    Rendering EPUB Content Document Elements

    The active-class and playback-active-class metadata properties are OPTIONAL, and if omitted, Reading System behavior is implementation-specific.

    -

    Reading System behavior when a fragment identifier +

    Reading System behavior when a fragment identifier [[EPUB-33]] does not reference an element is also implementation-specific.

    @@ -1591,22 +1618,23 @@

    Vocabulary Association Mechanisms

    The property Data Type
    -

    A Reading System MUST use the following rules to create an IRI [[RFC3987]] from a property:

    +

    A Reading System MUST use the following rules to create a URL [[URL]] from a property:

    • -

      If the property consists only of a reference, obtain the IRI by concatenating the IRI - stem associated with the default vocabulary [[EPUB-33]] to the reference.

      +

      If the property consists only of a reference, obtain the URL by concatenating the base URL [[URL]] associated + with the default + vocabulary [[EPUB-33]] to the reference.

    • -

      If the property consists of a prefix and reference, obtain the IRI by concatenating the - IRI stem associated with the prefix to the reference. If the EPUB Creator has not - defined a matching prefix, the property is invalid and the Reading System MUST ignore - it.

      +

      If the property consists of a prefix and reference, obtain the URL by concatenating the + base URL [[URL]] + associated with the prefix to the reference. If the EPUB Creator has not defined a + matching prefix, the property is invalid and the Reading System MUST ignore it.

    -

    The resulting IRI MUST be valid to [[RFC3987]]. Reading Systems do not have to resolve this IRI, - however.

    +

    The result MUST be valid a valid URL + string [[URL]]. Reading Systems do not have to resolve this IRI, however.

    @@ -2146,7 +2174,7 @@

    Substantive Changes since the EPUB 3.2

    The result MUST be valid a valid URL - string [[URL]]. Reading Systems do not have to resolve this IRI, however.

    + string [[URL]]. Reading Systems do not have to resolve this URL, however.

    From a15d43719a771a3264807dc0f323bb68d36d8296 Mon Sep 17 00:00:00 2001 From: Matt Garrish Date: Sat, 8 May 2021 20:50:59 -0400 Subject: [PATCH 03/12] minor grammar --- epub33/core/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epub33/core/index.html b/epub33/core/index.html index 0e8e078ab..29c3a29cc 100644 --- a/epub33/core/index.html +++ b/epub33/core/index.html @@ -1303,7 +1303,7 @@
    Shared Attributes

    Establishes an association between the current expression and the element or resource - identified by its value. EPUB Creators MUST use, as the value, a relative-URL-with-fragment string [[URL]] that references the resource or element they are describing.

    From 0988d0334fc5a7fb04dbbcfdc40d9ee9ce869cab Mon Sep 17 00:00:00 2001 From: Matt Garrish Date: Tue, 11 May 2021 09:42:08 -0300 Subject: [PATCH 04/12] fix reported typo and simplify/clarify vocabulary base url text --- epub33/core/index.html | 5 +- epub33/core/vocab/item-properties.html | 10 ++- epub33/core/vocab/itemref-properties.html | 6 +- epub33/core/vocab/link.html | 7 +- epub33/core/vocab/meta-property.html | 90 ++++++++++++++--------- epub33/core/vocab/overlays.html | 5 +- epub33/core/vocab/rendering.html | 5 +- epub33/core/vocab/structure.html | 6 ++ epub33/rs/index.html | 4 +- 9 files changed, 88 insertions(+), 50 deletions(-) diff --git a/epub33/core/index.html b/epub33/core/index.html index 29c3a29cc..8f98c67dc 100644 --- a/epub33/core/index.html +++ b/epub33/core/index.html @@ -8197,8 +8197,9 @@
    Default Vocabularies
    href="#sec-property-datatype">property value is expected. EPUB Creators MUST NOT add a prefix to terms and properties from a default vocabulary.

    -

    EPUB Creators MUST NOT assign a prefix to the URLs associated with these vocabularies using the - prefix attribute.

    +

    EPUB Creators MUST NOT assign a prefix to the base URLs [[URL]] associated with + these vocabularies using the prefix attribute.

    Refer to the definition of each attribute that takes a

    Manifest Properties Vocabulary

    +

    The properties in this vocabulary are usable in the manifest item element's properties attribute.

    +

    The Applies to field indicates which Publication Resource type(s) the given property MAY be specified on, the Cardinality field indicates the number of times the property MUST appear within the Package Document scope, and the Usage field indicates usage conditions.

    -

    Properties without a prefix are referenceable using the base URL [[URL]] - http://idpf.org/epub/vocab/package/item/#.

    + +

    The base URL [[URL]] for referencing these properties is + http://idpf.org/epub/vocab/package/item/#.

    +

    cover-image

    diff --git a/epub33/core/vocab/itemref-properties.html b/epub33/core/vocab/itemref-properties.html index abd6c64a9..2ad5c9661 100644 --- a/epub33/core/vocab/itemref-properties.html +++ b/epub33/core/vocab/itemref-properties.html @@ -6,9 +6,9 @@

    Spine Properties Vocabulary

    >itemref element'sproperties attribute.

    -

    Properties are referenceable using the base URL [[URL]] - http://idpf.org/epub/vocab/package/itemref/#.

    +

    The base URL [[URL]] for referencing these properties is + http://idpf.org/epub/vocab/package/itemref/#.

    page-spread-left

    diff --git a/epub33/core/vocab/link.html b/epub33/core/vocab/link.html index b3ed6de8d..becf51b53 100644 --- a/epub33/core/vocab/link.html +++ b/epub33/core/vocab/link.html @@ -6,15 +6,18 @@

    Metadata Link Vocabulary

    >link element's rel and properties attributes.

    -

    Link properties without a prefix are referenceable using the - base URL [[URL]] +

    The + base URL [[URL]] for referencing these properties is http://idpf.org/epub/vocab/package/link/#.

    diff --git a/epub33/core/vocab/meta-property.html b/epub33/core/vocab/meta-property.html index 19716b503..0956a550a 100644 --- a/epub33/core/vocab/meta-property.html +++ b/epub33/core/vocab/meta-property.html @@ -1,20 +1,25 @@

    Meta Properties Vocabulary

    +

    The properties in this vocabulary are usable in the meta element's property attribute.

    +

    Unless indicated otherwise in its "Extends" field, the properties defined in this section are used to define subexpressions: in other words, a meta element carrying a property defined in this section MUST have a refines attribute referencing a resource or expression being augmented.

    +

    In each property definition, the Allowed values field indicates the expected type of value (using [[!XMLSCHEMA-2]] datatypes), the Cardinality field indicates the number of times the property MAY be attached to another property, and the Extends field identifies the properties it MAY be attached to.

    -

    Properties without a prefix are referenceable using the base URL [[URL]] - http://idpf.org/epub/vocab/package/meta/#.

    + +

    The base URL [[URL]] for referencing these properties is + http://idpf.org/epub/vocab/package/meta/#.

    +
    alternate-script
    @@ -86,79 +91,96 @@
    authority

    • one of the following case-insensitive reserved authority values:

      -
      -
      AAT
      +
      + AAT +

      The Getty Art and Architecture Taxonomy.

      - -
      BIC
      +
      + BIC +

      The main UK subject scheme for the book supply chain.

      - -
      BISAC
      +
      + BISAC +

      The main US subject scheme for the book supply chain.

      - -
      CLC
      +
      + CLC +

      The main subject classification scheme used in China.

      - -
      DDC
      +
      + DDC +

      The Dewey Decimal Classification system.

      - -
      CLIL
      +
      + CLIL +

      The main French subject scheme for the book supply chain.

      - -
      EuroVoc
      +
      + EuroVoc +

      The European multilingual thesaurus.

      - -
      MEDTOP
      +
      + MEDTOP +

      IPTC Media Topics classification scheme for the news industry.

      - -
      LCSH
      +
      + LCSH +

      Library of Congress Subject Headings.

      - -
      NDC
      +
      + NDC +

      The main Japanese subject scheme.

      - -
      Thema
      +
      + Thema +
      -

      The international subject scheme for the book supply chain, providing codes that work across many - languages.

      +

      The international subject scheme for the book supply chain, providing + codes that work across many languages.

      - -
      UDC
      +
      + UDC +

      The Universal Decimal Classification system.

      - -
      WGS
      +
      + WGS +

      The main German subject scheme for the book supply chain.

    • -

      an absolute-URL string - [[URL]] that identifies the scheme. The URL SHOULD refer to a resource that provides - more information about the scheme.

      +

      an absolute-URL + string [[URL]] that identifies the scheme. The URL SHOULD refer to a + resource that provides more information about the scheme.

    diff --git a/epub33/core/vocab/overlays.html b/epub33/core/vocab/overlays.html index f8dcd0a78..fc3b55c47 100644 --- a/epub33/core/vocab/overlays.html +++ b/epub33/core/vocab/overlays.html @@ -5,8 +5,9 @@

    Media Overlays Vocabulary

    element'sproperty attribute.

    -

    The base URL [[URL]] for referencing - this vocabulary is http://www.idpf.org/epub/vocab/overlays/#.

    +

    The base URL [[URL]] for referencing these properties is + http://www.idpf.org/epub/vocab/overlays/#.

    The prefix "media:" is reserved for use with properties in this vocabulary and does not have to be declared in the Package Document.

    diff --git a/epub33/core/vocab/rendering.html b/epub33/core/vocab/rendering.html index ffeba289a..e6d879ce7 100644 --- a/epub33/core/vocab/rendering.html +++ b/epub33/core/vocab/rendering.html @@ -10,8 +10,9 @@

    Package Rendering Vocabulary

    System). If a Reading System supports the desired rendering, these properties enable the user to be presented the content as the EPUB Creator optimally designed it.

    -

    The base URL [[URL]] for referencing - these properties is http://www.idpf.org/vocab/rendition/#.

    +

    The base URL [[URL]] for referencing these properties is + http://www.idpf.org/vocab/rendition/#.

    The "rendition:" prefix is reserved for use with the package rendering properties and does not have to be declared in the diff --git a/epub33/core/vocab/structure.html b/epub33/core/vocab/structure.html index d2e1f4afe..32eabc76b 100644 --- a/epub33/core/vocab/structure.html +++ b/epub33/core/vocab/structure.html @@ -1,20 +1,26 @@

    Structural Semantics Vocabulary

    +

    About this Vocabulary

    +

    While the EPUB Structural Semantics vocabulary is generally host language agnostic, it has been constructed primarily to enable semantic inflection of elements in the HTML vocabulary.

    +

    The HTML usage context fields indicate contexts in HTML documents where the given property is considered relevant. EPUB Creators may use the properties on HTML markup elements not specifically listed, but must ensure that the semantics they express represent a subset of the carrying element's semantics and do not attach an existing element's meaning to a semantically neutral element.

    +

    The DPUB-ARIA role fields indicate the [[DPUB-ARIA-1.0]] roles that can alternatively be used with the [[HTML]] role attribute to improve accessibility. These roles may have more restrictive usage contexts, however, so may not be valid wherever the epub:type attribute is used. Refer to [[HTML-ARIA]] for more information about where the roles are allowed.

    +

    When processing HTML documents, Reading Systems may ignore such non-compliant properties, unless their usage context is explicitly overridden or extended by the host specification.

    +

    The Usage Details sections identify IDPF specifications that define or utilize the specified properties.

    diff --git a/epub33/rs/index.html b/epub33/rs/index.html index 769968aef..1135b9833 100644 --- a/epub33/rs/index.html +++ b/epub33/rs/index.html @@ -1633,8 +1633,8 @@

    Vocabulary Association Mechanisms

    matching prefix, the property is invalid and the Reading System MUST ignore it.

    -

    The result MUST be valid a valid URL - string [[URL]]. Reading Systems do not have to resolve this URL, however.

    +

    The result MUST be a valid URL string + [[URL]]. Reading Systems do not have to resolve this URL, however.

    From 0373fe86b24ad3482aba4fb98c1f8e020fe05103 Mon Sep 17 00:00:00 2001 From: Matt Garrish Date: Wed, 12 May 2021 07:23:23 -0300 Subject: [PATCH 05/12] rewording per rdeltour's feedback --- epub33/core/index.html | 43 ++++++++++++++++-------------- epub33/rs/index.html | 59 ++++++++++++++++++++++++------------------ 2 files changed, 58 insertions(+), 44 deletions(-) diff --git a/epub33/core/index.html b/epub33/core/index.html index 8f98c67dc..62c4b3e6f 100644 --- a/epub33/core/index.html +++ b/epub33/core/index.html @@ -5369,11 +5369,11 @@

    Relative URLs for Referencing Other Components

    -

    For relative-URL-with-fragment strings [[URL]], the base URL [[URL]] is determined by - the relevant language specifications for the given file formats. For example, CSS defines how - relative URL references work in the context of CSS style sheets and property declarations +

    The relevant language specification for a given file format determines the base URL [[URL]] used to parse relative-URL-with-fragment strings [[URL]]. For example, CSS defines how relative URL + references work in the context of CSS style sheets and property declarations [[CSSSnapshot]].

    @@ -5402,8 +5402,10 @@

    Relative URLs for Referencing Other Components

    OCF Abstract Container and not relative to the META-INF directory.

    All relative-URL-with-fragment strings [[URL]] references MUST resolve to resources within - the OCF Abstract Container (i.e., at or below the Root Directory).

    + >relative-URL-with-fragment strings [[URL]] MUST identify resources within the OCF + Abstract Container (i.e., at or below the Root Directory) after parsing to URL records + [[URL]].

    @@ -6752,10 +6754,11 @@
    The body Element
    [optional]
    -

    The relative-URL-with-fragment string [[URL]] of the corresponding EPUB - Content Document, which MUST have a fragment identifier that references the specific content.

    +

    Identifies an associated fragment of an EPUB Content Document.

    +

    The value MUST be a relative-URL-with-fragment string [[URL]] with a non-null fragment identifier.

    @@ -6830,10 +6833,11 @@
    The seq Element
    [required]
    -

    The relative-URL-with-fragment string [[URL]] of the corresponding EPUB - Content Document, which MUST have a fragment identifier that references the specific content.

    +

    Identifies an associated fragment of an EPUB Content Document.

    +

    The value MUST be a relative-URL-with-fragment string [[URL]] with a non-null fragment identifier.

    Refer to for more information.

    @@ -6963,10 +6967,11 @@
    The text Element
    [required]
    -

    The relative-URL-with-fragment string [[URL]] of the corresponding EPUB - Content Document, which MUST have a fragment identifier that references the specific content.

    +

    Identifies the associated fragment of an EPUB Content Document.

    +

    The value MUST be a relative-URL-with-fragment string [[URL]] with a non-null fragment identifier.

    id diff --git a/epub33/rs/index.html b/epub33/rs/index.html index 1135b9833..ae8904161 100644 --- a/epub33/rs/index.html +++ b/epub33/rs/index.html @@ -377,9 +377,10 @@

    Metadata

    attributes define expressions they do not recognize. A Reading System MUST NOT fail when encountering unknown expressions.

    If the property attribute's value does not include a prefix, Reading Systems - MUST use the following base URL - [[URL]] to generate the resulting URL: - http://idpf.org/epub/vocab/package/meta/#

    + MUST parse the value to a URL using the base URL [[URL]] + "http://idpf.org/epub/vocab/package/meta/#".

    @@ -404,9 +405,10 @@

    Metadata

    Reading Systems MUST ignore any instructions contained in linked resources related to the layout and rendering of the EPUB Publication.

    If any of the rel or properties attributes' values do not include a - prefix, Reading Systems MUST use the following base URL [[URL]] to generate - the resulting URL: http://idpf.org/epub/vocab/package/link/#

    + prefix, Reading Systems MUST parse the unprefixed values to URLs using the base URL + [[URL]] "http://idpf.org/epub/vocab/package/link/#".

    Proprietary Metadata
    @@ -422,10 +424,11 @@

    Metadata

    Manifest

    When an href attribute contains a relative-URL string [[URL]], Reading - Systems MUST use the URL of the Package Document as the base URL [[URL]] when resolving to an - absolute-URL string [[URL]].

    + href="https://url.spec.whatwg.org/#relative-url-string">relative-URL string, Reading Systems + MUST use the URL of the Package Document as the base URL when parsing to a URL record [[URL]].

    Reading Systems MAY optimize the rendering depending on the properties set in the properties attribute (e.g., disable a rendering process or use a fallback). Reading @@ -453,9 +456,11 @@

    Manifest

    Reading Systems MUST terminate the fallback chain at the first reference to a manifest item it has already encountered.

    -

    If any of the property attribute's values do not include a prefix, Reading Systems MUST - use the following base URL [[URL]] to - generate the resulting URL: http://idpf.org/epub/vocab/package/item/#

    +

    If any of the properties attribute's values do not include a prefix, Reading Systems + MUST parse the unprefix values to URLs using the base URL [[URL]] + "http://idpf.org/epub/vocab/package/item/#".

    @@ -483,9 +488,11 @@

    Spine

    page-progression-direction attribute defines the flow direction from one fixed-layout page to the next.

    -

    If any of the spine itemref attribute's values do not include a prefix, Reading Systems - MUST use the following base URL [[URL]] - to generate the resulting URL: http://idpf.org/epub/vocab/package/itemref/#

    +

    If any of the properties attribute's values do not include a prefix, Reading Systems + MUST parse the unprefixes values to URLs using the base URL [[URL]] + "http://idpf.org/epub/vocab/package/itemref/#".

    Reading Systems MUST ignore all metadata properties expressed in spine itemref properties attribute that they do not recognize.

    @@ -1618,23 +1625,25 @@

    Vocabulary Association Mechanisms

    The property Data Type
    -

    A Reading System MUST use the following rules to create a URL [[URL]] from a property:

    +

    A Reading System MUST use the following rules to create a URL [[URL]] from a property:

    • -

      If the property consists only of a reference, obtain the URL by concatenating the base URL [[URL]] associated - with the default - vocabulary [[EPUB-33]] to the reference.

      +

      If the property consists only of a reference, obtain the URL by concatenating the base + URL associated with the default vocabulary [[EPUB-33]] to the reference.

    • If the property consists of a prefix and reference, obtain the URL by concatenating the - base URL [[URL]] - associated with the prefix to the reference. If the EPUB Creator has not defined a - matching prefix, the property is invalid and the Reading System MUST ignore it.

      + base URL associated with the prefix to the reference. If the EPUB Creator has not + defined a matching prefix, the property is invalid and the Reading System MUST ignore + it.

    The result MUST be a valid URL string - [[URL]]. Reading Systems do not have to resolve this URL, however.

    + [[URL]]. Reading Systems do not have to parse this URL [[URL]] or attempt + to retrieve the referenced resource, however.

    From 401bfd109efd6d41f7ea61c08e02e40ffbd0e2da Mon Sep 17 00:00:00 2001 From: Matt Garrish Date: Wed, 12 May 2021 12:07:11 -0300 Subject: [PATCH 06/12] remove reliance on url standard for defining property data type expansions --- epub33/core/index.html | 9 ++-- epub33/core/vocab/item-properties.html | 3 +- epub33/core/vocab/itemref-properties.html | 3 +- epub33/core/vocab/link.html | 4 +- epub33/core/vocab/meta-property.html | 3 +- epub33/core/vocab/overlays.html | 3 +- epub33/core/vocab/rendering.html | 3 +- epub33/multi-rend/index.html | 2 +- epub33/rs/index.html | 60 ++++++++++------------- 9 files changed, 37 insertions(+), 53 deletions(-) diff --git a/epub33/core/index.html b/epub33/core/index.html index 62c4b3e6f..c2ca7593b 100644 --- a/epub33/core/index.html +++ b/epub33/core/index.html @@ -4322,7 +4322,7 @@

    Pronunciation Lexicons

    PLS Documents MUST be valid to the RELAX NG schema available at - the URI https://www.w3.org/TR/2008/REC-pronunciation-lexicon-20081014/pls.rng [[PRONUNCIATION-LEXICON]].

    @@ -8187,7 +8187,7 @@

    The property Data Type

    http://idpf.org/epub/vocab/package/item/#mathml
    -

    when the URL for the vocabulary is concatenated with the reference.

    +

    when the prefix URL for the vocabulary is concatenated with the reference.

    An empty string does not represent a valid property value, even though it is valid to @@ -8202,9 +8202,8 @@

    Default Vocabularies
    href="#sec-property-datatype">property value is expected. EPUB Creators MUST NOT add a prefix to terms and properties from a default vocabulary.

    -

    EPUB Creators MUST NOT assign a prefix to the base URLs [[URL]] associated with - these vocabularies using the prefix attribute.

    +

    EPUB Creators MUST NOT assign a prefix to the URLs associated with these vocabularies using the + prefix attribute.

    Refer to the definition of each attribute that takes a Manifest Properties Vocabulary appear within the Package Document scope, and the Usage field indicates usage conditions.

    -

    The base URL [[URL]] for referencing these properties is +

    The prefix URL for referencing these properties is http://idpf.org/epub/vocab/package/item/#.

    diff --git a/epub33/core/vocab/itemref-properties.html b/epub33/core/vocab/itemref-properties.html index 2ad5c9661..5054beac8 100644 --- a/epub33/core/vocab/itemref-properties.html +++ b/epub33/core/vocab/itemref-properties.html @@ -6,8 +6,7 @@

    Spine Properties Vocabulary

    >itemref element's properties attribute.

    -

    The base URL [[URL]] for referencing these properties is +

    The prefix URL for referencing these properties is http://idpf.org/epub/vocab/package/itemref/#.

    diff --git a/epub33/core/vocab/link.html b/epub33/core/vocab/link.html index becf51b53..e90ce144b 100644 --- a/epub33/core/vocab/link.html +++ b/epub33/core/vocab/link.html @@ -6,9 +6,7 @@

    Metadata Link Vocabulary

    >link element's rel and properties attributes.

    -

    The - base URL [[URL]] for referencing these properties is +

    The prefix URL for referencing these properties is http://idpf.org/epub/vocab/package/link/#.