Merge branch 'master' into 0033-fix-layer-comment

Author: triplingual

README.md

@@ -35,7 +35,7 @@ The fields are as follows:
  * `tags` this is used in the recipe listing page and is currently uncontrolled and optional. It is shown on the [full list of recipes](https://iiif.io/api/cookbook/recipe/all/)
  * `summary` a short summary of the recipe. It is shown on the [full list of recipes](https://iiif.io/api/cookbook/recipe/all/)
  * `viewers` see further details below but this drives the Viewer Matrix
- * `topic` a controlled list of headings that are used on the viewer matrix. Allowed values are **basic, property, structure, image, AV, annotation or geo-recipes**. A recipe may have multiple topics and these would be expressed as a list for example:
+ * `topic` a controlled list of headings that are used on the viewer matrix. Allowed values are **basic, property, note, structure, annotation, image, AV, realWorldObject, geo-recipes, content-state**. (The current set of topics at any time are in the [`topics.yml`](_data/topics.yml) file.) A recipe may have multiple topics and these would be expressed as a list for example:
 ```
 topic: 
  - basic
@@ -81,12 +81,12 @@ but we would welcome other viewers. To see the requirements for adding other vie
 This provides a standard link to the JSON and also to viewers. A full example is as follows:
 
 ```
-{% include manifest_links.html viewers="UV, Mirador, Tify, Curation" manifest="manifest.json" %}
+{% include manifest_links.html viewers="UV, Mirador, TIFY, Curation" manifest="manifest.json" %}
 ```
 
 and this would produce the following line:
 
-[JSON-LD]() | [View in Universal Viewer]() | [View in Mirador]() | [View in Tify]() | [View in IIIF Curation Viewer]()
+[JSON-LD]() | [View in Universal Viewer]() | [View in Mirador]() | [View in TIFY]() | [View in IIIF Curation Viewer]()
 
 The `manifest` parameter allows you to pass a relative link to the manifest and the `viewers` parameter is a list of Viewer links to show. For the Viewers property you have the following options:
 

_includes/links.md

@@ -10,15 +10,12 @@
 [0009]: {{ site.cookbook_url | absolute_url }}/recipe/0009-book-1/ "Simple Manifest - Book"
 [0010]: {{ site.cookbook_url | absolute_url }}/recipe/0010-book-2-viewing-direction "Viewing direction and its effect on navigation"
 [0011]: {{ site.cookbook_url | absolute_url }}/recipe/0011-book-3-behavior/ "Book behavior (paging) variations"
-[0299]: {{ site.cookbook_url | absolute_url }}/recipe/0299-region/ "Addressing a spatial region"
 [0013]: {{ site.cookbook_url | absolute_url }}/recipe/0013-placeholderCanvas/ "Load a Preview Image Before the Main Content"
 [0202]: {{ site.cookbook_url | absolute_url }}/recipe/0202-start-canvas/ "Load Manifest Beginning with a Specific Canvas"
 [0014]: {{ site.cookbook_url | absolute_url }}/recipe/0014-accompanyingcanvas/ "Audio Presentation with Accompanying Image"
 [0015]: {{ site.cookbook_url | absolute_url }}/recipe/0015-start/ "Begin playback at a specific point - Time-based media"
 [0017]: {{ site.cookbook_url | absolute_url }}/recipe/0017-transcription-av/ "Providing Access to Transcript Files of A/V Content"
 
-[0139]: {{ site.cookbook_url | absolute_url }}/recipe/0139-geolocate-canvas-fragment/ "Represent Canvas Fragment as a Geographic Area on a Web Map"
-
 [0019]: {{ site.cookbook_url | absolute_url }}/recipe/0019-html-in-annotations/ "HTML in Annotations"
 [0021]: {{ site.cookbook_url | absolute_url }}/recipe/0021-tagging/ "Simple Annotation — Tagging"
 [0022]: {{ site.cookbook_url | absolute_url }}/recipe/0022-linking-with-a-hotspot/ "Redirecting from one Canvas to another resource (Hotspot linking)"
@@ -28,15 +25,18 @@
 [0035]: {{site.baseurl}}/recipe/0035-foldouts/ "Foldouts, Flaps, and Maps"
 [0036]: {{site.baseurl}}/recipe/0036-composition-from-multiple-images/ "Composition from Multiple Images"
 [0026]: {{ site.cookbook_url | absolute_url }}/recipe/0026-toc-opera/ "Table of Contents for A/V Content"
+[0027]: {{ site.cookbook_url | absolute_url }}/recipe/0027-alternative-page-order/ "Alternative Page Sequences"
 [0029]: {{ site.cookbook_url | absolute_url }}/recipe/0029-metadata-anywhere/ "Metadata on any Resource"
 [0030]: {{ site.cookbook_url | absolute_url }}/recipe/0030-multi-volume/ "Multi-volume Work with Individually-bound Volumes"
 [0031]: {{ site.cookbook_url | absolute_url }}/recipe/0031-bound-multivolume/ "Multiple Volumes in a Single Bound Volume"
 
 [0040]: {{ site.cookbook_url | absolute_url }}/recipe/0040-image-rotation-service/ "Image Rotation Two Ways"
+[0045]: {{ site.cookbook_url | absolute_url }}/recipe/0045-css/ "CSS in an Annotation"
 
 [0047]: {{ site.cookbook_url | absolute_url }}/recipe/0047-homepage/ "Linking to Web Page of an Object"
-[0053]: {{ site.cookbook_url | absolute_url }}/recipe/0053-seeAlso/ "Linking to Structured Metadata"
 [0046]: {{ site.cookbook_url | absolute_url }}/recipe/0046-rendering/ "Providing Alternative Representations"
+[0053]: {{ site.cookbook_url | absolute_url }}/recipe/0053-seeAlso/ "Linking to Structured Metadata"
+[0057]: {{ site.cookbook_url | absolute_url }}/recipe/0057-publishing-v2-and-v3/ "Making IIIF Presentation API v2 and v3 manifests available at the same URL"
 [0064]: {{ site.cookbook_url | absolute_url }}/recipe/0064-opera-one-canvas/ "Table of Contents for Multiple A/V Files on a Single Canvas"
 [0065]: {{ site.cookbook_url | absolute_url }}/recipe/0065-opera-multiple-canvases/ "Table of Contents for Multiple A/V Files on Multiple Canvases"
 
@@ -48,7 +48,7 @@
 [0118]: {{ site.cookbook_url | absolute_url }}/recipe/0118-multivalue/ "Displaying Multiple Values with Language Maps"
 
 [0135]: {{ site.cookbook_url | absolute_url }}/recipe/0135-annotating-point-in-canvas/ "Annotating a specific point of an image"
-
+[0139]: {{ site.cookbook_url | absolute_url }}/recipe/0139-geolocate-canvas-fragment/ "Represent Canvas Fragment as a Geographic Area on a Web Map"
 [0154]: {{ site.cookbook_url | absolute_url }}/recipe/0154-geo-extension/ "Locate a Manifest on a Web Map"
 
 [0232]: {{ site.cookbook_url | absolute_url }}/recipe/0232-image-thumbnail-canvas/ "Implementation discussion: Thumbnails on Canvases"
@@ -65,6 +65,7 @@
 [0266]: {{ site.cookbook_url | absolute_url }}/recipe/0266-full-canvas-annotation/ "Simplest Annotation"
 [0269]: {{ site.cookbook_url | absolute_url }}/recipe/0269-embedded-or-referenced-annotations/ "Embedded or Referenced Annotations"
 [0283]: {{ site.cookbook_url | absolute_url }}/recipe/0283-missing-image/ "Missing Images in a Sequence"
+[0299]: {{ site.cookbook_url | absolute_url }}/recipe/0299-region/ "Addressing a spatial region"
 
 [0306]: {{ site.cookbook_url | absolute_url }}/recipe/0306-linking-annotations-to-manifests/ "Linking external Annotations targeting a Canvas to a Manifest"
 [0309]: {{ site.cookbook_url | absolute_url }}/recipe/0309-annotation-collection/ "Using Annotation Collections"
@@ -74,14 +75,16 @@
 [0346]: {{ site.cookbook_url | absolute_url }}/recipe/0346-multilingual-annotation-body/ "Annotating in Multiple Languages"
 [0377]: {{ site.cookbook_url | absolute_url }}/recipe/0377-image-in-annotation/ "Image in annotation"
 
+[0464]: {{ site.cookbook_url | absolute_url }}/recipe/0464-reuse-manifest/ "Reuse parts of a Manifest"
 [0466]: {{ site.cookbook_url | absolute_url }}/recipe/0466-link-for-loading-manifest/ "Loading a manifest with a viewer using a link"
-
 [0485]: {{ site.cookbook_url | absolute_url }}/recipe/0485-contentstate-canvas-region/ "Open a specific region of a canvas in a viewer"
-
 [0434]: {{ site.cookbook_url | absolute_url }}/recipe/0434-choice-av/ "Multiple Choice of Audio Formats in a Single View (Canvas)"
 [0489]: {{ site.cookbook_url | absolute_url }}/recipe/0489-multimedia-canvas/ "Rendering Multiple Media Types on a Time-Based Canvas"
 [0540]: {{ site.cookbook_url | absolute_url }}/recipe/0540-link-for-opening-multiple-canvases/ "Sharing a link for opening two or more Canvases"
 
+[0560]: {{ site.cookbook_url | absolute_url }}/recipe/0560-resources-on-a-timeline/ "Rendering Resources Sequentially on a Timeline"
+[0561]: {{ site.cookbook_url | absolute_url }}/recipe/0561-text-on-image/ "Visible Text Resource on a Canvas"
+
 [cookbook-process]: {{site.cookbook_url | absolute_url }}/recipe
 
 [trc]: {{ site.root_url | absolute_url }}/community/trc/

_includes/viewer_link.html

@@ -61,6 +61,16 @@
     https://theseusviewer.org/?iiif-content={{manifest_url |strip}}
     {% endcapture %}
     {% assign default_text="View in Theseus" %}
+{% elsif include.type == 'liiive' %}
+    {% capture viewer_url %}
+    https://liiive.now/?iiif-content={{manifest_url |strip}}
+    {% endcapture %}
+    {% assign default_text="View in liiive" %}
+{% elsif include.type == 'TIFY' %}
+    {% capture viewer_url %}
+    https://tify-iiif-viewer.github.io/tify/?iiif-content={{manifest_url |strip}}
+    {% endcapture %}
+    {% assign default_text="View in TIFY" %}
 {% else %}
     {% capture default_text %}Unknown Viewer type '{{ include.type}}'{% endcapture %}
     {% capture viewer_url %}{{manifest_url |strip}}{% endcapture %}

index.md

@@ -61,6 +61,7 @@ _The corresponding 2.1 test fixture(s) is given like this, where appropriate: ..
 * [Locate Multiple Canvases on a Web Map][0240]
 * [Acknowledge Content Contributors][0234]
 * [Simple Collection][0032]
+* [Reuse parts of a Manifest][0464]
 
 ## Textual and other supplementary content
 
@@ -82,6 +83,7 @@ _(leading on to segmentation examples later)_
 * comments - various examples (51,52,54)
 * [Simplest Annotation][0266]
 * [HTML in Annotations][0019]
+* [CSS in an Annotation][0045]
 * Fragment selectors (61)
 * [Simple Annotation - Tagging][0021]
 * [Annotation with a Non-Rectangular Polygon][0261]
@@ -95,14 +97,15 @@ _(leading on to segmentation examples later)_
 * [Using Annotation collections][0309]
 * [Image in annotations][0377]
 * [Annotating in Multiple Languages][0346]
+* [Visible Text Resource on a Canvas][0561]
 
 ## Internal structure
 
 * [Table of Contents for Book Chapters][0024]
 * table of contents (ranges) - articles in a newspaper
 * [Table of contents for A/V content][0026] (26)
 * [Adding Thumbnail Navigation and `no-nav` to a Video Resource][0229]
-* Alternative Sequence (via `sequence` Range) (20,22,23)
+* [Alternative Page Sequences][0027]
 * `sequence` Range with partial canvases
 
 ## Higher-level structure
@@ -116,6 +119,7 @@ _(leading on to segmentation examples later)_
 * [Multiple choice of images in a single view][0033] (29)
 * [Foldouts, Flaps, and Maps][0035]
 * [Composition from Multiple Images][0036] (30,31)
+* [Rendering Resources Sequentially on a Timeline][0560]
 * [Rendering Multiple Media Types on a Time-Based Canvas][0489]
 * Multiple images and multiple choices (32,33,34)
 * [Annotating part of an image to a Canvas][recipe-segment-image-part] (e.g., crop out scanner) (35,36,37,38)
@@ -153,7 +157,7 @@ Recipes using [Content State API](https://iiif.io/api/content-state/1.0/)
 * extensions (18)
 * services (9,10)
 * Mixed version scenarios (Prezi 3+Image 2)
-* Publishing v2 and v3 versions
+* [Making IIIF Presentation API v2 and v3 manifests available at the same URL][0057]
 
 ## Real-world complex objects (ideally taken from actual collections)
 

recipe/0000_template/index.md

@@ -32,7 +32,7 @@ If you don't know what the restrictions might be initially, just leave the follo
 Describe the solution in prose and provide an example.
 The example json document must be an external document, and imported with the following:
 
-{% include manifest_links.html viewers="UV, Mirador, Annona, Clover, Ramp, Aviary, Glycerine, Theseus" manifest="manifest.json" %}
+{% include manifest_links.html viewers="UV, Mirador, Annona, Clover, Ramp, Aviary, Glycerine, Theseus, TIFY" manifest="manifest.json" %}
 
 {% include jsonviewer.html src="manifest.json" %}
 

recipe/0000_template/manifest.json

@@ -4,5 +4,6 @@
     "type": "Manifest",
     "label": { 
         "none": [""]
-    }
+    },
+    "items": []
 }

recipe/0001-mvm-image/index.md

@@ -12,6 +12,8 @@ viewers:
  - Glycerine Viewer
  - Theseus
  - Curation
+ - liiive
+ - TIFY
 topic: 
  - basic
  - image

recipe/0002-mvm-audio/index.md

@@ -12,6 +12,7 @@ viewers:
  - Aviary
  - Theseus
  - Glycerine Viewer
+ - TIFY
 topic:
  - basic
  - AV
@@ -32,7 +33,7 @@ The implementation is identical to the [image example][0001], except that the co
 
 This example shows a Manifest with a single Canvas that lasts for 1985.024 seconds. It has a single audio file (audio-sample.mp4) which is associated with it. The mp4 also has a duration of 1985.024 seconds.
 
-{% include manifest_links.html viewers="UV, Mirador, Clover, Ramp, Aviary, Theseus, Glycerine Viewer" manifest="manifest.json" %}
+{% include manifest_links.html viewers="UV, Mirador, Clover, Ramp, Aviary, Theseus, Glycerine Viewer, TIFY" manifest="manifest.json" %}
 
 {% include jsonviewer.html src="manifest.json" %}
 

recipe/0003-mvm-video/index.md

@@ -12,6 +12,7 @@ viewers:
  - Aviary
  - Theseus
  - Glycerine Viewer
+ - TIFY
 topic:
  - basic
  - AV
@@ -32,7 +33,7 @@ The implementation is identical to the [image example][0001], except that the co
 
 This example shows a Manifest with a single Canvas that lasts for 572 seconds, or just under 10 minutes. It has a single video file (lunchroom_manners_1024kb.mp4) which is associated with it. The mp4 also has a duration of 572 seconds.
 
-{% include manifest_links.html viewers="UV, Mirador, Clover, Ramp, Aviary, Theseus, Glycerine Viewer" manifest="manifest.json" %}
+{% include manifest_links.html viewers="UV, Mirador, Clover, Ramp, Aviary, Theseus, Glycerine Viewer, TIFY" manifest="manifest.json" %}
 
 {% include jsonviewer.html src="manifest.json" %}
 

recipe/0004-canvas-size/index.md

@@ -10,6 +10,7 @@ viewers:
  - Annona
  - Theseus
  - Curation
+ - TIFY
 topic: image
 code:
  - iiif-prezi3
@@ -40,7 +41,7 @@ The aspect ratio should be consistent between your source image and Canvas. Othe
 
 This example shows a Manifest with a single Canvas that has height and width dimensions three times the pixel dimensions of the image in order to construct a Canvas with both dimensions greater than 1000px.
 
-{% include manifest_links.html viewers="UV, Mirador, Annona, Theseus, Curation" manifest="manifest.json" %}
+{% include manifest_links.html viewers="UV, Mirador, Annona, Theseus, Curation, TIFY" manifest="manifest.json" %}
 {% include jsonviewer.html src="manifest.json" config="data-line='14-15,29-30'"%}
 
 # Related recipes