merge from master branch.

.github/workflows/preview.yml

@@ -7,7 +7,7 @@ name: Deploy-preview
 on:
     push:
         branches:
-          - '*'
+          - '**'
           - '!master'
           - '!main'
           - '!beta'

Gemfile.lock

@@ -15,18 +15,18 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     colorator (1.1.0)
-    concurrent-ruby (1.3.1)
+    concurrent-ruby (1.3.3)
     diff-lcs (1.5.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    ffi (1.16.3)
+    ffi (1.17.0)
     forwardable-extended (2.6.0)
     html-proofer (3.19.0)
       addressable (~> 2.3)
@@ -78,33 +78,33 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    mini_portile2 (2.8.6)
-    nokogiri (1.16.5)
+    mini_portile2 (2.8.7)
+    nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
-    parallel (1.24.0)
+    parallel (1.25.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.5)
-    racc (1.8.0)
+    public_suffix (6.0.1)
+    racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     redcarpet (3.6.0)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.4)
+      strscan
     rouge (3.30.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)

_includes/links.md

@@ -65,10 +65,12 @@
 [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"
 
-[0326]: {{ site.cookbook_url | absolute_url }}/recipe/0326-annotating-image-layer/ "Annotate a specific images or layers"
 [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"
+[0318]: {{ site.cookbook_url | absolute_url }}/recipe/0318-navPlace-navDate/ "Locating an Item in Place and Time"
+[0326]: {{ site.cookbook_url | absolute_url }}/recipe/0326-annotating-image-layer/ "Annotate a specific images or layers"
 
+[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"
 
 [0466]: {{ site.cookbook_url | absolute_url }}/recipe/0466-link-for-loading-manifest/ "Loading a manifest with a viewer using a link"

_includes/viewer_link.html

@@ -56,7 +56,12 @@
     https://demo.viewer.glycerine.io/viewer?iiif-content={{manifest_url |strip}}
     {% endcapture %}
     {% assign default_text="View in Glycerine Viewer" %}
-{% else %}    
+{% elsif include.type == 'Theseus' %}
+    {% capture viewer_url %}
+    https://theseusviewer.org/?iiif-content={{manifest_url |strip}}
+    {% endcapture %}
+    {% assign default_text="View in Theseus" %}
+{% else %}
     {% capture default_text %}Unknown Viewer type '{{ include.type}}'{% endcapture %}
     {% capture viewer_url %}{{manifest_url |strip}}{% endcapture %}
 {% endif %}<a href="{{ viewer_url | strip }}" target="_blank">{{ include.text | default: default_text }}</a>

css/style.css

@@ -32,7 +32,6 @@ code {
     display: table !important;
     overflow-x: unset !important;
     border-width: 0 0 1px !important;
-    border: none !important;
 }
 
 .viewer tr {
@@ -41,4 +40,12 @@ code {
 
 .viewer td {
     border: none !important;
+    text-align: center !important;
 }
+
+.scrolling-header {
+    position: sticky;
+    top: 0px;
+    background-color: white;
+    box-shadow: inset 0 -1px 0 #dbdbdb;
+}

index.md

@@ -94,6 +94,7 @@ _(leading on to segmentation examples later)_
 * [Linking external Annotations targeting a Canvas to a Manifest][0306]
 * [Using Annotation collections][0309]
 * [Image in annotations][0377]
+* [Annotating in Multiple Languages][0346]
 
 ## Internal structure
 
@@ -172,6 +173,8 @@ Recipes using [Content State API](https://iiif.io/api/content-state/1.0/)
 * Mixed Image Service references (a mashup, with img2 and img3 services)
 * Glenn Gould - score and performance scenarios (transcribing)
 * A Map
+* [Locating an Item in Place and Time][0318]
+
 
 ## Access Control
 _this might be in a separate auth cookbook_

recipe/0000_template/index.md

@@ -5,7 +5,7 @@ layout: recipe
 tags: [tbc]
 summary: "tbc"
 viewers:
-topic: 
+topic:
  - basic
 ---
 
@@ -21,7 +21,7 @@ How do you implement the pattern?
 
 ## Restrictions
 
-When is this pattern is usable / not usable? Is it deprecated? If it uses multiple specifications, which versions are needed, etc.? 
+When is this pattern is usable / not usable? Is it deprecated? If it uses multiple specifications, which versions are needed, etc.?
 
 Delete this section if it is not needed.
 If you don't know what the restrictions might be initially, just leave the following line:
@@ -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, Curation" manifest="manifest.json" %}
+{% include manifest_links.html viewers="UV, Mirador, Annona, Clover, Ramp, Aviary, Glycerine, Theseus" manifest="manifest.json" %}
 
 {% include jsonviewer.html src="manifest.json" %}
 
@@ -44,4 +44,3 @@ Provide a bulleted list of related recipes and why they are relevant.
 
 {% include acronyms.md %}
 {% include links.md %}
-

recipe/0001-mvm-image/index.md

@@ -10,6 +10,7 @@ viewers:
  - Annona
  - Clover
  - Glycerine Viewer
+ - Theseus
 topic: 
  - basic
  - image

recipe/0002-mvm-audio/index.md

@@ -10,7 +10,8 @@ viewers:
  - Clover
  - Ramp
  - Aviary
-topic: 
+ - Theseus
+topic:
  - basic
  - AV
 code:
@@ -30,7 +31,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" manifest="manifest.json" %}
+{% include manifest_links.html viewers="UV, Mirador, Clover, Ramp, Aviary, Theseus" manifest="manifest.json" %}
 
 {% include jsonviewer.html src="manifest.json" %}
 

recipe/0003-mvm-video/index.md

@@ -10,7 +10,8 @@ viewers:
  - Clover
  - Ramp
  - Aviary
-topic: 
+ - Theseus
+topic:
  - basic
  - AV
 code:
@@ -28,9 +29,9 @@ The implementation is identical to the [image example][0001], except that the co
 
 ## Example
 
-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. 
+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" manifest="manifest.json" %}
+{% include manifest_links.html viewers="UV, Mirador, Clover, Ramp, Aviary, Theseus" manifest="manifest.json" %}
 
 {% include jsonviewer.html src="manifest.json" %}
 

recipe/0004-canvas-size/index.md

@@ -6,8 +6,9 @@ tags: [image, presentation, canvas]
 summary: "Demonstrates that image dimensions (pixels) need not be the same as the Canvas dimensions (unit-less)"
 viewers:
  - UV
- - Mirador  
+ - Mirador
  - Annona
+ - Theseus
 topic: image
 code:
  - iiif-prezi3
@@ -38,7 +39,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" manifest="manifest.json" %}
+{% include manifest_links.html viewers="UV, Mirador, Annona, Theseus" manifest="manifest.json" %}
 {% include jsonviewer.html src="manifest.json" config="data-line='14-15,29-30'"%}
 
 # Related recipes

recipe/0005-image-service/index.md

@@ -9,8 +9,9 @@ viewers:
  - Annona
  - Clover
  - Glycerine Viewer
-topic: 
- - basic 
+ - Theseus
+topic:
+ - basic
  - image
 code:
  - iiif-prezi3
@@ -22,7 +23,7 @@ You have a rare or special object in your collection that you'd like to make ava
 
 ## Implementation Notes
 
-A service may be attached to any IIIF resource type, and requires at minumum the use of `id` and `type`. The annotation structure follows that of the [Simplest Manifest - Image][0001] recipe. Within the `body` of the image annotation, specify the IIIF Image API service using the `service` property. The service's `id` property value is the base URI of that IIIF Image API service. 
+A service may be attached to any IIIF resource type, and requires at minumum the use of `id` and `type`. The annotation structure follows that of the [Simplest Manifest - Image][0001] recipe. Within the `body` of the image annotation, specify the IIIF Image API service using the `service` property. The service's `id` property value is the base URI of that IIIF Image API service.
 
 The `type` tells the client what version of the IIIF Image API (1, 2, or 3) you are referencing. Values for `type` are defined in [the IIIF Registry of Services][service-registry] and include values for compatibility with other IIIF APIs. See [the service property in the IIIF Presentation specification][prezi3-service] for more information.
 
@@ -36,7 +37,7 @@ Though a version 3 Manifest may specify a service using the version 2 `@id` and
 
 ## Example
 
-{% include manifest_links.html viewers="Mirador, Annona, Clover, Glycerine Viewer" manifest="manifest.json" %}
+{% include manifest_links.html viewers="Mirador, Annona, Clover, Glycerine Viewer, Theseus" manifest="manifest.json" %}
 
 {% include jsonviewer.html src="manifest.json" config='data-line="36-42"' %}
 

recipe/0006-text-language/index.md

@@ -6,9 +6,10 @@ tags: [i18n, text, presentation]
 summary: "An example of a IIIF Resource with labels/descriptions in multiple languages."
 viewers:
  - UV
- - Mirador  
+ - Mirador
  - Annona
  - Glycerine Viewer
+ - Theseus
 topic: basic
 property: label, summary, metadata, requiredStatement
 code:
@@ -41,7 +42,7 @@ To see the language choice in the linked viewers, open the settings menu (gear i
 
 The image in this example was sourced via Wikimedia Commons and is public domain.
 
-{% include manifest_links.html viewers="UV, Mirador, Annona, Glycerine Viewer" manifest="manifest.json" %}
+{% include manifest_links.html viewers="UV, Mirador, Annona, Glycerine Viewer, Theseus" manifest="manifest.json" %}
 
 {% include jsonviewer.html src="manifest.json" config='data-line="6-11, 16-21, 24-26, 31-36, 39-44, 49-54, 58-63, 66-68"' %}
 

recipe/0007-string-formats/index.md

@@ -6,10 +6,11 @@ tags: [text, presentation]
 summary: "You want to have more control on how your metadata is displayed. For example scientific names, and also links out to other sites. Also legacy systems that might include things like italic tags."
 viewers:
  - UV
- - Mirador  
+ - Mirador
  - Annona
  - Clover
  - Glycerine Viewer
+ - Theseus
 topic: property
 property: label, summary, metadata, requiredStatement
 code:
@@ -32,7 +33,7 @@ For security reasons, clients are expected to allow only `a`, `b`, `br`, `i`, `i
 
 ## Example
 
-{% include manifest_links.html viewers="UV, Mirador, Annona, Clover, Glycerine Viewer" manifest="manifest.json" %}
+{% include manifest_links.html viewers="UV, Mirador, Annona, Clover, Glycerine Viewer, Theseus" manifest="manifest.json" %}
 
 {% include jsonviewer.html src="manifest.json" config='data-line="7,12,24,38"' %}
 

recipe/0008-rights/index.md

@@ -10,6 +10,7 @@ viewers:
  - Annona
  - Clover
  - Glycerine Viewer
+ - Theseus
 topic: property
 property: rights, requiredStatement
 code:
@@ -40,7 +41,7 @@ None known.
 
 ## Example
 
-{% include manifest_links.html viewers="UV, Mirador, Annona, Clover, Glycerine Viewer" manifest="manifest.json" %}
+{% include manifest_links.html viewers="UV, Mirador, Annona, Clover, Glycerine Viewer, Theseus" manifest="manifest.json" %}
 
 {% include jsonviewer.html src="manifest.json" config='data-line="15-27"' %}
 
@@ -51,4 +52,3 @@ None known.
 
 {% include acronyms.md %}
 {% include links.md %}
-

recipe/0009-book-1/index.md

@@ -6,11 +6,12 @@ tags: [image, presentation]
 summary: "Represent a book, or any object composed of a set of images, as a simple Manifest."
 viewers:
  - UV
- - Mirador  
+ - Mirador
  - Annona
  - Clover
  - Glycerine Viewer
-topic: 
+ - Theseus
+topic:
  - image
  - basic
 code:
@@ -37,7 +38,7 @@ You should also consider providing a [thumbnail][prezi3-thumbnail] for each Canv
 
 ## Example
 
-{% include manifest_links.html viewers="UV, Mirador, Annona, Clover, Glycerine Viewer" manifest="manifest.json" %}
+{% include manifest_links.html viewers="UV, Mirador, Annona, Clover, Glycerine Viewer, Theseus" manifest="manifest.json" %}
 
 {% include jsonviewer.html src="manifest.json" %}
 
@@ -52,4 +53,3 @@ You should also consider providing a [thumbnail][prezi3-thumbnail] for each Canv
 
 {% include acronyms.md %}
 {% include links.md %}
-

recipe/0010-book-2-viewing-direction/index.md

@@ -6,9 +6,10 @@ tags: image, text, layout
 summary: "Informing a client how the Canvases should be displayed to the viewer in order to read the contents authentically in accordance with the script used, object layout, or reading practice."
 viewers:
  - UV
- - Mirador  
+ - Mirador
  - Annona
-topic: 
+ - Theseus
+topic:
  - image
  - property
 property: viewingDirection
@@ -40,7 +41,7 @@ None known
 
 This Manifest shows the playbill for "Akiba gongen kaisen-banashi," "Futatsu chōchō kuruwa nikki", and "Godairiki koi no fūjime", kabuki performances at the Chikugo Theater in Osaka, from the fifth month of Kaei 2 (May, 1849).
 
-{% include manifest_links.html viewers="UV, Mirador, Annona" manifest="manifest-rtl.json" %}
+{% include manifest_links.html viewers="UV, Mirador, Annona, Theseus" manifest="manifest-rtl.json" %}
 
 {% include jsonviewer.html src="manifest-rtl.json" config='data-line="15"' %}