Adapt to the citation help of Kalamar 0.66 and set the release date
Kalamar 0.66 assembles its citation help from a corpus, a KorAP and an
annotation part and lets an instance replace individual parts. Pass this
instance's DeReKo references as the corpus part and inherit the other two.
Kalamar ships no corpus entry in its documentation menu. Provide the
menu order -- corpus section first -- through this instance's own
templates/doc/navigation.json, mounted over the shipped one, and add the
labels of the corpus sub-pages. The corpus section therefore no longer
needs to be injected via navi_ext.
Set the release date of DeReKo-KorAP-2026-II to 2026-09-14 in the
release log.
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Change-Id: Id5d71966e1147f12c56643bf79a8fe04d186ee96
diff --git a/compose.instance.yaml b/compose.instance.yaml
index 7c77693..997a667 100644
--- a/compose.instance.yaml
+++ b/compose.instance.yaml
@@ -25,7 +25,7 @@
# compose pins an older image, so override it here. Point KALAMAR_IMAGE at
# a locally built tag when testing renderer changes:
# make korap KALAMAR_INSTANCE=../Kalamar-Instance-IDS KALAMAR_IMAGE=korap/kalamar:v0.66-alpha-large
- image: ${KALAMAR_IMAGE:-korap/kalamar:v0.66-alpha}
+ image: ${KALAMAR_IMAGE:-korap/kalamar:v0.66}
environment:
# Use this instance's config verbatim: skip the export-plugin entrypoint
# hack, which rewrites /kalamar/kalamar.production.conf in place and would
@@ -34,5 +34,8 @@
volumes:
- ${KALAMAR_INSTANCE_DIR}/kalamar.ids-mannheim.conf:/kalamar/kalamar.production.conf:ro
- ${KALAMAR_INSTANCE_DIR}/templates/custom:/kalamar/templates/custom:ro
+ # Documentation menu: puts the corpus section first. Mounted over the
+ # navigation Kalamar ships, so it has to be kept in sync with it.
+ - ${KALAMAR_INSTANCE_DIR}/templates/doc/navigation.json:/kalamar/templates/doc/navigation.json:ro
- ${KALAMAR_INSTANCE_DIR}/default.plugins.json:/kalamar/default.plugins.json:ro
- ${KALAMAR_INSTANCE_DIR}/public/robots.txt:/kalamar/public/robots.txt:ro
diff --git a/kalamar.ids-mannheim.conf b/kalamar.ids-mannheim.conf
index d11857c..f5fb84d 100644
--- a/kalamar.ids-mannheim.conf
+++ b/kalamar.ids-mannheim.conf
@@ -30,33 +30,11 @@
ping_requests => 1,
ping_site_id => 13
},
+ # The corpus section and the order of the documentation menu come from
+ # this instance's templates/doc/navigation.json, which is mounted over
+ # the one Kalamar ships. Entries listed here are appended after it.
navi_ext => [
{
- # Replaces Kalamar's default corpus section (same id) in place,
- # extending it with the release-log sub-item.
- "title" => "corpus",
- "id" => "corpus",
- "class" => "folded",
- "items" => [
- {
- "title" => "releases",
- "id" => "releases"
- },
- {
- "title" => "composition",
- "id" => "composition"
- },
- {
- "title" => "useful_subcorpora",
- "id" => "useful_subcorpora"
- },
- {
- "title" => "named_vc",
- "id" => "named_vc"
- }
- ]
- },
- {
"title" => "Privacy",
"id" => "privacy"
},
@@ -102,6 +80,14 @@
de_Nav_privacy => 'Datenschutz',
de_Nav_corpora => 'Korpora',
en_Nav_corpora => 'Corpora',
+ de_Nav_corpus => 'Korpusgrundlage',
+ en_Nav_corpus => 'Corpus basis',
+ en_Nav_composition => 'Composition',
+ de_Nav_composition => 'Zusammensetzung',
+ en_Nav_useful_subcorpora => 'Useful subcorpora',
+ de_Nav_useful_subcorpora => 'Nützliche Subkorpora',
+ en_Nav_named_vc => 'Named VC',
+ de_Nav_named_vc => 'Benamte VC',
en_howToCite => 'Citation Help',
de_howToCite => 'Zitierhilfe',
en_Nav_citation => 'References / Citation Help',
diff --git a/templates/custom/de/doc/corpus/releases.html.md b/templates/custom/de/doc/corpus/releases.html.md
index 04c7511..c55cecb 100644
--- a/templates/custom/de/doc/corpus/releases.html.md
+++ b/templates/custom/de/doc/corpus/releases.html.md
@@ -34,13 +34,13 @@
Fassung einen Absatz "Eine frühere Ausgabe benötigt?" ergänzen.
-->
-## DeReKo-KorAP-2026-II (voraussichtlich 15.09.2026)
+## DeReKo-KorAP-2026-II (Release am 14.09.2026 ab 10 Uhr)
DeReKo-KorAP-2026-II ist eine auf Grundlage von DeReKo-2026-I vollständig
neu tokenisierte, annotierte und indexierte Ausgabe. Sie umfasst
31.696.255.957 Tokens aus 95.565.305 Texten.
-Die Ausgabe wird voraussichtlich am 15.09.2026 offiziell veröffentlicht. Bis dahin ist
+Die Ausgabe wird am 14.09.2026 offiziell veröffentlicht. Bis dahin ist
sie bereits unter
[korap.ids-mannheim.de/instance/test-docker](https://korap.ids-mannheim.de/instance/test-docker)
verfügbar.
diff --git a/templates/custom/doc/citation.html.ep b/templates/custom/doc/citation.html.ep
index e8175c7..c15953f 100644
--- a/templates/custom/doc/citation.html.ep
+++ b/templates/custom/doc/citation.html.ep
@@ -2,4 +2,4 @@
%= page_title
-%= include 'partial/citation'
+%= include 'partial/citation', corpus_citation => 'custom/partial/citation/corpus'
diff --git a/templates/custom/doc/corpus/releases.html.md b/templates/custom/doc/corpus/releases.html.md
index a1401ef..b27ad17 100644
--- a/templates/custom/doc/corpus/releases.html.md
+++ b/templates/custom/doc/corpus/releases.html.md
@@ -32,13 +32,13 @@
"Need an earlier release?" paragraph here and in the German version.
-->
-## DeReKo-KorAP-2026-II (expected 2026-09-15)
+## DeReKo-KorAP-2026-II (to be released on 2026-09-14, starting at 10:00)
DeReKo-KorAP-2026-II is a completely re-tokenised, re-annotated and re-indexed
release based on DeReKo-2026-I. It comprises 31,696,255,957 tokens from
95,565,305 texts.
-The official release is expected on 2026-09-15. Until then it is already available at
+The official release is expected on 2026-09-14. Until then it is already available at
[korap.ids-mannheim.de/instance/test-docker](https://korap.ids-mannheim.de/instance/test-docker).
### Changed
diff --git a/templates/doc/navigation.json b/templates/doc/navigation.json
new file mode 100644
index 0000000..978ab67
--- /dev/null
+++ b/templates/doc/navigation.json
@@ -0,0 +1,167 @@
+[
+ {
+ "title": "Corpus",
+ "id": "corpus",
+ "class": "folded",
+ "items": [
+ {
+ "title": "releases",
+ "id": "releases"
+ },
+ {
+ "title": "composition",
+ "id": "composition"
+ },
+ {
+ "title": "useful_subcorpora",
+ "id": "useful_subcorpora"
+ },
+ {
+ "title": "named_vc",
+ "id": "named_vc"
+ }
+ ]
+ },
+ {
+ "title": "Query Languages",
+ "id": "ql",
+ "class": "folded",
+ "items": [
+ {
+ "title": "Cosmas II",
+ "id": "cosmas-2",
+ "class": "folded",
+ "items": [
+ {
+ "title": "Query Terms",
+ "id": "#queryterms"
+ },
+ {
+ "title": "Logical Operators",
+ "id": "#logical-operators"
+ },
+ {
+ "title": "Distance Operators",
+ "id": "#distance-operators"
+ }
+ ]
+ },
+ {
+ "title": "Poliqarp+",
+ "id": "poliqarp-plus",
+ "class": "folded",
+ "items": [
+ {
+ "title": "Simple Segments",
+ "id": "#segments"
+ },
+ {
+ "title": "Complex Segments",
+ "id": "#complex"
+ },
+ {
+ "title": "Span Segments",
+ "id": "#spans"
+ },
+ {
+ "title": "Paradigmatic Operators",
+ "id": "#paradigmatic-operators"
+ },
+ {
+ "title": "Syntagmatic Operators",
+ "id": "#syntagmatic-operators"
+ },
+ {
+ "title": "Class Operators",
+ "id": "#class-operators"
+ }
+ ]
+ },
+ {
+ "title": "CQP",
+ "id": "cqp",
+ "class": "folded",
+ "items": [
+ {
+ "title": "Simple Segments",
+ "id": "#segments"
+ },
+ {
+ "title": "Complex Segments",
+ "id": "#complex"
+ },
+ {
+ "title": "Span Segments",
+ "id": "#spans"
+ },
+ {
+ "title": "Paradigmatic Operators",
+ "id": "#paradigmatic-operators"
+ },
+ {
+ "title": "Syntagmatic Operators",
+ "id": "#syntagmatic-operators"
+ }
+ ]
+ },
+ {
+ "title": "Annis QL",
+ "id": "annis"
+ },
+ {
+ "title": "CQL",
+ "id": "cql"
+ },
+ {
+ "title": "FCSQL",
+ "id": "fcsql"
+ },
+ {
+ "title": "Regular Expressions",
+ "id": "regexp"
+ }
+ ]
+ },
+ {
+ "title": "Annotations",
+ "id": "annotation",
+ "class": "folded"
+ },
+ {
+ "title": "FAQ",
+ "id": "faq",
+ "class": "folded"
+ },
+ {
+ "title": "API",
+ "id": "api",
+ "class": "folded"
+ },
+ {
+ "title": "Development",
+ "id": "development",
+ "class": "folded",
+ "items": [
+ {
+ "title": "Kalamar",
+ "id": "kalamar"
+ },
+ {
+ "title": "Kustvakt",
+ "id": "kustvakt"
+ },
+ {
+ "title": "Koral",
+ "id": "koral"
+ },
+ {
+ "title": "Krill",
+ "id": "krill"
+ },
+ {
+ "title": "Karang",
+ "id": "karang"
+ }
+ ]
+ }
+]