From 77c41f2b6ff6ebbbc3f905f41ed85a716206ae5f Mon Sep 17 00:00:00 2001
From: Vincent Prins <vincent.prins@ivdnt.org>
Date: Fri, 14 Jun 2024 14:03:31 +0200
Subject: [PATCH 01/15] Retrieve GaLAHaD version for CMDI from version.yml

---
 .../kotlin/org/ivdnt/galahad/port/CmdiMetadata.kt     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/server/src/main/kotlin/org/ivdnt/galahad/port/CmdiMetadata.kt b/server/src/main/kotlin/org/ivdnt/galahad/port/CmdiMetadata.kt
index d61b67f..8f708ea 100644
--- a/server/src/main/kotlin/org/ivdnt/galahad/port/CmdiMetadata.kt
+++ b/server/src/main/kotlin/org/ivdnt/galahad/port/CmdiMetadata.kt
@@ -11,12 +11,12 @@ class CmdiMetadata(transformMetadata: DocumentTransformMetadata) : LayerTransfor
         val tmp_dir: File = createTempDirectory("cmdi").toFile()
     }
 
-
     val file: File
 
     init {
         var template = this::class.java.classLoader.getResource("CMDI-template.xml")!!.readText()
         val corpusMetadata: CorpusMetadata = this.transformMetadata.corpus.metadata.expensiveGet()
+        val docTitle = document.getUploadedRawFile().nameWithoutExtension
 
         // Current year, month and day, zero-padded
         val year = SimpleDateFormat("yyyy").format(Date())
@@ -24,7 +24,12 @@ class CmdiMetadata(transformMetadata: DocumentTransformMetadata) : LayerTransfor
         val day = SimpleDateFormat("dd").format(Date())
         val date = "$year-$month-$day"
 
-        val docTitle = document.getUploadedRawFile().nameWithoutExtension
+        // Retrieve GaLAHaD version from the same version.yml used in the client about page.
+        val versionStream = this::class.java.classLoader.getResource("version.yml")!!.openStream()
+        val versionProperties = Properties()
+        versionProperties.load(versionStream)
+        val galahadVersion = versionProperties.getProperty("VERSION")
+
         val replacements = mapOf<String, String>(
             "CORPUS_NAME" to corpusMetadata.name,
             "DATE" to date,
@@ -32,7 +37,7 @@ class CmdiMetadata(transformMetadata: DocumentTransformMetadata) : LayerTransfor
             "MONTH" to month,
             "DAY" to day,
             "PID" to document.uuid.toString(),
-            "GALAHAD_VERSION" to (System.getenv("GALAHAD_VERSION") ?: "!Unknown version!"),
+            "GALAHAD_VERSION" to galahadVersion,
             "TITLE" to docTitle,
             "SOURCE_NAME" to (corpusMetadata.sourceName ?: "!No source name defined!"),
             "SOURCE_URL" to (corpusMetadata.sourceURL?.toString() ?: "!No source URL defined!"),

From 4aff82f2cf5444698db8cef63f7ebcc2654f79ee Mon Sep 17 00:00:00 2001
From: Vincent Prins <vincent.prins@ivdnt.org>
Date: Fri, 14 Jun 2024 14:04:15 +0200
Subject: [PATCH 02/15] Add CMDI files as a zip in the export zip

---
 .../ivdnt/galahad/data/DocumentsController.kt   |  2 +-
 .../org/ivdnt/galahad/data/corpus/Corpus.kt     |  8 +++++++-
 .../kotlin/org/ivdnt/galahad/util/ZipFile.kt    | 17 ++++++++++-------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/server/src/main/kotlin/org/ivdnt/galahad/data/DocumentsController.kt b/server/src/main/kotlin/org/ivdnt/galahad/data/DocumentsController.kt
index 8c2fc13..7b97d00 100644
--- a/server/src/main/kotlin/org/ivdnt/galahad/data/DocumentsController.kt
+++ b/server/src/main/kotlin/org/ivdnt/galahad/data/DocumentsController.kt
@@ -95,7 +95,7 @@ class DocumentsController(
             zip.entries().asSequence().forEach { entry ->
                 zip.getInputStream(entry).use { input ->
                     try {
-                        if (!entry.isDirectory) {
+                        if (!entry.isDirectory && entry.name.split(".").last() != "zip"){
                             logger.info("Unzipped ${entry.name} from ${file.originalFilename}. Will convert it to document.")
                             // The entry might be in a subfolder, so extract the true file name.
                             val fileName = Paths.get(entry.name).fileName.toString()
diff --git a/server/src/main/kotlin/org/ivdnt/galahad/data/corpus/Corpus.kt b/server/src/main/kotlin/org/ivdnt/galahad/data/corpus/Corpus.kt
index d42b73d..382cd55 100644
--- a/server/src/main/kotlin/org/ivdnt/galahad/data/corpus/Corpus.kt
+++ b/server/src/main/kotlin/org/ivdnt/galahad/data/corpus/Corpus.kt
@@ -17,7 +17,9 @@ import org.ivdnt.galahad.taggers.Taggers
 import org.ivdnt.galahad.util.createZipFile
 import java.io.File
 import java.io.OutputStream
+import java.nio.file.Files
 import java.util.*
+import kotlin.io.path.createTempDirectory
 
 /**
  * A corpus is a collection of documents, metadata and jobs, saved to a folder. The folder contents are:
@@ -194,7 +196,11 @@ class Corpus(
         executeAndLogTime("Generating $name zip") {
             val convertedDocs = documents.asSequence().map(formatMapper)
             val docsToCmdi = documents.asSequence().map { CmdiMetadata(ctm.documentMetadata(it.name)).file }
-            zipFile = createZipFile(convertedDocs + docsToCmdi, outputStream)
+            val cmdiZip = createZipFile(docsToCmdi, includeCMDI = true)
+            // rename the cmdiZip to "metadata"
+            val dest = File(createTempDirectory("metadata").toFile(), "metadata.zip")
+            Files.move(cmdiZip.toPath(), dest.toPath())
+            zipFile = createZipFile(convertedDocs + dest, outputStream)
         }
         return zipFile!!
     }
diff --git a/server/src/main/kotlin/org/ivdnt/galahad/util/ZipFile.kt b/server/src/main/kotlin/org/ivdnt/galahad/util/ZipFile.kt
index e964ead..9209b64 100644
--- a/server/src/main/kotlin/org/ivdnt/galahad/util/ZipFile.kt
+++ b/server/src/main/kotlin/org/ivdnt/galahad/util/ZipFile.kt
@@ -11,9 +11,10 @@ import java.util.zip.ZipOutputStream
  * @param files Sequence of files to be zipped. As it is a Sequence type,
  * you may want to perform some transformations to map data to a file.
  * @param outStream If provided, used as a ZipOutputStream.
+ * @param includeCMDI include the GaLAHaD CMDI template files in the zip.
  * @return The flushed and closed zipfile.
  */
-fun createZipFile(files: Sequence<File>, outStream: OutputStream? = null): File {
+fun createZipFile(files: Sequence<File>, outStream: OutputStream? = null, includeCMDI: Boolean = false): File {
     // Create zip and stream.
     val zipFile = File.createTempFile("tmp", ".zip")
     val zipStream = ZipOutputStream(
@@ -27,12 +28,14 @@ fun createZipFile(files: Sequence<File>, outStream: OutputStream? = null): File
         zipStream.putNextEntry(ZipEntry(f.name))
         zipStream.write(f.readBytes())
     }
-    // Always add CMDI to zips
-    val cmdis = listOf("TextProfileINT_GaLAHaD.xml", "TextProfileINT_GaLAHaD.xsd")
-    for (cmdi in cmdis) {
-        val cmdiFile = getResourceStream(cmdi)
-        zipStream.putNextEntry(ZipEntry(cmdi))
-        zipStream.write(cmdiFile!!.readBytes())
+
+    if (includeCMDI) {
+        val cmdis = listOf("TextProfileINT_GaLAHaD.xml", "TextProfileINT_GaLAHaD.xsd")
+        for (cmdi in cmdis) {
+            val cmdiFile = getResourceStream(cmdi)
+            zipStream.putNextEntry(ZipEntry(cmdi))
+            zipStream.write(cmdiFile!!.readBytes())
+        }
     }
     // Close
     zipStream.flush()

From 5e12c1aa9a0297b623b24139c7302ae59865a52d Mon Sep 17 00:00:00 2001
From: Vincent Prins <vincent.prins@ivdnt.org>
Date: Fri, 14 Jun 2024 14:06:16 +0200
Subject: [PATCH 03/15] Fix empty strings in CMDI

So we now check both for null and empty
---
 .../kotlin/org/ivdnt/galahad/port/CmdiMetadata.kt    | 12 +++++++-----
 .../org/ivdnt/galahad/port/tei/export/TEIMetadata.kt |  5 +++--
 .../org/ivdnt/galahad/util/StringExtensions.kt       |  4 ++++
 .../main/kotlin/org/ivdnt/galahad/util/UTF8Util.kt   |  1 +
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/server/src/main/kotlin/org/ivdnt/galahad/port/CmdiMetadata.kt b/server/src/main/kotlin/org/ivdnt/galahad/port/CmdiMetadata.kt
index 8f708ea..120c843 100644
--- a/server/src/main/kotlin/org/ivdnt/galahad/port/CmdiMetadata.kt
+++ b/server/src/main/kotlin/org/ivdnt/galahad/port/CmdiMetadata.kt
@@ -1,6 +1,8 @@
 package org.ivdnt.galahad.port
 
 import org.ivdnt.galahad.data.corpus.CorpusMetadata
+import org.ivdnt.galahad.util.escapeXML
+import org.ivdnt.galahad.util.toNonEmptyString
 import java.io.File
 import java.text.SimpleDateFormat
 import java.util.*
@@ -39,18 +41,18 @@ class CmdiMetadata(transformMetadata: DocumentTransformMetadata) : LayerTransfor
             "PID" to document.uuid.toString(),
             "GALAHAD_VERSION" to galahadVersion,
             "TITLE" to docTitle,
-            "SOURCE_NAME" to (corpusMetadata.sourceName ?: "!No source name defined!"),
-            "SOURCE_URL" to (corpusMetadata.sourceURL?.toString() ?: "!No source URL defined!"),
+            "SOURCE_NAME" to corpusMetadata.sourceName.toNonEmptyString("!No source name defined!"),
+            "SOURCE_URL" to corpusMetadata.sourceURL.toNonEmptyString("!No source URL defined!"),
             "ERA_FROM" to corpusMetadata.eraFrom.toString(),
             "ERA_TO" to corpusMetadata.eraTo.toString(),
-            "TAGSET" to (tagger.tagset ?: "!No tagset defined!"),
+            "TAGSET" to tagger.tagset.toNonEmptyString("!No tagset defined!"),
             "FORMAT" to document.format.identifier,
             "TAGGER_NAME" to tagger.id,
-            "TAGGER_VERSION" to tagger.version, //TODO
+            "TAGGER_VERSION" to tagger.version,
             "TAGGER_URL" to tagger.model.href,
         )
         for ((key, value) in replacements) {
-            template = template.replace(key, value)
+            template = template.replace(key, value.escapeXML())
         }
         file = tmp_dir.resolve("CMDI-$docTitle.xml")
         file.writeText(template)
diff --git a/server/src/main/kotlin/org/ivdnt/galahad/port/tei/export/TEIMetadata.kt b/server/src/main/kotlin/org/ivdnt/galahad/port/tei/export/TEIMetadata.kt
index 92ff7ef..3d6af72 100644
--- a/server/src/main/kotlin/org/ivdnt/galahad/port/tei/export/TEIMetadata.kt
+++ b/server/src/main/kotlin/org/ivdnt/galahad/port/tei/export/TEIMetadata.kt
@@ -6,6 +6,7 @@ import org.ivdnt.galahad.port.LayerTransformer
 import org.ivdnt.galahad.port.xml.XMLMetadata
 import org.ivdnt.galahad.util.childOrNull
 import org.ivdnt.galahad.util.getXmlBuilder
+import org.ivdnt.galahad.util.toNonEmptyString
 import org.w3c.dom.Document
 import org.w3c.dom.Element
 import org.w3c.dom.Node
@@ -166,8 +167,8 @@ class TEIMetadata(
     private fun addNotesStmt(fileDesc: Element) {
         val notesStmt = fileDesc.getOrCreateChild("notesStmt")
         addNote(notesStmt, "corpusName", corpusMetadata.name)
-        addNote(notesStmt, "sourceCollection", corpusMetadata.sourceName ?: "!No source name defined!")
-        val url = corpusMetadata.sourceURL?.toString() ?: "!No source URL defined!"
+        addNote(notesStmt, "sourceCollection", corpusMetadata.sourceName.toNonEmptyString("!No source name defined!"))
+        val url = corpusMetadata.sourceURL.toNonEmptyString("!No source URL defined!")
         addNote(notesStmt, "sourceCollectionURL", url)
     }
 
diff --git a/server/src/main/kotlin/org/ivdnt/galahad/util/StringExtensions.kt b/server/src/main/kotlin/org/ivdnt/galahad/util/StringExtensions.kt
index cc0d241..0bcd00a 100644
--- a/server/src/main/kotlin/org/ivdnt/galahad/util/StringExtensions.kt
+++ b/server/src/main/kotlin/org/ivdnt/galahad/util/StringExtensions.kt
@@ -7,4 +7,8 @@ fun String.matchesUpTo(textToMatch: String): Int {
         else break
     }
     return matchingIndex
+}
+
+fun Any?.toNonEmptyString(default: String): String {
+    return if (this == null || this.toString().isEmpty()) default else this.toString()
 }
\ No newline at end of file
diff --git a/server/src/main/kotlin/org/ivdnt/galahad/util/UTF8Util.kt b/server/src/main/kotlin/org/ivdnt/galahad/util/UTF8Util.kt
index 1b9e95b..8bb3d69 100644
--- a/server/src/main/kotlin/org/ivdnt/galahad/util/UTF8Util.kt
+++ b/server/src/main/kotlin/org/ivdnt/galahad/util/UTF8Util.kt
@@ -25,6 +25,7 @@ fun String.escapeXML(): String {
     return this
         .replace("&","&amp;")
         .replace("<","&lt;")
+        .replace(">","&gt;")
         .replace("\"","&quot;")
 }
 

From dbd474f8c3ab98dc3b120ff53c10adcfef52a4e0 Mon Sep 17 00:00:00 2001
From: Vincent Prins <vincent.prins@ivdnt.org>
Date: Fri, 14 Jun 2024 15:10:47 +0200
Subject: [PATCH 04/15] Remove old evaluate router path

---
 client/src/router/index.ts | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index d847dee..f3e3641 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -118,18 +118,6 @@ const routes = [
       { path: 'tagsets', component: TagsetsView },
       { path: 'datasets', component: DatasetsView },
       { path: 'benchmarks', component: BenchmarksView },
-      {
-        path: 'evaluate', component: EvaluateView,
-        props: { basePath: "/overview/evaluate" },
-        redirect: '/overview/evaluate/distribution',
-        children: [
-          { path: 'distribution', component: DistributionView },
-          { path: 'global_metrics', component: GlobalMetricsView },
-          { path: 'grouped_metrics', component: GroupedMetricsView },
-          { path: 'confusion', component: ConfusionView }
-        ]
-      },
-      { path: 'contribute', component: ContributeTaggersView }
     ]
   }, {
     path: '/contribute', component: ContributeView, children: [

From e57e2e722317ee3460585f0a634f1fae232fb2de Mon Sep 17 00:00:00 2001
From: Vincent Prins <vincent.prins@ivdnt.org>
Date: Fri, 14 Jun 2024 15:15:46 +0200
Subject: [PATCH 05/15] Use built in Kotlin Dispatchers.IO for file access

---
 .../org/ivdnt/galahad/FileBackedValue.kt      | 57 +++----------------
 1 file changed, 8 insertions(+), 49 deletions(-)

diff --git a/server/src/main/kotlin/org/ivdnt/galahad/FileBackedValue.kt b/server/src/main/kotlin/org/ivdnt/galahad/FileBackedValue.kt
index 5eb7262..791b1e8 100644
--- a/server/src/main/kotlin/org/ivdnt/galahad/FileBackedValue.kt
+++ b/server/src/main/kotlin/org/ivdnt/galahad/FileBackedValue.kt
@@ -2,6 +2,9 @@ package org.ivdnt.galahad
 
 import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.databind.ObjectMapper
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 import org.apache.logging.log4j.kotlin.Logging
 import java.io.*
 import java.nio.ByteBuffer
@@ -60,21 +63,8 @@ open class FileBackedValue<T>(
             // It was not set yet
             return initValue
         }
-
-        val channel = FileChannel.open(file.toPath(), StandardOpenOption.READ)
-        channel.use {
-            val lock = lockFile( channel, false )
-            lock.use {
-                val fileSize = channel.size().toInt()
-                val byteBuffer: ByteBuffer = ByteBuffer.allocate(fileSize)
-                channel.read(byteBuffer)
-                byteBuffer.flip()
-                val bytes: ByteArray = byteBuffer.array()
-                byteBuffer.clear()
-                return mapper.readValue( bytes, object : TypeReference<S>() {})
-            }
-        }
-
+        val bytes: ByteArray = runBlocking(Dispatchers.IO) { file.inputStream().use { it.readBytes() }}
+        return mapper.readValue(bytes, object : TypeReference<S>() {})
     }
 
     /**
@@ -88,41 +78,10 @@ open class FileBackedValue<T>(
         if( !file.exists() ) {
             file.createNewFile()
         }
-
         // Would love to do this atomically, but for now we won't
         val oldValue = read<S>()
-
-        val channel = FileChannel.open(file.toPath(), StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING )
-        channel.use {
-            val lock = lockFile( channel, true )
-            lock.use {
-                val newValue = modification( oldValue )
-                val newValBytes = mapper.writeValueAsBytes( newValue )
-                logger.trace("will write $newValue")
-                val byteBuffer = ByteBuffer.wrap( newValBytes )
-                channel.write( byteBuffer )
-            }
-        }
+        val newValue = modification(oldValue)
+        val newValBytes = mapper.writeValueAsBytes(newValue)
+        runBlocking(Dispatchers.IO) { file.writeBytes(newValBytes)}
     }
-
-    fun lockFile( channel: FileChannel, exclusive: Boolean ): FileLock? {
-        while (true) {
-            try {
-                return if( exclusive ) {
-                    channel.lock()
-                } else {
-                    channel.lock(0L, Long.MAX_VALUE, true)
-                }
-            } catch (ignored: OverlappingFileLockException) {
-            } catch (ignored: IOException) {
-            }
-            try {
-                logger.info("Tried to read access $file but it was locked. Will sleep for ${LOCK_SLEEP_TIME}ms now then retry.")
-                Thread.sleep(LOCK_SLEEP_TIME)
-            } catch (e: InterruptedException) {
-                e.printStackTrace()
-            }
-        }
-    }
-
 }
\ No newline at end of file

From d6d46aec042aee243e3519080eb85ee02bce538d Mon Sep 17 00:00:00 2001
From: Vincent Prins <vincent.prins@ivdnt.org>
Date: Mon, 17 Jun 2024 12:23:00 +0200
Subject: [PATCH 06/15] Rename GTable.sortedByField to sortedByColumn

---
 .../src/components/modals/VariantsModal.vue   |  92 +-
 client/src/components/tables/CorpusTable.vue  | 304 +++---
 .../src/components/tables/DocumentsTable.vue  | 450 ++++-----
 client/src/components/tables/GTable.vue       | 908 +++++++++---------
 client/src/components/tables/MetricsTable.vue | 248 ++---
 .../src/views/annotate/subviews/JobsView.vue  |   2 +-
 .../evaluate/subviews/ConfusionView.vue       | 438 ++++-----
 .../evaluate/subviews/DistributionView.vue    | 436 ++++-----
 .../overview/subviews/BenchmarksView.vue      | 318 +++---
 9 files changed, 1598 insertions(+), 1598 deletions(-)

diff --git a/client/src/components/modals/VariantsModal.vue b/client/src/components/modals/VariantsModal.vue
index f27fadd..b3ebc37 100644
--- a/client/src/components/modals/VariantsModal.vue
+++ b/client/src/components/modals/VariantsModal.vue
@@ -1,47 +1,47 @@
-<template>
-    <GModal small :show="show" @hide="$emit('hide')" headless>
-        <GTable compact showHelp :columns :items="items" sortedByField="occurrences" :sortDesc="true">
-            <template #title>
-                Types of lemma <i>{{ variantsToDisplay?.lemma }}</i> and part-of-speech <i>{{ variantsToDisplay?.pos
-                    }}</i>
-            </template>
-            <template #help>
-                This is an overview of all types belonging to the chosen lemma, part-of-speech pair.
-            </template>
-        </GTable>
-    </GModal>
-</template>
-
-<script setup lang="ts">
-// Libraries & stores
-import { computed } from 'vue'
-// Types & API
-import { Field } from '@/types/table'
-import { Distribution } from '@/types/evaluation'
-// Components
-import { GModal, GTable } from '@/components'
-
-// Custom types
-type DistEntry = { variant: string, occurrences: number }
-
-// Props
-const props = defineProps<{
-    show: boolean
-    variantsToDisplay: Distribution
-}>();
-
-// Fields
-const columns: Field[] = [
-    { key: 'variant', label: 'Type', sortOn: (x: DistEntry) => x.variant },
-    { key: 'occurrences', label: 'Occurrences', sortOn: (x: DistEntry) => x.occurrences }
-]
-const items: DistEntry[] = computed(() => {
-    return Object.entries(props.variantsToDisplay.literals.literals).map(([variant, occurrences]) => ({ variant, occurrences }))
-})
-
-</script>
-<style scoped>
-:deep(.my-small) {
-    padding: 1em;
-}
+<template>
+    <GModal small :show="show" @hide="$emit('hide')" headless>
+        <GTable compact showHelp :columns :items="items" sortedByColumn="occurrences" :sortDesc="true">
+            <template #title>
+                Types of lemma <i>{{ variantsToDisplay?.lemma }}</i> and part-of-speech <i>{{ variantsToDisplay?.pos
+                    }}</i>
+            </template>
+            <template #help>
+                This is an overview of all types belonging to the chosen lemma, part-of-speech pair.
+            </template>
+        </GTable>
+    </GModal>
+</template>
+
+<script setup lang="ts">
+// Libraries & stores
+import { computed } from 'vue'
+// Types & API
+import { Field } from '@/types/table'
+import { Distribution } from '@/types/evaluation'
+// Components
+import { GModal, GTable } from '@/components'
+
+// Custom types
+type DistEntry = { variant: string, occurrences: number }
+
+// Props
+const props = defineProps<{
+    show: boolean
+    variantsToDisplay: Distribution
+}>();
+
+// Fields
+const columns: Field[] = [
+    { key: 'variant', label: 'Type', sortOn: (x: DistEntry) => x.variant },
+    { key: 'occurrences', label: 'Occurrences', sortOn: (x: DistEntry) => x.occurrences }
+]
+const items: DistEntry[] = computed(() => {
+    return Object.entries(props.variantsToDisplay.literals.literals).map(([variant, occurrences]) => ({ variant, occurrences }))
+})
+
+</script>
+<style scoped>
+:deep(.my-small) {
+    padding: 1em;
+}
 </style>
\ No newline at end of file
diff --git a/client/src/components/tables/CorpusTable.vue b/client/src/components/tables/CorpusTable.vue
index 75d1b43..d168bcf 100644
--- a/client/src/components/tables/CorpusTable.vue
+++ b/client/src/components/tables/CorpusTable.vue
@@ -1,152 +1,152 @@
-<template>
-    <GTable title="Corpora" :columns :items="displayCorpora" :loading="corporaStore.loading"
-        sortedByField="name" :sortDesc="false" :selectable="selectable" v-model="selectedCorpus"
-        v-if="displayCorpora.length > 0 || (type == TableCorporaType.User && !sharedWithYou)">
-
-        <template #title>
-            <slot name="title">
-                {{ displayCorpora.length }} {{ type }} {{ displayCorpora.length == 1 ? ' corpus' : ' corpora' }}
-            </slot>
-        </template>
-
-        <template #help>
-            <slot name="help">
-                <component :is="help.corpora"></component>
-            </slot>
-        </template>
-
-        <template #table-empty-instruction>
-            <slot name="tableEmpty">
-                First, create a new corpus.
-            </slot>
-        </template>
-
-        <template #prepend>
-            <div style="display: flex; align-items: center; justify-content: center; margin-bottom:1em"
-                v-if="type == TableCorporaType.User || (userStore.user.admin && type == TableCorporaType.Public)">
-                <GButton green @click="$emit('create')" v-if="type == TableCorporaType.User && !sharedWithYou">
-                    New
-                </GButton>
-                <GButton orange :disabled="!activeCorpusInTable" @click="$emit('update', selectedCorpus)">Edit
-                </GButton>
-                <GButton v-if="!sharedWithYou || userStore.user.admin"
-                    :disabled="!userStore.canDelete(selectedCorpus) || !activeCorpusInTable" red
-                    @click="$emit('delete', selectedCorpus)">Delete</GButton>
-            </div>
-            <p v-if="displayCorpora.length > 0 && selectable" style="text-align: center">Click on a row to select a
-                corpus.
-            </p>
-        </template>
-
-        <!-- size in bytes cell -->
-        <template #cell-sizeInBytes="data">
-            <span v-if="data.value > 1023">{{ Utils.formatBytes(data.value) }}</span>
-            <span v-else>~ 0</span>
-        </template>
-
-        <!-- last modified cell -->
-        <template #cell-lastModified="data">
-            <span style="white-space:nowrap">{{ new Date(data.value).toLocaleString("nl", {
-                year: "2-digit",
-                month: "2-digit",
-                day: "numeric",
-                hour: "2-digit",
-                minute: "2-digit",
-            }) }}</span>
-        </template>
-
-        <!-- collaborators cell -->
-        <template #cell-collaborators="data">
-            {{ formatCollaborators(data.item) }}
-        </template>
-
-        <!-- source cell -->
-        <template #cell-source="data">
-            <ExternalLink v-if="data.item.sourceURL" :href="data.item.sourceURL">
-                {{ data.item.sourceName ? data.item.sourceName : data.item.sourceURL }}
-            </ExternalLink>
-            <span v-else-if="data.item.sourceName">{{ data.item.sourceName }}</span>
-            <i v-else>Not declared</i>
-        </template>
-    </GTable>
-</template>
-
-<script setup lang='ts'>
-// Libraries & stores
-import { PropType, ref, watch, computed } from 'vue'
-import stores from '@/stores'
-// API & types
-import { CorpusMetadata } from '@/types/corpora'
-import { TableCorporaType, Field } from '@/types/table'
-import * as Utils from '@/api/utils'
-// Components
-import { ExternalLink, GButton, GTable } from '@/components'
-import help from '@/components/help'
-
-// Stores
-const userStore = stores.useUser()
-const corporaStore = stores.useCorpora()
-
-// Props
-const props = defineProps({
-    corpora: Array<CorpusMetadata>, type: String as PropType<TableCorporaType>,
-    selectable: Boolean, sharedWithYou: Boolean
-})
-
-// Fields
-const selectedCorpus = ref(corporaStore.activeCorpus)
-const editable = props.type === TableCorporaType.User
-const displayCorpora = computed(() => {
-    if (props.type === TableCorporaType.User) {
-        if (props.sharedWithYou) {
-            return props.corpora.filter(i => i.collaborators.includes(userStore.user.id) || i.viewers.includes(userStore.user.id))
-        } else {
-            return props.corpora.filter(i => i.owner === userStore.user.id)
-        }
-    } else {
-        return props.corpora
-    }
-})
-// Enable edit & delete buttons only if activeCorpus is in this table.
-// (Not that CorpusForm cares, but looks nicer)
-const activeCorpusInTable = computed(() => {
-    return displayCorpora.value.map(i => i.uuid).includes(selectedCorpus.value?.uuid)
-})
-const columns: Field[] = [
-    { key: "uuid", isPrimaryField: true, hidden: true },
-    { key: "name", sortOn: x => x.name },
-    { key: "numDocs", sortOn: x => x.numDocs, label: "docs" },
-    { key: 'sizeInBytes', label: "size", sortOn: x => x.sizeInBytes },
-    { key: "eraFrom", sortOn: x => x.eraFrom, label: "year from" },
-    { key: "eraTo", sortOn: x => x.eraTo, label: "year to" },
-    { key: "tagset", sortOn: x => x.tagset },
-    { key: "source", label: "source", sortOn: x => x.source },
-    { key: "lastModified", sortOn: x => x.lastModified, label: "last modified" },
-    { key: "collaborators", hidden: !editable, sortOn: x => customSharedSort(x), label: "shared with" },
-    { key: "activeJobs", hidden: !editable, sortOn: x => x.activeJobs, label: "jobs" },
-]
-
-// Watches
-// We can't use corporaStore.activeCorpus directly, because there will be multiple corpus tables on the page.
-watch(() => corporaStore.activeCorpus, () => {
-    return selectedCorpus.value = corporaStore.activeCorpus
-}, { immediate: true })
-watch(() => selectedCorpus.value, () => {
-    if (selectedCorpus.value) {
-        corporaStore.activeUUID = selectedCorpus.value?.uuid
-    }
-}, { immediate: true })
-
-// Methods
-function formatCollaborators(i: CorpusMetadata): string {
-    if (i.public) return "Public"
-    const numPeople = i.collaborators.length + i.viewers.length
-    if (numPeople == 0) return "No one"
-    return numPeople == 1 ? `${numPeople} person` : `${numPeople} people`
-}
-
-function customSharedSort(i: CorpusMetadata) {
-    if (i.public) return -1
-    return i.collaborators.length + i.viewers.length
-}
-</script>
+<template>
+    <GTable title="Corpora" :columns :items="displayCorpora" :loading="corporaStore.loading" sortedByColumn="name"
+        :sortDesc="false" :selectable="selectable" v-model="selectedCorpus"
+        v-if="displayCorpora.length > 0 || (type == TableCorporaType.User && !sharedWithYou)">
+
+        <template #title>
+            <slot name="title">
+                {{ displayCorpora.length }} {{ type }} {{ displayCorpora.length == 1 ? ' corpus' : ' corpora' }}
+            </slot>
+        </template>
+
+        <template #help>
+            <slot name="help">
+                <component :is="help.corpora"></component>
+            </slot>
+        </template>
+
+        <template #table-empty-instruction>
+            <slot name="tableEmpty">
+                First, create a new corpus.
+            </slot>
+        </template>
+
+        <template #prepend>
+            <div style="display: flex; align-items: center; justify-content: center; margin-bottom:1em"
+                v-if="type == TableCorporaType.User || (userStore.user.admin && type == TableCorporaType.Public)">
+                <GButton green @click="$emit('create')" v-if="type == TableCorporaType.User && !sharedWithYou">
+                    New
+                </GButton>
+                <GButton orange :disabled="!activeCorpusInTable" @click="$emit('update', selectedCorpus)">Edit
+                </GButton>
+                <GButton v-if="!sharedWithYou || userStore.user.admin"
+                    :disabled="!userStore.canDelete(selectedCorpus) || !activeCorpusInTable" red
+                    @click="$emit('delete', selectedCorpus)">Delete</GButton>
+            </div>
+            <p v-if="displayCorpora.length > 0 && selectable" style="text-align: center">Click on a row to select a
+                corpus.
+            </p>
+        </template>
+
+        <!-- size in bytes cell -->
+        <template #cell-sizeInBytes="data">
+            <span v-if="data.value > 1023">{{ Utils.formatBytes(data.value) }}</span>
+            <span v-else>~ 0</span>
+        </template>
+
+        <!-- last modified cell -->
+        <template #cell-lastModified="data">
+            <span style="white-space:nowrap">{{ new Date(data.value).toLocaleString("nl", {
+                year: "2-digit",
+                month: "2-digit",
+                day: "numeric",
+                hour: "2-digit",
+                minute: "2-digit",
+            }) }}</span>
+        </template>
+
+        <!-- collaborators cell -->
+        <template #cell-collaborators="data">
+            {{ formatCollaborators(data.item) }}
+        </template>
+
+        <!-- source cell -->
+        <template #cell-source="data">
+            <ExternalLink v-if="data.item.sourceURL" :href="data.item.sourceURL">
+                {{ data.item.sourceName ? data.item.sourceName : data.item.sourceURL }}
+            </ExternalLink>
+            <span v-else-if="data.item.sourceName">{{ data.item.sourceName }}</span>
+            <i v-else>Not declared</i>
+        </template>
+    </GTable>
+</template>
+
+<script setup lang='ts'>
+// Libraries & stores
+import { PropType, ref, watch, computed } from 'vue'
+import stores from '@/stores'
+// API & types
+import { CorpusMetadata } from '@/types/corpora'
+import { TableCorporaType, Field } from '@/types/table'
+import * as Utils from '@/api/utils'
+// Components
+import { ExternalLink, GButton, GTable } from '@/components'
+import help from '@/components/help'
+
+// Stores
+const userStore = stores.useUser()
+const corporaStore = stores.useCorpora()
+
+// Props
+const props = defineProps({
+    corpora: Array<CorpusMetadata>, type: String as PropType<TableCorporaType>,
+    selectable: Boolean, sharedWithYou: Boolean
+})
+
+// Fields
+const selectedCorpus = ref(corporaStore.activeCorpus)
+const editable = props.type === TableCorporaType.User
+const displayCorpora = computed(() => {
+    if (props.type === TableCorporaType.User) {
+        if (props.sharedWithYou) {
+            return props.corpora.filter(i => i.collaborators.includes(userStore.user.id) || i.viewers.includes(userStore.user.id))
+        } else {
+            return props.corpora.filter(i => i.owner === userStore.user.id)
+        }
+    } else {
+        return props.corpora
+    }
+})
+// Enable edit & delete buttons only if activeCorpus is in this table.
+// (Not that CorpusForm cares, but looks nicer)
+const activeCorpusInTable = computed(() => {
+    return displayCorpora.value.map(i => i.uuid).includes(selectedCorpus.value?.uuid)
+})
+const columns: Field[] = [
+    { key: "uuid", isPrimaryField: true, hidden: true },
+    { key: "name", sortOn: x => x.name },
+    { key: "numDocs", sortOn: x => x.numDocs, label: "docs" },
+    { key: 'sizeInBytes', label: "size", sortOn: x => x.sizeInBytes },
+    { key: "eraFrom", sortOn: x => x.eraFrom, label: "year from" },
+    { key: "eraTo", sortOn: x => x.eraTo, label: "year to" },
+    { key: "tagset", sortOn: x => x.tagset },
+    { key: "source", label: "source", sortOn: x => x.source },
+    { key: "lastModified", sortOn: x => x.lastModified, label: "last modified" },
+    { key: "collaborators", hidden: !editable, sortOn: x => customSharedSort(x), label: "shared with" },
+    { key: "activeJobs", hidden: !editable, sortOn: x => x.activeJobs, label: "jobs" },
+]
+
+// Watches
+// We can't use corporaStore.activeCorpus directly, because there will be multiple corpus tables on the page.
+watch(() => corporaStore.activeCorpus, () => {
+    return selectedCorpus.value = corporaStore.activeCorpus
+}, { immediate: true })
+watch(() => selectedCorpus.value, () => {
+    if (selectedCorpus.value) {
+        corporaStore.activeUUID = selectedCorpus.value?.uuid
+    }
+}, { immediate: true })
+
+// Methods
+function formatCollaborators(i: CorpusMetadata): string {
+    if (i.public) return "Public"
+    const numPeople = i.collaborators.length + i.viewers.length
+    if (numPeople == 0) return "No one"
+    return numPeople == 1 ? `${numPeople} person` : `${numPeople} people`
+}
+
+function customSharedSort(i: CorpusMetadata) {
+    if (i.public) return -1
+    return i.collaborators.length + i.viewers.length
+}
+</script>
diff --git a/client/src/components/tables/DocumentsTable.vue b/client/src/components/tables/DocumentsTable.vue
index dfc0b5b..a097fa3 100644
--- a/client/src/components/tables/DocumentsTable.vue
+++ b/client/src/components/tables/DocumentsTable.vue
@@ -1,225 +1,225 @@
-<template>
-    <div>
-
-        <GTable :columns :items="documentsStore.available" :loading="documentsStore.loading"
-            :displayOnEmpty="false" sortedByField="name" :sortDesc="false" hoverRow>
-            <template #title>
-                <span v-if="!corpus || (type == TableDocumentsType.Dataset && !corpus.dataset)">
-                    No documents
-                </span>
-                <span v-else>
-                    {{ documentsStore.available.length }}
-                    {{ documentsStore.available.length === 1 ? 'document' : 'documents' }}
-                    in corpus <i>{{ corpus.name }}</i>
-                </span>
-            </template>
-
-            <template #help>
-                <slot name="help">
-                    <component :is="help.documents"></component>
-                </slot>
-            </template>
-
-            <template #table-empty-instruction>
-                <span v-if="!corpus || (type == TableDocumentsType.Dataset && !corpus?.dataset)">No corpus
-                    selected.</span>
-                <span v-else-if="corpus?.uuid && type != TableDocumentsType.Dataset" style="margin-top:10px">
-                    This corpus is empty. Upload documents to the corpus.
-                </span>
-            </template>
-
-            <template #header>
-                <UploadDocuments v-if="userStore.hasWriteAccess && type != TableDocumentsType.Dataset" />
-            </template>
-
-            <!-- valid cell -->
-            <template #cell-valid="data">
-                {{ data.value ? '👍' : '🔥' }}
-            </template>
-
-            <!-- name cell -->
-            <template #cell-name="data">
-                <div style="max-height: 3em; line-break: anywhere; overflow: hidden; min-width:80px">{{ data.value }}
-                </div>
-            </template>
-
-            <!-- size cell -->
-            <template #cell-size="data">
-                {{ data.value }}
-            </template>
-
-            <template #head-layerSummary>
-                source annotations<br>
-                (token / PoS / lemma)
-            </template>
-            <!-- layerSummary cell -->
-            <template #cell-layerSummary="data">
-                <RightFloatCell>
-                    <template #left>
-                        {{ data.value.numWordForms }} /
-                        {{ data.value.numPOS }} /
-                        {{ data.value.numLemma }}
-                    </template>
-                    <template #right>
-                        <InspectButton v-if="data.value.numWordForms > 0" @click="previewDocument = data.item" />
-                    </template>
-                </RightFloatCell>
-            </template>
-
-            <!-- plain text preview cell -->
-            <template #cell-preview="data">
-                <div style="min-width: 200px; max-height: 3em; overflow: hidden;">{{ data.value }}</div>
-            </template>
-
-            <!-- size in bytes cell -->
-            <!-- <template #cell-sizeInBytes="data">
-                <span v-if="data.value > 1023">{{Utils.formatBytes(data.value)}}</span>
-                <span v-else>~ 0</span>
-            </template> -->
-
-            <!-- last modified cell -->
-            <template #cell-lastModified="data">
-                <span style="white-space:nowrap">{{ new Date(data.value).toLocaleString("nl", {
-                    year: "2-digit",
-                    month: "2-digit",
-                    day: "numeric",
-                    hour: "2-digit",
-                    minute: "2-digit",
-                }) }}</span>
-            </template>
-
-            <!-- actions cell -->
-            <template #cell-actions="data">
-                <div style="display: flex;">
-
-                    <DownloadButton @click="download(data.item)" />
-
-                    <GButton red @click="deleteDocumentData = data.item; showDeleteModal = true" title="Delete">
-                        <i class="fa fa-trash"></i>
-                    </GButton>
-                </div>
-            </template>
-
-        </GTable>
-
-        <!-- preview modal -->
-        <GModal :show="previewDocument !== null" @hide="preview = null; previewDocument = null"
-            :title="`Preview of document ${previewDocument ? previewDocument.name : ''}`" style="text-align: center">
-            <template #title>Source layer preview of document {{ previewDocument ? previewDocument.name : ""
-                }}</template>
-            <template #help>
-                Here you can inspect a small part of the source layer of the document.
-            </template>
-            <template v-if="loading">
-                <p>Loading...</p>
-                <GSpinner medium />
-            </template>
-            <LayerViewer v-else :layer="preview" />
-
-        </GModal>
-
-        <!-- delete modal -->
-        <DeleteModal :show="showDeleteModal" :item="deleteDocumentData"
-            :displayname="'document ' + (deleteDocumentData !== null ? deleteDocumentData.name : '[null]') + ' and associated results'"
-            @hide="showDeleteModal = false" @delete="deleteDocument" />
-
-    </div>
-</template>
-
-<script setup lang='ts'>
-// Libraries & stores
-import { computed, ref, PropType, watch, onMounted } from 'vue'
-import stores from '@/stores'
-// API & types
-import * as API from '@/api/jobs'
-import { TableDocumentsType, Field } from '@/types/table'
-import { DocumentMetadata } from '@/types/documents'
-import { CorpusMetadata } from '@/types/corpora'
-import { LayerPreview, SOURCE_LAYER } from '@/types/jobs'
-// Components
-import { GButton, GModal, GTable, DownloadButton, DeleteModal, RightFloatCell, InspectButton } from '@/components'
-import LayerViewer from '@/components/tables/LayerViewer.vue'
-import UploadDocuments from '@/components/input/UploadDocuments.vue'
-import help from '@/components/help'
-
-// Stores
-const app = stores.useApp()
-const documentsStore = stores.useDocuments()
-const userStore = stores.useUser()
-
-// Props
-const props = defineProps({
-    type: String as PropType<TableDocumentsType>, // the mode of the table
-    corpus: { type: Object as PropType<CorpusMetadata>, default: null },
-})
-
-// Fields
-const deleteDocumentData = ref(null as null | DocumentMetadata)
-const previewDocument = ref(null as null | DocumentMetadata)
-const preview = ref(null as null | LayerPreview)
-const showDeleteModal = ref(false)
-const loading = ref(false)
-
-const columns: Field[] = computed(() => {
-    const publicFields = [
-        // { key: "valid", sortOn: (x: Document) => x.valid },
-        { key: "name", sortOn: (x: DocumentMetadata) => x.name, textAlign: "left" },
-        { key: "format", sortOn: (x: DocumentMetadata) => x.format },
-        { key: "preview", textAlign: "left" },
-        // { key: "sizeInBytes", label: "size", sortOn: (x: Document) => x.sizeInBytes },
-        // { key: "numChars", label: "size (chars)", sortOn: (x: DocumentMetadata) => x.numChars },
-        { key: "layerSummary" },
-        { key: "lastModified", label: "last modified", sortOn: (x: DocumentMetadata) => x.lastModified }
-    ] as Field[];
-    if (userStore.hasWriteAccess && props.type == TableDocumentsType.User) {
-        return publicFields.concat(
-            { key: "actions" }
-        )
-    } else {
-        // public
-        return publicFields
-    }
-}
-)
-
-// Methods
-function deleteDocument(document: DocumentMetadata) {
-    return documentsStore.deleteDocument(document.name)
-}
-function download(document: DocumentMetadata) {
-    return documentsStore.downloadRaw(document.name)
-}
-function loadSourceLayer() {
-    loading.value = true
-    API.getJobDocumentResult(props.corpus?.uuid, SOURCE_LAYER, previewDocument.value.name)
-        .then(response => {
-            const encodedDocName = encodeURI(previewDocument.value.name)
-            // Only load the preview if the response is for the current document
-            if (response.request.responseURL.includes(encodedDocName)) {
-                preview.value = response.data.preview
-                loading.value = false
-            }
-        })
-        .catch(error => {
-            app.handleServerError("get job document result", error)
-        })
-}
-
-// Watches & mounts
-// When previewDocument is not null, the GModal already opens. So also autoload the source layer.
-watch(() => previewDocument.value, () => {
-    if (previewDocument.value !== null)
-        loadSourceLayer()
-})
-// Reload docs on uuid change (and onMounted). But don't show user docs on dataset tab.
-watch(() => props.corpus?.uuid, () => {
-    if (props.type == TableDocumentsType.Dataset && !props.corpus?.dataset)
-        return
-    documentsStore.reloadDocumentsForCorpus(props.corpus?.uuid)
-}, { immediate: true })
-// Reset any previous selection.
-// E.g. when switching between datasets and user corpora.
-onMounted(() => {
-    documentsStore.available = []
-})
-</script>
+<template>
+    <div>
+
+        <GTable :columns :items="documentsStore.available" :loading="documentsStore.loading" :displayOnEmpty="false"
+            sortedByColumn="name" :sortDesc="false" hoverRow>
+            <template #title>
+                <span v-if="!corpus || (type == TableDocumentsType.Dataset && !corpus.dataset)">
+                    No documents
+                </span>
+                <span v-else>
+                    {{ documentsStore.available.length }}
+                    {{ documentsStore.available.length === 1 ? 'document' : 'documents' }}
+                    in corpus <i>{{ corpus.name }}</i>
+                </span>
+            </template>
+
+            <template #help>
+                <slot name="help">
+                    <component :is="help.documents"></component>
+                </slot>
+            </template>
+
+            <template #table-empty-instruction>
+                <span v-if="!corpus || (type == TableDocumentsType.Dataset && !corpus?.dataset)">No corpus
+                    selected.</span>
+                <span v-else-if="corpus?.uuid && type != TableDocumentsType.Dataset" style="margin-top:10px">
+                    This corpus is empty. Upload documents to the corpus.
+                </span>
+            </template>
+
+            <template #header>
+                <UploadDocuments v-if="userStore.hasWriteAccess && type != TableDocumentsType.Dataset" />
+            </template>
+
+            <!-- valid cell -->
+            <template #cell-valid="data">
+                {{ data.value ? '👍' : '🔥' }}
+            </template>
+
+            <!-- name cell -->
+            <template #cell-name="data">
+                <div style="max-height: 3em; line-break: anywhere; overflow: hidden; min-width:80px">{{ data.value }}
+                </div>
+            </template>
+
+            <!-- size cell -->
+            <template #cell-size="data">
+                {{ data.value }}
+            </template>
+
+            <template #head-layerSummary>
+                source annotations<br>
+                (token / PoS / lemma)
+            </template>
+            <!-- layerSummary cell -->
+            <template #cell-layerSummary="data">
+                <RightFloatCell>
+                    <template #left>
+                        {{ data.value.numWordForms }} /
+                        {{ data.value.numPOS }} /
+                        {{ data.value.numLemma }}
+                    </template>
+                    <template #right>
+                        <InspectButton v-if="data.value.numWordForms > 0" @click="previewDocument = data.item" />
+                    </template>
+                </RightFloatCell>
+            </template>
+
+            <!-- plain text preview cell -->
+            <template #cell-preview="data">
+                <div style="min-width: 200px; max-height: 3em; overflow: hidden;">{{ data.value }}</div>
+            </template>
+
+            <!-- size in bytes cell -->
+            <!-- <template #cell-sizeInBytes="data">
+                <span v-if="data.value > 1023">{{Utils.formatBytes(data.value)}}</span>
+                <span v-else>~ 0</span>
+            </template> -->
+
+            <!-- last modified cell -->
+            <template #cell-lastModified="data">
+                <span style="white-space:nowrap">{{ new Date(data.value).toLocaleString("nl", {
+                    year: "2-digit",
+                    month: "2-digit",
+                    day: "numeric",
+                    hour: "2-digit",
+                    minute: "2-digit",
+                }) }}</span>
+            </template>
+
+            <!-- actions cell -->
+            <template #cell-actions="data">
+                <div style="display: flex;">
+
+                    <DownloadButton @click="download(data.item)" />
+
+                    <GButton red @click="deleteDocumentData = data.item; showDeleteModal = true" title="Delete">
+                        <i class="fa fa-trash"></i>
+                    </GButton>
+                </div>
+            </template>
+
+        </GTable>
+
+        <!-- preview modal -->
+        <GModal :show="previewDocument !== null" @hide="preview = null; previewDocument = null"
+            :title="`Preview of document ${previewDocument ? previewDocument.name : ''}`" style="text-align: center">
+            <template #title>Source layer preview of document {{ previewDocument ? previewDocument.name : ""
+                }}</template>
+            <template #help>
+                Here you can inspect a small part of the source layer of the document.
+            </template>
+            <template v-if="loading">
+                <p>Loading...</p>
+                <GSpinner medium />
+            </template>
+            <LayerViewer v-else :layer="preview" />
+
+        </GModal>
+
+        <!-- delete modal -->
+        <DeleteModal :show="showDeleteModal" :item="deleteDocumentData"
+            :displayname="'document ' + (deleteDocumentData !== null ? deleteDocumentData.name : '[null]') + ' and associated results'"
+            @hide="showDeleteModal = false" @delete="deleteDocument" />
+
+    </div>
+</template>
+
+<script setup lang='ts'>
+// Libraries & stores
+import { computed, ref, PropType, watch, onMounted } from 'vue'
+import stores from '@/stores'
+// API & types
+import * as API from '@/api/jobs'
+import { TableDocumentsType, Field } from '@/types/table'
+import { DocumentMetadata } from '@/types/documents'
+import { CorpusMetadata } from '@/types/corpora'
+import { LayerPreview, SOURCE_LAYER } from '@/types/jobs'
+// Components
+import { GButton, GModal, GTable, DownloadButton, DeleteModal, RightFloatCell, InspectButton } from '@/components'
+import LayerViewer from '@/components/tables/LayerViewer.vue'
+import UploadDocuments from '@/components/input/UploadDocuments.vue'
+import help from '@/components/help'
+
+// Stores
+const app = stores.useApp()
+const documentsStore = stores.useDocuments()
+const userStore = stores.useUser()
+
+// Props
+const props = defineProps({
+    type: String as PropType<TableDocumentsType>, // the mode of the table
+    corpus: { type: Object as PropType<CorpusMetadata>, default: null },
+})
+
+// Fields
+const deleteDocumentData = ref(null as null | DocumentMetadata)
+const previewDocument = ref(null as null | DocumentMetadata)
+const preview = ref(null as null | LayerPreview)
+const showDeleteModal = ref(false)
+const loading = ref(false)
+
+const columns: Field[] = computed(() => {
+    const publicFields = [
+        // { key: "valid", sortOn: (x: Document) => x.valid },
+        { key: "name", sortOn: (x: DocumentMetadata) => x.name, textAlign: "left" },
+        { key: "format", sortOn: (x: DocumentMetadata) => x.format },
+        { key: "preview", textAlign: "left" },
+        // { key: "sizeInBytes", label: "size", sortOn: (x: Document) => x.sizeInBytes },
+        // { key: "numChars", label: "size (chars)", sortOn: (x: DocumentMetadata) => x.numChars },
+        { key: "layerSummary" },
+        { key: "lastModified", label: "last modified", sortOn: (x: DocumentMetadata) => x.lastModified }
+    ] as Field[];
+    if (userStore.hasWriteAccess && props.type == TableDocumentsType.User) {
+        return publicFields.concat(
+            { key: "actions" }
+        )
+    } else {
+        // public
+        return publicFields
+    }
+}
+)
+
+// Methods
+function deleteDocument(document: DocumentMetadata) {
+    return documentsStore.deleteDocument(document.name)
+}
+function download(document: DocumentMetadata) {
+    return documentsStore.downloadRaw(document.name)
+}
+function loadSourceLayer() {
+    loading.value = true
+    API.getJobDocumentResult(props.corpus?.uuid, SOURCE_LAYER, previewDocument.value.name)
+        .then(response => {
+            const encodedDocName = encodeURI(previewDocument.value.name)
+            // Only load the preview if the response is for the current document
+            if (response.request.responseURL.includes(encodedDocName)) {
+                preview.value = response.data.preview
+                loading.value = false
+            }
+        })
+        .catch(error => {
+            app.handleServerError("get job document result", error)
+        })
+}
+
+// Watches & mounts
+// When previewDocument is not null, the GModal already opens. So also autoload the source layer.
+watch(() => previewDocument.value, () => {
+    if (previewDocument.value !== null)
+        loadSourceLayer()
+})
+// Reload docs on uuid change (and onMounted). But don't show user docs on dataset tab.
+watch(() => props.corpus?.uuid, () => {
+    if (props.type == TableDocumentsType.Dataset && !props.corpus?.dataset)
+        return
+    documentsStore.reloadDocumentsForCorpus(props.corpus?.uuid)
+}, { immediate: true })
+// Reset any previous selection.
+// E.g. when switching between datasets and user corpora.
+onMounted(() => {
+    documentsStore.available = []
+})
+</script>
diff --git a/client/src/components/tables/GTable.vue b/client/src/components/tables/GTable.vue
index 33ef4ec..2378169 100644
--- a/client/src/components/tables/GTable.vue
+++ b/client/src/components/tables/GTable.vue
@@ -1,455 +1,455 @@
-<template>
-    <GCard :showHelp="showHelp" :headless="headless" :helpSubject="helpSubject" :noHelp>
-        <template #title>
-            <slot name="title">{{ title }}</slot>
-        </template>
-        <template #help>
-            <slot name="help"></slot>
-        </template>
-
-        <div v-if="loading" style="text-align: center; margin:10px 0">
-            <GSpinner medium />
-        </div>
-
-        <template #header>
-            <slot name="header"></slot>
-        </template>
-        <div id="prepend">
-            <slot name="prepend"></slot>
-        </div>
-
-        <slot v-if="items && items.length === 0 && !loading" name="table-empty-instruction">
-            Here should be an instruction how to fill the content.
-        </slot>
-        <table :class="`${cssClass} ${loading ? ' loading' : ''} ${selectable ? ' selectable' : ''}`">
-            <thead v-if="!(isEmpty && !displayOnEmpty)">
-                <tr>
-                    <th v-for="field in visibleFields" :key="field.key" style="text-align: center;">
-                        <div style="white-space: pre-line">
-                            <!-- specific head -->
-                            <slot :name="'head-' + field.key" :field=field>
-                                <!-- generic head -->
-                                <slot name="head" :field=field>{{ field.label || field.key }}</slot>
-                            </slot>
-
-                        </div>
-                        <span v-if="field.sortOn">
-                            <span v-if="sortedBy != field.key" class="sort-control">
-                                <span @click="sortBy(field.key, false)">▲</span> | <span
-                                    @click="sortBy(field.key, true)">▼</span>
-                            </span>
-                            <span v-else class="sort-control">
-                                <span v-if="!sortIsDesc" class="sort-control active">▲</span>
-                                <span v-else @click="sortBy(field.key, false)" class="sort-control">▲</span>
-                                <span class="sort-control active"> | </span>
-                                <span v-if="sortIsDesc" class="sort-control active">▼</span>
-                                <span v-else @click="sortBy(field.key, true)" class="sort-control">▼</span>
-                            </span>
-                        </span>
-                        <span v-else></span>
-                    </th>
-                </tr>
-            </thead>
-            <tbody>
-                <!-- the rows -->
-                <template v-for="item, i in itemsToDisplay" :key="'row' + i">
-                    <tr @click="rowClicked(item)" @dblclick="rowClicked(item); $emit('rowDoubleClicked')"
-                        :class="(equal(modelValue, item) ? 'selected' : '') + ' ' + (selectable ? 'cursor-pointer' : '')">
-                        <td v-for="field in visibleFields" :key="field.key"
-                            :style="`text-align: ${field.textAlign || 'center'};`">
-                            <!-- specific cell rendering -->
-                            <slot :name="'cell-' + field.key" :field="_field(field)" :item="item"
-                                :value="item[field.key] || ''">
-                                <!-- generic cell rendering -->
-                                <slot name="cell" :field="_field(field)" :item="item" :value="item[field.key] || ''">
-                                    {{ item[field.key] }}</slot>
-                            </slot>
-                        </td>
-                    </tr>
-                    <!-- details -->
-                    <tr :key="'_details' + i" v-if="item._showDetails" class="details">
-                        <td :colspan="visibleFields.length">
-                            <slot name="_details" :item="item"></slot>
-                        </td>
-                    </tr>
-                </template>
-                <!-- filler -->
-                <template v-if="fill && items.length > 0">
-                    <tr v-for="filler in (0, pageSize - itemsToDisplay.length)" :key="itemsToDisplay.length + filler">
-                        <td v-for="field in visibleFields" :key="field.key"><br></td>
-                    </tr>
-                </template>
-                <!-- <tr id="append-row" key="append-row">
-                        <slot name="append-row"></slot>
-                    </tr> -->
-            </tbody>
-        </table>
-        <div id="footer" v-if="!(isEmpty && !displayOnEmpty)">
-            <!-- page controls -->
-            <div v-if="numPages > 1" id="page-controls" @click="this.$nextTick(() => this.$refs.test.scrollIntoView())"
-                ref="test">
-                <GButton plain @click="page = 1" :disabled="page == 1">1</GButton>
-                <GButton plain @click="page > 1 ? page -= 1 : null" :disabled="page == 1" title="Previous">
-                    <i class="fa fa-arrow-left"></i>
-                </GButton>
-                <select v-model=page>
-                    <option v-for="pageNumber in numPages" :key="pageNumber" :value=pageNumber>{{ pageNumber }}</option>
-                </select>
-                <GButton plain @click="page < numPages ? page += 1 : null" :disabled="page == numPages" title="Next">
-                    <i class="fa fa-arrow-right"></i>
-                </GButton>
-                <GButton plain @click="page = numPages" :disabled="page == numPages">{{ numPages }}</GButton>
-            </div>
-        </div>
-
-        <!-- append will be displayed even when isEmpty && !displayOnEmpty -->
-        <div id="append">
-            <slot name="append"></slot>
-        </div>
-    </GCard>
-</template>
-
-<script lang='ts'>
-// Libraries & stores
-import { defineComponent, PropType } from 'vue'
-// API & types
-import { Field } from '@/types/table'
-// Components
-import help from '@/components/help'
-import GButton from '@/components/input/GButton.vue'
-import GCard from '@/components/GCard.vue'
-
-type Item = { [key: string]: unknown }
-
-export default defineComponent({
-    name: "GTable",
-    emits: ['rowClicked', 'rowDoubleClicked', 'update:modelValue'],
-    components: { GCard, GButton },
-    props: {
-        title: { type: String, default: "You forgot the title" },
-        displayOnEmpty: { type: Boolean, default: false },
-        columns: { type: Array as PropType<Field[]>, default() { return [] } },
-        fill: { type: Boolean, default: false },
-        headless: { type: Boolean, default: false },
-        loading: { type: Boolean, default: false },
-        selectable: { type: Boolean, default: false },
-        sortedByField: { type: String, default: null },
-        sortDesc: { type: Boolean, default: true },
-        compact: { type: Boolean, default: false },
-        showHelp: { type: Boolean, default: false },
-        items: { type: Array as PropType<Item[]>, default() { return [] } },
-        modelValue: { type: Object as PropType<Item>, default: null }, // use in conjunction with 'selectable' to make a v-model
-        helpSubject: { type: String as () => keyof typeof help },
-        noHelp: { type: Boolean, default: false }
-    },
-    //   model: {
-    //       prop: 'value',
-    //       event: 'valueUpdated'
-    //   },
-    data() {
-        return {
-            page: 1,
-            sortIsDesc: this.sortDesc as boolean,
-            sortedBy: this.sortedByField as null | string
-        }
-    },
-    computed: {
-        cssClass() {
-            let ret = ""
-            this.compact ? ret += "compact " : ''
-            return ret
-        },
-        isEmpty(): boolean {
-            return !this.items || this.items.length === 0;
-        },
-        itemsToDisplay(): Item[] {
-            const page = this.page
-            const pageSize = this.pageSize
-            function getPageItems(allItems: Item[]) {
-                return allItems.slice((page - 1) * pageSize, (page) * pageSize)
-            }
-
-            // only paginate
-            if (this.sortedBy === null) return getPageItems(this.items)
-
-            const sortOn = this.columns.filter(field => (field.key == this.sortedBy))[0]?.sortOn //hmm
-            function mapToSortProp(x: any) {
-                return sortOn ? sortOn(x) : x
-            }
-
-            if (this.sortedBy === null) {
-                // no sort, just paginate
-                return getPageItems(this.items)
-            } else {
-                // sort and then paginate
-                const allItems = this.items.slice().sort(
-                    (a: Item, b: Item) =>
-                        (-1) ** (+this.sortIsDesc | 0) *
-                        this.compareAny(mapToSortProp(a), mapToSortProp(b))
-                )
-                return getPageItems(allItems)
-            }
-        },
-        numPages(): number {
-            return Math.ceil(this.items.length / this.pageSize)
-        },
-        pageSize(): number {
-            if (!this.items) return 20
-            // We allow for some leniency since we don't want the user to go to the next page just to see one entry
-            if (this.items.length <= 50) return this.items.length
-            return this.items.length > 20 ? 20 : this.items.length
-        },
-        primaryKeyFields(): string[] {
-            return this.columns.filter(field => field.isPrimaryField).map(field => field.key)
-        },
-        visibleFields() {
-            return this.columns.filter(field => !field.hidden);
-        }
-    },
-    methods: {
-        anyIncludes(whole: unknown, part: unknown): boolean {
-            if (!whole) return false
-            return (whole as Record<string, unknown> | unknown[]).toString().includes((part as Record<string, unknown> | unknown[]).toString())
-        },
-        compareAny(a: unknown, b: unknown): number {
-            // null and undefined are always smaller
-            if (this.nu(a) && this.nu(b)) return 0
-            if (this.nu(a)) return -1
-            if (this.nu(b)) return 1
-
-            // Infinity is always bigger
-            if (a === Infinity) return 1
-            if (b === Infinity) return -1
-
-            if (typeof a === "number" && typeof b === "number") {
-                return a - b
-            } else if (typeof a === "string" && typeof b === "string") {
-                return a.localeCompare(b)
-            } else if (Array.isArray(a) && Array.isArray(b)) {
-                if (a.length === 0 && b.length === 0) return 0
-                if (a.length === 0) return -1
-                if (b.length === 0) return 1
-                return this.compareAny(a[0], b[0]) // Approximate               
-            } else if (typeof a === 'boolean' && typeof b === 'boolean') {
-                if (a === b) return 0
-                if (a) return 1
-                return -1
-            } else {
-                //garbage
-                return 0
-            }
-        },
-        _field(field: Field): Field {
-            if (!field.label) {
-                field.label = field.key
-            }
-            return field
-        },
-        equal(item1: Item, item2: Item): boolean {
-            // tests for equality of two items based an the primary key fields
-            if (this.primaryKeyFields.length === 0) return item1 === item2
-            if (this.nu(item1) && this.nu(item2)) return true
-            if (this.nu(item1) || this.nu(item2)) return false
-            return this.primaryKeyFields.map((key: string) => item1[key] === item2[key]).filter(x => !x).length === 0
-        },
-        nu(v: unknown) { return v === null || v === undefined }, //utility
-        rowClicked(item: Item): void {
-            if (this.selectable) {
-                this.$emit('update:modelValue', item)
-            } else {
-                this.$emit('rowClicked', item)
-            }
-        },
-        sortBy(key: string, sortIsDesc: boolean): void {
-            this.sortedBy = key
-            this.sortIsDesc = sortIsDesc
-            // Reset to first page to see the effect of sorting.
-            this.page = 1
-        }
-    },
-    watch: {
-        numPages(newVal) {
-            if (this.page > newVal && newVal > 0) {
-                this.page = newVal
-            }
-        },
-    }
-});
-</script>
-
-<style scoped lang="scss">
-*:deep(.table-controls) {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 20px;
-    justify-content: center;
-    align-content: stretch;
-
-    .table-control {
-        flex-basis: 100px;
-        min-height: 100px;
-
-        &.slider {
-            /*Some overrides because the slider looks bad when small*/
-            flex: 1;
-            min-width: 200px;
-            padding: 0px 20px;
-            max-width: 400px;
-        }
-    }
-}
-
-.cursor-pointer {
-    cursor: pointer;
-}
-
-#footer {
-    overflow: hidden;
-    display: flex;
-    justify-content: center;
-}
-
-#prepend {
-    margin-bottom: 15px;
-}
-
-#page-controls {
-    background-color: var(--white);
-    border: 1px solid none;
-    color: var(--black);
-    float: right;
-    padding: 10px;
-    -webkit-user-select: none;
-    /* Safari */
-    -moz-user-select: none;
-    /* Firefox */
-    -ms-user-select: none;
-    /* IE10+/Edge */
-    user-select: none;
-    /* Standard */
-}
-
-#page-controls select {
-    margin: 5px;
-}
-
-#page-controls span {
-    margin: 5px;
-}
-
-#page-controls .inactive {
-    color: var(--int-light-grey);
-}
-
-.sort-control {
-    white-space: nowrap;
-    color: var(--white);
-    -webkit-user-select: none;
-    /* Safari */
-    -moz-user-select: none;
-    /* Firefox */
-    -ms-user-select: none;
-    /* IE10+/Edge */
-    user-select: none;
-
-    /* Standard */
-    span {
-        cursor: pointer
-    }
-}
-
-.sort-control.active {
-    color: black;
-}
-
-table.loading tbody,
-table.loading thead {
-    filter: grayscale(100%) sepia(100%) blur(5px);
-}
-
-table.loading .loading-symbol {
-    opacity: 1;
-    visibility: visible;
-}
-
-table .loading-symbol {
-    transition: opacity 2s ease, visibility 2s ease;
-    opacity: 0;
-    z-index: 3;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    visibility: hidden;
-}
-
-table {
-    border-collapse: collapse;
-    margin: 0 auto;
-    margin-top: 5px;
-    padding: 0;
-
-    caption {
-        font-size: 1.5em;
-        margin: .5em 0 .75em;
-    }
-
-    tr {
-        border: 1px solid var(--int-very-light-grey-hover);
-
-        &:nth-child(even) {
-            background: #fff;
-        }
-
-        &:nth-child(odd) {
-            background: var(--int-very-light-grey);
-        }
-    }
-
-    thead {
-        >tr {
-            background-color: var(--int-theme) !important;
-        }
-    }
-
-    th {
-        padding: .6em;
-        text-align: center;
-        font-size: .85em;
-        letter-spacing: .1em;
-        text-transform: uppercase;
-    }
-
-    td {
-        padding: .5em;
-        text-align: center;
-        min-width: 60px;
-    }
-
-    overflow-x: auto;
-}
-
-table.compact {
-
-    td,
-    th {
-        padding: .1em 2em;
-    }
-
-    margin: 0;
-}
-
-table.selectable {
-    tr:hover:not(.selected) {
-        background: var(--int-very-light-grey-hover);
-    }
-}
-
-table tr.selected {
-    background-color: var(--int-theme-lighter);
-}
-
-* {
-    box-sizing: border-box;
-}
+<template>
+    <GCard :showHelp="showHelp" :headless="headless" :helpSubject="helpSubject" :noHelp>
+        <template #title>
+            <slot name="title">{{ title }}</slot>
+        </template>
+        <template #help>
+            <slot name="help"></slot>
+        </template>
+
+        <div v-if="loading" style="text-align: center; margin:10px 0">
+            <GSpinner medium />
+        </div>
+
+        <template #header>
+            <slot name="header"></slot>
+        </template>
+        <div id="prepend">
+            <slot name="prepend"></slot>
+        </div>
+
+        <slot v-if="items && items.length === 0 && !loading" name="table-empty-instruction">
+            Here should be an instruction how to fill the content.
+        </slot>
+        <table :class="`${cssClass} ${loading ? ' loading' : ''} ${selectable ? ' selectable' : ''}`">
+            <thead v-if="!(isEmpty && !displayOnEmpty)">
+                <tr>
+                    <th v-for="field in visibleFields" :key="field.key" style="text-align: center;">
+                        <div style="white-space: pre-line">
+                            <!-- specific head -->
+                            <slot :name="'head-' + field.key" :field=field>
+                                <!-- generic head -->
+                                <slot name="head" :field=field>{{ field.label || field.key }}</slot>
+                            </slot>
+
+                        </div>
+                        <span v-if="field.sortOn">
+                            <span v-if="sortedBy != field.key" class="sort-control">
+                                <span @click="sortBy(field.key, false)">▲</span> | <span
+                                    @click="sortBy(field.key, true)">▼</span>
+                            </span>
+                            <span v-else class="sort-control">
+                                <span v-if="!sortIsDesc" class="sort-control active">▲</span>
+                                <span v-else @click="sortBy(field.key, false)" class="sort-control">▲</span>
+                                <span class="sort-control active"> | </span>
+                                <span v-if="sortIsDesc" class="sort-control active">▼</span>
+                                <span v-else @click="sortBy(field.key, true)" class="sort-control">▼</span>
+                            </span>
+                        </span>
+                        <span v-else></span>
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                <!-- the rows -->
+                <template v-for="item, i in itemsToDisplay" :key="'row' + i">
+                    <tr @click="rowClicked(item)" @dblclick="rowClicked(item); $emit('rowDoubleClicked')"
+                        :class="(equal(modelValue, item) ? 'selected' : '') + ' ' + (selectable ? 'cursor-pointer' : '')">
+                        <td v-for="field in visibleFields" :key="field.key"
+                            :style="`text-align: ${field.textAlign || 'center'};`">
+                            <!-- specific cell rendering -->
+                            <slot :name="'cell-' + field.key" :field="_field(field)" :item="item"
+                                :value="item[field.key] || ''">
+                                <!-- generic cell rendering -->
+                                <slot name="cell" :field="_field(field)" :item="item" :value="item[field.key] || ''">
+                                    {{ item[field.key] }}</slot>
+                            </slot>
+                        </td>
+                    </tr>
+                    <!-- details -->
+                    <tr :key="'_details' + i" v-if="item._showDetails" class="details">
+                        <td :colspan="visibleFields.length">
+                            <slot name="_details" :item="item"></slot>
+                        </td>
+                    </tr>
+                </template>
+                <!-- filler -->
+                <template v-if="fill && items.length > 0">
+                    <tr v-for="filler in (0, pageSize - itemsToDisplay.length)" :key="itemsToDisplay.length + filler">
+                        <td v-for="field in visibleFields" :key="field.key"><br></td>
+                    </tr>
+                </template>
+                <!-- <tr id="append-row" key="append-row">
+                        <slot name="append-row"></slot>
+                    </tr> -->
+            </tbody>
+        </table>
+        <div id="footer" v-if="!(isEmpty && !displayOnEmpty)">
+            <!-- page controls -->
+            <div v-if="numPages > 1" id="page-controls" @click="this.$nextTick(() => this.$refs.test.scrollIntoView())"
+                ref="test">
+                <GButton plain @click="page = 1" :disabled="page == 1">1</GButton>
+                <GButton plain @click="page > 1 ? page -= 1 : null" :disabled="page == 1" title="Previous">
+                    <i class="fa fa-arrow-left"></i>
+                </GButton>
+                <select v-model=page>
+                    <option v-for="pageNumber in numPages" :key="pageNumber" :value=pageNumber>{{ pageNumber }}</option>
+                </select>
+                <GButton plain @click="page < numPages ? page += 1 : null" :disabled="page == numPages" title="Next">
+                    <i class="fa fa-arrow-right"></i>
+                </GButton>
+                <GButton plain @click="page = numPages" :disabled="page == numPages">{{ numPages }}</GButton>
+            </div>
+        </div>
+
+        <!-- append will be displayed even when isEmpty && !displayOnEmpty -->
+        <div id="append">
+            <slot name="append"></slot>
+        </div>
+    </GCard>
+</template>
+
+<script lang='ts'>
+// Libraries & stores
+import { defineComponent, PropType } from 'vue'
+// API & types
+import { Field } from '@/types/table'
+// Components
+import help from '@/components/help'
+import GButton from '@/components/input/GButton.vue'
+import GCard from '@/components/GCard.vue'
+
+type Item = { [key: string]: unknown }
+
+export default defineComponent({
+    name: "GTable",
+    emits: ['rowClicked', 'rowDoubleClicked', 'update:modelValue'],
+    components: { GCard, GButton },
+    props: {
+        title: { type: String, default: "You forgot the title" },
+        displayOnEmpty: { type: Boolean, default: false },
+        columns: { type: Array as PropType<Field[]>, default() { return [] } },
+        fill: { type: Boolean, default: false },
+        headless: { type: Boolean, default: false },
+        loading: { type: Boolean, default: false },
+        selectable: { type: Boolean, default: false },
+        sortedByColumn: { type: String, default: null },
+        sortDesc: { type: Boolean, default: true },
+        compact: { type: Boolean, default: false },
+        showHelp: { type: Boolean, default: false },
+        items: { type: Array as PropType<Item[]>, default() { return [] } },
+        modelValue: { type: Object as PropType<Item>, default: null }, // use in conjunction with 'selectable' to make a v-model
+        helpSubject: { type: String as () => keyof typeof help },
+        noHelp: { type: Boolean, default: false }
+    },
+    //   model: {
+    //       prop: 'value',
+    //       event: 'valueUpdated'
+    //   },
+    data() {
+        return {
+            page: 1,
+            sortIsDesc: this.sortDesc as boolean,
+            sortedBy: this.sortedByColumn as null | string
+        }
+    },
+    computed: {
+        cssClass() {
+            let ret = ""
+            this.compact ? ret += "compact " : ''
+            return ret
+        },
+        isEmpty(): boolean {
+            return !this.items || this.items.length === 0;
+        },
+        itemsToDisplay(): Item[] {
+            const page = this.page
+            const pageSize = this.pageSize
+            function getPageItems(allItems: Item[]) {
+                return allItems.slice((page - 1) * pageSize, (page) * pageSize)
+            }
+
+            // only paginate
+            if (this.sortedBy === null) return getPageItems(this.items)
+
+            const sortOn = this.columns.filter(field => (field.key == this.sortedBy))[0]?.sortOn //hmm
+            function mapToSortProp(x: any) {
+                return sortOn ? sortOn(x) : x
+            }
+
+            if (this.sortedBy === null) {
+                // no sort, just paginate
+                return getPageItems(this.items)
+            } else {
+                // sort and then paginate
+                const allItems = this.items.slice().sort(
+                    (a: Item, b: Item) =>
+                        (-1) ** (+this.sortIsDesc | 0) *
+                        this.compareAny(mapToSortProp(a), mapToSortProp(b))
+                )
+                return getPageItems(allItems)
+            }
+        },
+        numPages(): number {
+            return Math.ceil(this.items.length / this.pageSize)
+        },
+        pageSize(): number {
+            if (!this.items) return 20
+            // We allow for some leniency since we don't want the user to go to the next page just to see one entry
+            if (this.items.length <= 50) return this.items.length
+            return this.items.length > 20 ? 20 : this.items.length
+        },
+        primaryKeyFields(): string[] {
+            return this.columns.filter(field => field.isPrimaryField).map(field => field.key)
+        },
+        visibleFields() {
+            return this.columns.filter(field => !field.hidden);
+        }
+    },
+    methods: {
+        anyIncludes(whole: unknown, part: unknown): boolean {
+            if (!whole) return false
+            return (whole as Record<string, unknown> | unknown[]).toString().includes((part as Record<string, unknown> | unknown[]).toString())
+        },
+        compareAny(a: unknown, b: unknown): number {
+            // null and undefined are always smaller
+            if (this.nu(a) && this.nu(b)) return 0
+            if (this.nu(a)) return -1
+            if (this.nu(b)) return 1
+
+            // Infinity is always bigger
+            if (a === Infinity) return 1
+            if (b === Infinity) return -1
+
+            if (typeof a === "number" && typeof b === "number") {
+                return a - b
+            } else if (typeof a === "string" && typeof b === "string") {
+                return a.localeCompare(b)
+            } else if (Array.isArray(a) && Array.isArray(b)) {
+                if (a.length === 0 && b.length === 0) return 0
+                if (a.length === 0) return -1
+                if (b.length === 0) return 1
+                return this.compareAny(a[0], b[0]) // Approximate               
+            } else if (typeof a === 'boolean' && typeof b === 'boolean') {
+                if (a === b) return 0
+                if (a) return 1
+                return -1
+            } else {
+                //garbage
+                return 0
+            }
+        },
+        _field(field: Field): Field {
+            if (!field.label) {
+                field.label = field.key
+            }
+            return field
+        },
+        equal(item1: Item, item2: Item): boolean {
+            // tests for equality of two items based an the primary key fields
+            if (this.primaryKeyFields.length === 0) return item1 === item2
+            if (this.nu(item1) && this.nu(item2)) return true
+            if (this.nu(item1) || this.nu(item2)) return false
+            return this.primaryKeyFields.map((key: string) => item1[key] === item2[key]).filter(x => !x).length === 0
+        },
+        nu(v: unknown) { return v === null || v === undefined }, //utility
+        rowClicked(item: Item): void {
+            if (this.selectable) {
+                this.$emit('update:modelValue', item)
+            } else {
+                this.$emit('rowClicked', item)
+            }
+        },
+        sortBy(key: string, sortIsDesc: boolean): void {
+            this.sortedBy = key
+            this.sortIsDesc = sortIsDesc
+            // Reset to first page to see the effect of sorting.
+            this.page = 1
+        }
+    },
+    watch: {
+        numPages(newVal) {
+            if (this.page > newVal && newVal > 0) {
+                this.page = newVal
+            }
+        },
+    }
+});
+</script>
+
+<style scoped lang="scss">
+*:deep(.table-controls) {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 20px;
+    justify-content: center;
+    align-content: stretch;
+
+    .table-control {
+        flex-basis: 100px;
+        min-height: 100px;
+
+        &.slider {
+            /*Some overrides because the slider looks bad when small*/
+            flex: 1;
+            min-width: 200px;
+            padding: 0px 20px;
+            max-width: 400px;
+        }
+    }
+}
+
+.cursor-pointer {
+    cursor: pointer;
+}
+
+#footer {
+    overflow: hidden;
+    display: flex;
+    justify-content: center;
+}
+
+#prepend {
+    margin-bottom: 15px;
+}
+
+#page-controls {
+    background-color: var(--white);
+    border: 1px solid none;
+    color: var(--black);
+    float: right;
+    padding: 10px;
+    -webkit-user-select: none;
+    /* Safari */
+    -moz-user-select: none;
+    /* Firefox */
+    -ms-user-select: none;
+    /* IE10+/Edge */
+    user-select: none;
+    /* Standard */
+}
+
+#page-controls select {
+    margin: 5px;
+}
+
+#page-controls span {
+    margin: 5px;
+}
+
+#page-controls .inactive {
+    color: var(--int-light-grey);
+}
+
+.sort-control {
+    white-space: nowrap;
+    color: var(--white);
+    -webkit-user-select: none;
+    /* Safari */
+    -moz-user-select: none;
+    /* Firefox */
+    -ms-user-select: none;
+    /* IE10+/Edge */
+    user-select: none;
+
+    /* Standard */
+    span {
+        cursor: pointer
+    }
+}
+
+.sort-control.active {
+    color: black;
+}
+
+table.loading tbody,
+table.loading thead {
+    filter: grayscale(100%) sepia(100%) blur(5px);
+}
+
+table.loading .loading-symbol {
+    opacity: 1;
+    visibility: visible;
+}
+
+table .loading-symbol {
+    transition: opacity 2s ease, visibility 2s ease;
+    opacity: 0;
+    z-index: 3;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    visibility: hidden;
+}
+
+table {
+    border-collapse: collapse;
+    margin: 0 auto;
+    margin-top: 5px;
+    padding: 0;
+
+    caption {
+        font-size: 1.5em;
+        margin: .5em 0 .75em;
+    }
+
+    tr {
+        border: 1px solid var(--int-very-light-grey-hover);
+
+        &:nth-child(even) {
+            background: #fff;
+        }
+
+        &:nth-child(odd) {
+            background: var(--int-very-light-grey);
+        }
+    }
+
+    thead {
+        >tr {
+            background-color: var(--int-theme) !important;
+        }
+    }
+
+    th {
+        padding: .6em;
+        text-align: center;
+        font-size: .85em;
+        letter-spacing: .1em;
+        text-transform: uppercase;
+    }
+
+    td {
+        padding: .5em;
+        text-align: center;
+        min-width: 60px;
+    }
+
+    overflow-x: auto;
+}
+
+table.compact {
+
+    td,
+    th {
+        padding: .1em 2em;
+    }
+
+    margin: 0;
+}
+
+table.selectable {
+    tr:hover:not(.selected) {
+        background: var(--int-very-light-grey-hover);
+    }
+}
+
+table tr.selected {
+    background-color: var(--int-theme-lighter);
+}
+
+* {
+    box-sizing: border-box;
+}
 </style>
\ No newline at end of file
diff --git a/client/src/components/tables/MetricsTable.vue b/client/src/components/tables/MetricsTable.vue
index a66d600..eaed4d3 100644
--- a/client/src/components/tables/MetricsTable.vue
+++ b/client/src/components/tables/MetricsTable.vue
@@ -1,124 +1,124 @@
-<template>
-    <GTable :title :columns :items :loading helpSubject="evaluation" class="metricsTable" :sortedByField :noHelp>
-
-        <template #help>
-            <slot name="help">
-                <p><i>PoS comparison is base on the full PoS, including features.</i></p>
-                <p>Click on a entry to view samples.</p>
-            </slot>
-            <DifferentTagsetsHelp />
-        </template>
-
-        <template #table-empty-instruction>
-            Select a reference layer and a hypothesis layer to generate metrics.
-        </template>
-
-        <template #header v-if="loading">
-            <p>Generating metrics for large corpora may take a while...</p>
-        </template>
-
-        <template #prepend>
-            <slot name="prepend"></slot>
-        </template>
-
-        <template
-            v-for="cell in ['cell-accuracy', 'cell-precision', 'cell-recall', 'cell-f1', 'cell-macroPrecision', 'cell-microPrecision', 'cell-macroRecall', 'cell-microRecall', 'cell-macroF1', 'cell-microF1', 'cell-microAccuracy']"
-            #[cell]="data">
-            <div :key="cell">
-                {{ `${data.value ? parseFloat(data.value).toFixed(2) : 0}` }}
-            </div>
-        </template>
-
-        <template v-for="cell in ['cell-falsePositive', 'cell-falseNegative', 'cell-truePositive', 'cell-noMatch']"
-            #[cell]="data">
-            <div :key="cell">
-                <GButton :disabled="data.value.count === 0" @click="openModal(data)">
-                    {{ (`${(data.value.count / data.item.count * 100).toFixed(1)}%`) }}
-                    <i>({{ data.value.count.toString() }})</i>
-                </GButton>
-            </div>
-        </template>
-    </GTable>
-
-    <ComparisonModal :show=showModal @hide="showModal = false" :samples="samples"
-        @download="$emit('download', modalData)" :referenceJob="jobSelection.referenceJobId"
-        :hypothesisJob="jobSelection.hypothesisJobId" :downloading />
-</template>
-
-<script setup lang="ts">
-// Libraries & stores
-import { ref } from 'vue'
-import stores, { JobSelectionStore } from "@/stores"
-// Components
-import { GTable, GButton, ComparisonModal } from '@/components'
-import DifferentTagsetsHelp from '@/components/help/DifferentTagsetsHelp.vue'
-
-// Stores
-const jobSelection = stores.useJobSelection() as JobSelectionStore
-
-// Props
-const props = defineProps({
-    title: { type: String, default: "Metrics" },
-    columns: { type: Array, default: [] },
-    items: { type: Array, default: [] },
-    loading: { type: Boolean, default: false },
-    sortedByField: { type: String, default: "count" },
-    downloading: { type: Boolean, default: false },
-    noHelp: { type: Boolean, default: false }
-})
-
-// Emits
-defineEmits(['download'])
-
-// Fields
-const showModal = ref(false)
-const samples = ref({ title: "", samples: [] } as { title: string, samples: TermComparison[] })
-const modalData = ref({})
-
-// Methods
-/**
- * Open a set of samples in a modal.
- */
-function openModal(data) {
-    modalData.value = data
-    samples.value = { title: `${data.field.label} ${data.item.name} samples`, samples: data.value.samples }
-    showModal.value = true
-}
-</script>
-
-<style scoped lang="scss">
-.metricsTable td {
-    button {
-        display: block;
-        text-align: center;
-        width: 100%;
-        height: 100%;
-        margin: 0;
-        background-color: transparent;
-
-        &:hover {
-            background-color: var(--int-light-grey) !important;
-        }
-
-        &:focus {
-            background-color: var(--int-light-grey-hover) !important;
-        }
-    }
-}
-
-table button {
-    display: block;
-    width: initial;
-    white-space: initial;
-    margin: auto;
-}
-
-.metricsTable :deep(td) {
-    padding: 0 10px !important;
-    margin: 0;
-}
-
-.metricsTable :deep(.table-control) {
-    min-height: auto;
-}
-</style>
+<template>
+    <GTable :title :columns :items :loading helpSubject="evaluation" class="metricsTable" :sortedByColumn :noHelp>
+
+        <template #help>
+            <slot name="help">
+                <p><i>PoS comparison is base on the full PoS, including features.</i></p>
+                <p>Click on a entry to view samples.</p>
+            </slot>
+            <DifferentTagsetsHelp />
+        </template>
+
+        <template #table-empty-instruction>
+            Select a reference layer and a hypothesis layer to generate metrics.
+        </template>
+
+        <template #header v-if="loading">
+            <p>Generating metrics for large corpora may take a while...</p>
+        </template>
+
+        <template #prepend>
+            <slot name="prepend"></slot>
+        </template>
+
+        <template
+            v-for="cell in ['cell-accuracy', 'cell-precision', 'cell-recall', 'cell-f1', 'cell-macroPrecision', 'cell-microPrecision', 'cell-macroRecall', 'cell-microRecall', 'cell-macroF1', 'cell-microF1', 'cell-microAccuracy']"
+            #[cell]="data">
+            <div :key="cell">
+                {{ `${data.value ? parseFloat(data.value).toFixed(2) : 0}` }}
+            </div>
+        </template>
+
+        <template v-for="cell in ['cell-falsePositive', 'cell-falseNegative', 'cell-truePositive', 'cell-noMatch']"
+            #[cell]="data">
+            <div :key="cell">
+                <GButton :disabled="data.value.count === 0" @click="openModal(data)">
+                    {{ (`${(data.value.count / data.item.count * 100).toFixed(1)}%`) }}
+                    <i>({{ data.value.count.toString() }})</i>
+                </GButton>
+            </div>
+        </template>
+    </GTable>
+
+    <ComparisonModal :show=showModal @hide="showModal = false" :samples="samples"
+        @download="$emit('download', modalData)" :referenceJob="jobSelection.referenceJobId"
+        :hypothesisJob="jobSelection.hypothesisJobId" :downloading />
+</template>
+
+<script setup lang="ts">
+// Libraries & stores
+import { ref } from 'vue'
+import stores, { JobSelectionStore } from "@/stores"
+// Components
+import { GTable, GButton, ComparisonModal } from '@/components'
+import DifferentTagsetsHelp from '@/components/help/DifferentTagsetsHelp.vue'
+
+// Stores
+const jobSelection = stores.useJobSelection() as JobSelectionStore
+
+// Props
+const props = defineProps({
+    title: { type: String, default: "Metrics" },
+    columns: { type: Array, default: [] },
+    items: { type: Array, default: [] },
+    loading: { type: Boolean, default: false },
+    sortedByColumn: { type: String, default: "count" },
+    downloading: { type: Boolean, default: false },
+    noHelp: { type: Boolean, default: false }
+})
+
+// Emits
+defineEmits(['download'])
+
+// Fields
+const showModal = ref(false)
+const samples = ref({ title: "", samples: [] } as { title: string, samples: TermComparison[] })
+const modalData = ref({})
+
+// Methods
+/**
+ * Open a set of samples in a modal.
+ */
+function openModal(data) {
+    modalData.value = data
+    samples.value = { title: `${data.field.label} ${data.item.name} samples`, samples: data.value.samples }
+    showModal.value = true
+}
+</script>
+
+<style scoped lang="scss">
+.metricsTable td {
+    button {
+        display: block;
+        text-align: center;
+        width: 100%;
+        height: 100%;
+        margin: 0;
+        background-color: transparent;
+
+        &:hover {
+            background-color: var(--int-light-grey) !important;
+        }
+
+        &:focus {
+            background-color: var(--int-light-grey-hover) !important;
+        }
+    }
+}
+
+table button {
+    display: block;
+    width: initial;
+    white-space: initial;
+    margin: auto;
+}
+
+.metricsTable :deep(td) {
+    padding: 0 10px !important;
+    margin: 0;
+}
+
+.metricsTable :deep(.table-control) {
+    min-height: auto;
+}
+</style>
diff --git a/client/src/views/annotate/subviews/JobsView.vue b/client/src/views/annotate/subviews/JobsView.vue
index cf9983c..40f9f53 100644
--- a/client/src/views/annotate/subviews/JobsView.vue
+++ b/client/src/views/annotate/subviews/JobsView.vue
@@ -1,7 +1,7 @@
 <template>
     <AnnotateTab hideAnnotationsError>
         <GTable :title="`Jobs for corpus ${corporaStore.activeCorpus?.name}`" helpSubject="jobs" :columns
-            :items="displayJobs" :loading="jobsStore.loading" fill hoverRow sortedByField="id" :sortDesc="false"
+            :items="displayJobs" :loading="jobsStore.loading" fill hoverRow sortedByColumn="id" :sortDesc="false"
             class="jobsview">
 
             <template #help>
diff --git a/client/src/views/annotate/subviews/evaluate/subviews/ConfusionView.vue b/client/src/views/annotate/subviews/evaluate/subviews/ConfusionView.vue
index 752e79b..679b361 100644
--- a/client/src/views/annotate/subviews/evaluate/subviews/ConfusionView.vue
+++ b/client/src/views/annotate/subviews/evaluate/subviews/ConfusionView.vue
@@ -1,219 +1,219 @@
-<template>
-    <div>
-
-        <GTable title="Part-of-speech confusion" helpSubject="evaluation" :columns :items="rows" id="confusionTable"
-            :loading="loading" sortedByField="referenceJob" :sortDesc="false" hoverRow>
-            <template #help>
-                <p>
-                    In part-of-speech confusion, an overview is given of the matches (in green) and mismatches per PoS
-                    when comparing
-                    the tagging of the hypothesis layer with the reference layer. Click on any frequency below to show a
-                    data sample.
-                </p>
-                <p>
-                    The category "MULTIPLE" contains combined tags like "ADP+NOU" or "VRB+PD+PD". These are shown in one
-                    cell, but this does not mean that the taggers agree on the exact tags. Click on the cell or look at
-                    the Global Metrics for more details.
-                </p>
-                <DifferentTagsetsHelp />
-            </template>
-
-            <template #table-empty-instruction>Select a reference layer and a hypothesis layer to generate a confusion
-                table.</template>
-
-            <!-- top left header -->
-            <template #head-referenceJob>
-                part-of-speech <br>
-                ({{ jobSelection.hypothesisJobId }}→)<br>
-                ({{ jobSelection.referenceJobId }}↓)
-            </template>
-
-            <!-- custom cell rendering -->
-            <template #cell="data: Cell">
-
-                <!-- header column -->
-                <div v-if="data.field.key == 'referenceJob'">
-                    {{ data.value }}
-                </div>
-
-                <!-- cell -->
-                <GButton v-else :disabled="!data.value.count" :class=cssClass(data) @click="openModal(data)">
-                    {{ `${(data.value ? data.value.count : 0).toString().padStart(3, '&nbsp;')}` }}
-                </GButton>
-
-            </template>
-
-        </GTable>
-
-        <ComparisonModal :show="showModal" @hide="showModal = false" :samples="samples" :downloading
-            @download="(data) => download(data)" :referenceJob="jobSelection.referenceJobId"
-            :hypothesisJob="jobSelection.hypothesisJobId" />
-
-        <EvaluationInfoBox :eval="confusion" />
-
-    </div>
-</template>
-
-<script setup lang='ts'>
-// Libraries & stores
-import { computed, ref } from 'vue'
-import stores, { JobSelectionStore, CorporaStore, AppStore } from '@/stores'
-import { storeToRefs } from 'pinia'
-// API & types
-import { Field } from '@/types/table'
-import { TermComparison, EvaluationEntry } from "@/types/evaluation"
-import { MISC } from '@/stores/evaluation/confusion'
-import * as API from '@/api/evaluation'
-import * as Utils from "@/api/utils"
-// Components
-import { GButton, GInfo, GTable, EvaluationInfoBox, ComparisonModal } from '@/components'
-import DifferentTagsetsHelp from '@/components/help/DifferentTagsetsHelp.vue'
-
-// Stores
-const { loading, confusion } = storeToRefs(stores.useConfusion())
-const corporaStore = stores.useCorpora() as CorporaStore
-const jobSelection = stores.useJobSelection() as JobSelectionStore
-const app = stores.useApp() as AppStore
-
-// Custom types
-type Item = { [key: string]: EvaluationEntry } & { referenceJob: string }
-type Cell = { field: Field; item: Item; value: EvaluationEntry }
-
-// Fields
-const downloading = ref(false)
-const modalData = ref({})
-const samples = ref({ title: "", samples: [] } as { title: string, samples: TermComparison[] })
-const showModal = ref(false)
-
-const columns = computed((): Field[] => {
-    // add the entries
-    const entries = {} as { [key: string]: boolean }
-    Object.keys(confusion?.value?.table)?.map((k1) => {
-        Object.keys(confusion?.value?.table[k1])?.forEach((k2) => entries[k2] = true)
-    })
-
-    // add referenceJob, sort, map and return
-    const refJobField = {
-        key: 'referenceJob',
-        sortOn: (value: Item) => {
-            const pos = value.referenceJob
-            return (posToBottom(pos) ? Infinity : pos)
-        }
-    }
-
-    const allFields = Object.keys(entries)
-        // GTable sort also uses localeCompare. Just using sort() as is messes up the order 
-        // between e.g. 'NOU' & 'NO_POS'. I don't know why, though.
-        .sort((a, b) => {
-            if (posToBottom(a)) return 1
-            if (posToBottom(b)) return -1
-            return a.localeCompare(b)
-        })
-
-    const returnVal = allFields.map(field => {
-        return {
-            key: field,
-            sortOn: value => (field !== 'referenceJob' ? value[field]?.count : value?.referenceJob)
-        }
-    })
-    returnVal.unshift(refJobField)
-    return returnVal
-})
-
-const rows = computed((): Item[] => {
-    return Object.keys(confusion.value.table).map((k1) => {
-        const ret = { referenceJob: k1 } as { [key: string]: EvaluationEntry } & {
-            referenceJob: string
-        }
-        Object.keys(confusion.value.table[k1]).forEach(
-            (k2) => (ret[k2] = confusion.value.table[k1][k2])
-        )
-        return ret
-    })
-})
-
-// Methods
-function download() {
-    const data = modalData.value
-    const hypothesisPos = data.field.key
-    const referencePos = data.item.referenceJob
-    downloading.value = true
-    API.getDownloadPosConfusion(corporaStore.activeUUID, jobSelection.hypothesisJobId, jobSelection.referenceJobId, hypothesisPos, referencePos)
-        .then((response) => {
-            Utils.browserDownloadResponseFile(response)
-        })
-        .catch(res => Utils.handleBlobError(res, "download confusion samples", app))
-        .finally(() => downloading.value = false)
-}
-/**
- * Case insensitive string compare.
- */
-function strEqual(a: string, b: string) {
-    return a.toUpperCase() === b.toUpperCase()
-}
-
-/**
- * returns whether this pos should be sorted to the bottom.
- */
-function posToBottom(pos: string) {
-    const posses = ["NO_POS", "Missing match", MISC, "LET", "PUNCT", "PC", "MULTIPLE"]
-    return posses.includes(pos)
-}
-
-function cssClass(data) {
-    const match: boolean = strEqual(data.field.key, data.item.referenceJob)
-    const warnings = ["NO_POS", "MULTIPLE", "Missing match"]
-    if (warnings.includes(data.field.key)) {
-        return {
-            orange: match,
-            plain: !match
-        }
-    }
-    else {
-        return {
-            green: match,
-            plain: !match
-        }
-    }
-}
-
-function openModal(data) {
-    modalData.value = data
-    samples.value = {
-        agreement: strEqual(data.field.key, data.item.referenceJob),
-        samples: data.value.samples,
-        hypothesisPos: data.field.key,
-        referencePos: data.item.referenceJob
-    }
-    showModal.value = true
-}
-</script>
-
-<style scoped lang="scss">
-#confusionTable :deep(td) {
-    padding: 0 !important;
-    margin: 0;
-}
-
-#confusionTable td {
-    button {
-        display: block;
-        text-align: center;
-        width: 100%;
-        height: 100%;
-        margin: 0;
-
-        &.plain {
-            background-color: transparent;
-
-            &:hover {
-                background-color: var(--int-light-grey) !important;
-            }
-
-            &:focus {
-                background-color: var(--int-light-grey-hover) !important;
-            }
-        }
-    }
-}
-</style>
+<template>
+    <div>
+
+        <GTable title="Part-of-speech confusion" helpSubject="evaluation" :columns :items="rows" id="confusionTable"
+            :loading="loading" sortedByColumn="referenceJob" :sortDesc="false" hoverRow>
+            <template #help>
+                <p>
+                    In part-of-speech confusion, an overview is given of the matches (in green) and mismatches per PoS
+                    when comparing
+                    the tagging of the hypothesis layer with the reference layer. Click on any frequency below to show a
+                    data sample.
+                </p>
+                <p>
+                    The category "MULTIPLE" contains combined tags like "ADP+NOU" or "VRB+PD+PD". These are shown in one
+                    cell, but this does not mean that the taggers agree on the exact tags. Click on the cell or look at
+                    the Global Metrics for more details.
+                </p>
+                <DifferentTagsetsHelp />
+            </template>
+
+            <template #table-empty-instruction>Select a reference layer and a hypothesis layer to generate a confusion
+                table.</template>
+
+            <!-- top left header -->
+            <template #head-referenceJob>
+                part-of-speech <br>
+                ({{ jobSelection.hypothesisJobId }}→)<br>
+                ({{ jobSelection.referenceJobId }}↓)
+            </template>
+
+            <!-- custom cell rendering -->
+            <template #cell="data: Cell">
+
+                <!-- header column -->
+                <div v-if="data.field.key == 'referenceJob'">
+                    {{ data.value }}
+                </div>
+
+                <!-- cell -->
+                <GButton v-else :disabled="!data.value.count" :class=cssClass(data) @click="openModal(data)">
+                    {{ `${(data.value ? data.value.count : 0).toString().padStart(3, '&nbsp;')}` }}
+                </GButton>
+
+            </template>
+
+        </GTable>
+
+        <ComparisonModal :show="showModal" @hide="showModal = false" :samples="samples" :downloading
+            @download="(data) => download(data)" :referenceJob="jobSelection.referenceJobId"
+            :hypothesisJob="jobSelection.hypothesisJobId" />
+
+        <EvaluationInfoBox :eval="confusion" />
+
+    </div>
+</template>
+
+<script setup lang='ts'>
+// Libraries & stores
+import { computed, ref } from 'vue'
+import stores, { JobSelectionStore, CorporaStore, AppStore } from '@/stores'
+import { storeToRefs } from 'pinia'
+// API & types
+import { Field } from '@/types/table'
+import { TermComparison, EvaluationEntry } from "@/types/evaluation"
+import { MISC } from '@/stores/evaluation/confusion'
+import * as API from '@/api/evaluation'
+import * as Utils from "@/api/utils"
+// Components
+import { GButton, GInfo, GTable, EvaluationInfoBox, ComparisonModal } from '@/components'
+import DifferentTagsetsHelp from '@/components/help/DifferentTagsetsHelp.vue'
+
+// Stores
+const { loading, confusion } = storeToRefs(stores.useConfusion())
+const corporaStore = stores.useCorpora() as CorporaStore
+const jobSelection = stores.useJobSelection() as JobSelectionStore
+const app = stores.useApp() as AppStore
+
+// Custom types
+type Item = { [key: string]: EvaluationEntry } & { referenceJob: string }
+type Cell = { field: Field; item: Item; value: EvaluationEntry }
+
+// Fields
+const downloading = ref(false)
+const modalData = ref({})
+const samples = ref({ title: "", samples: [] } as { title: string, samples: TermComparison[] })
+const showModal = ref(false)
+
+const columns = computed((): Field[] => {
+    // add the entries
+    const entries = {} as { [key: string]: boolean }
+    Object.keys(confusion?.value?.table)?.map((k1) => {
+        Object.keys(confusion?.value?.table[k1])?.forEach((k2) => entries[k2] = true)
+    })
+
+    // add referenceJob, sort, map and return
+    const refJobField = {
+        key: 'referenceJob',
+        sortOn: (value: Item) => {
+            const pos = value.referenceJob
+            return (posToBottom(pos) ? Infinity : pos)
+        }
+    }
+
+    const allFields = Object.keys(entries)
+        // GTable sort also uses localeCompare. Just using sort() as is messes up the order 
+        // between e.g. 'NOU' & 'NO_POS'. I don't know why, though.
+        .sort((a, b) => {
+            if (posToBottom(a)) return 1
+            if (posToBottom(b)) return -1
+            return a.localeCompare(b)
+        })
+
+    const returnVal = allFields.map(field => {
+        return {
+            key: field,
+            sortOn: value => (field !== 'referenceJob' ? value[field]?.count : value?.referenceJob)
+        }
+    })
+    returnVal.unshift(refJobField)
+    return returnVal
+})
+
+const rows = computed((): Item[] => {
+    return Object.keys(confusion.value.table).map((k1) => {
+        const ret = { referenceJob: k1 } as { [key: string]: EvaluationEntry } & {
+            referenceJob: string
+        }
+        Object.keys(confusion.value.table[k1]).forEach(
+            (k2) => (ret[k2] = confusion.value.table[k1][k2])
+        )
+        return ret
+    })
+})
+
+// Methods
+function download() {
+    const data = modalData.value
+    const hypothesisPos = data.field.key
+    const referencePos = data.item.referenceJob
+    downloading.value = true
+    API.getDownloadPosConfusion(corporaStore.activeUUID, jobSelection.hypothesisJobId, jobSelection.referenceJobId, hypothesisPos, referencePos)
+        .then((response) => {
+            Utils.browserDownloadResponseFile(response)
+        })
+        .catch(res => Utils.handleBlobError(res, "download confusion samples", app))
+        .finally(() => downloading.value = false)
+}
+/**
+ * Case insensitive string compare.
+ */
+function strEqual(a: string, b: string) {
+    return a.toUpperCase() === b.toUpperCase()
+}
+
+/**
+ * returns whether this pos should be sorted to the bottom.
+ */
+function posToBottom(pos: string) {
+    const posses = ["NO_POS", "Missing match", MISC, "LET", "PUNCT", "PC", "MULTIPLE"]
+    return posses.includes(pos)
+}
+
+function cssClass(data) {
+    const match: boolean = strEqual(data.field.key, data.item.referenceJob)
+    const warnings = ["NO_POS", "MULTIPLE", "Missing match"]
+    if (warnings.includes(data.field.key)) {
+        return {
+            orange: match,
+            plain: !match
+        }
+    }
+    else {
+        return {
+            green: match,
+            plain: !match
+        }
+    }
+}
+
+function openModal(data) {
+    modalData.value = data
+    samples.value = {
+        agreement: strEqual(data.field.key, data.item.referenceJob),
+        samples: data.value.samples,
+        hypothesisPos: data.field.key,
+        referencePos: data.item.referenceJob
+    }
+    showModal.value = true
+}
+</script>
+
+<style scoped lang="scss">
+#confusionTable :deep(td) {
+    padding: 0 !important;
+    margin: 0;
+}
+
+#confusionTable td {
+    button {
+        display: block;
+        text-align: center;
+        width: 100%;
+        height: 100%;
+        margin: 0;
+
+        &.plain {
+            background-color: transparent;
+
+            &:hover {
+                background-color: var(--int-light-grey) !important;
+            }
+
+            &:focus {
+                background-color: var(--int-light-grey-hover) !important;
+            }
+        }
+    }
+}
+</style>
diff --git a/client/src/views/annotate/subviews/evaluate/subviews/DistributionView.vue b/client/src/views/annotate/subviews/evaluate/subviews/DistributionView.vue
index 6e77f29..08024fc 100644
--- a/client/src/views/annotate/subviews/evaluate/subviews/DistributionView.vue
+++ b/client/src/views/annotate/subviews/evaluate/subviews/DistributionView.vue
@@ -1,218 +1,218 @@
-<template>
-    <div>
-        <div class="left">
-        </div>
-        <GTable class="right" :title="'Distribution of ' + (jobSelection.hypothesisJobId || 'the hypothesis layer')"
-            helpSubject="evaluation" :columns :items="itemsToDisplay" :loading="distributionStore.loading"
-            sortedByField="count">
-            <template #table-empty-instruction>
-                <p v-if="distribution.generated">No results for current filter settings.</p>
-                <p v-else>Select a hypothesis layer to generate a distribution.</p>
-            </template>
-            <template #help>
-                <p>The distribution shows what lemma, part-of-speech pairs have been assigned to which types. When there
-                    are more than five types you can click on the inspect symbol to view all types of a lemma-PoS
-                    combination.</p>
-            </template>
-            <template #header>
-                <p>
-                    <b v-if="distribution.trimmed">
-                        Because of the large corpus size only the 1000 most frequent lemma,
-                        part-of-speech pairs are shown.
-                    </b>
-                </p>
-            </template>
-
-            <!-- count -->
-            <template #cell-count="data">
-                <div>{{ `${data.value}` }}</div>
-            </template>
-
-            <!-- variantCount -->
-            <template #cell-variantCount="data">
-                <div>{{ `${Object.keys(data.item.literals.literals).length}` }}</div>
-            </template>
-
-            <!-- variants-->
-            <template #cell-variants="data">
-                <div style="min-width:200px">
-                    <template v-if="Object.keys(data.item.literals.literals).length <= 5">
-                        <span
-                            v-for="(literal, index) in Object.keys(data.item.literals.literals).sort(function (a, b) { return data.item.literals.literals[b] - data.item.literals.literals[a] })"
-                            :key="literal">
-                            {{ literal }} <b>{{ `${data.item.literals.literals[literal]}` }}</b>{{ index !=
-                                Object.keys(data.item.literals.literals).length - 1 ? ', ' : '' }}
-                        </span>
-                    </template>
-                    <template v-else>
-                        <RightFloatCell>
-                            <template #left>
-                                <span
-                                    v-for="literal in Object.keys(data.item.literals.literals).sort(function (a, b) { return data.item.literals.literals[b] - data.item.literals.literals[a] }).slice(0, 5)"
-                                    :key="literal">
-                                    {{ literal }} <b>{{ `${data.item.literals.literals[literal]}` }}</b>,
-                                </span>
-                                <i>... and {{ Object.keys(data.item.literals.literals).length - 5 }} more</i>
-                            </template>
-                            <template #right>
-                                <InspectButton @click="variantsToDisplay = data.item" />
-                            </template>
-                        </RightFloatCell>
-                    </template>
-                </div>
-            </template>
-
-            <template #prepend v-if="distribution.generated">
-                <div class="table-controls">
-                    <!-- search lemma-->
-                    <div class="table-control" id="searchLemma">
-                        Search lemma:
-                        <GInput type="text" v-model="lemmaFilter" placeholder="Lemma" clearBtn />
-                    </div>
-                    <!-- search literals -->
-                    <div class="table-control" id="searchWordForms">
-                        Search types:
-                        <GInput type="text" v-model="literalFilter" placeholder="Type" clearBtn />
-                    </div>
-                    <div class="table-control" id="searchWordForms">
-                        Single/multiple PoS:
-                        <GInput type="select" :options="singMultiPosOptions" v-model="selectedSingMultiPos"
-                            placeholder="Type" clearBtn />
-                    </div>
-                    <!-- filter PoS -->
-                </div>
-                <div id="filterPos">
-                    Include PoS: <br>
-                    <div class="posGrid">
-                        <span v-for="pos in filteredPosses" :key="pos">
-                            <GInput style="display: inline-block" type="checkbox" v-model="includePos[pos]">
-                                <span v-if="pos">{{ pos }}</span>
-                                <span v-else><i>None</i></span>
-                            </GInput>
-                        </span>
-                    </div>
-                </div>
-            </template>
-
-        </GTable>
-
-        <EvaluationInfoBox :eval="distribution" />
-
-        <VariantsModal :variantsToDisplay="variantsToDisplay" :show="variantsToDisplay !== null"
-            @hide="variantsToDisplay = null" id="modal" />
-    </div>
-</template>
-
-<script setup lang='ts'>
-// Libraries & stores
-import { computed, ref, watch } from 'vue'
-import stores, { DistributionStore } from '@/stores'
-import { storeToRefs } from 'pinia'
-// API & types
-import { Distribution } from '@/types/evaluation'
-// Components
-import { GInput, GTable, EvaluationInfoBox, InspectButton, RightFloatCell, VariantsModal } from '@/components'
-
-// Stores
-const distributionStore = stores.useDistribution() as DistributionStore
-// Doesn't need to be ref'ed, but it's easier to read.
-const { distribution } = storeToRefs(distributionStore)
-const jobSelection = stores.useJobSelection()
-
-// Fields
-// Table controls.
-const includePos = ref({} as { [pos: string]: boolean })
-const lemmaFilter = ref('')
-const literalFilter = ref('')
-// GModal for variants
-const variantsToDisplay = ref(null as null | Distribution)
-// Filtered table items.
-const itemsToDisplay = computed((): Distribution[] => {
-    // When distribution not yet generated.
-    if (!distribution.value?.distribution?.length) return []
-
-    return distribution.value?.distribution
-        // Case insensitive string comparison.
-        .filter(x => x.lemma.toLowerCase().includes(lemmaFilter.value.toLowerCase()))
-        .filter(x => includePos.value[x.pos] !== false)
-        // Filter by single/multiple PoS
-        .filter(x => {
-            if (selectedSingMultiPos.value == "single") return !x.pos.includes("+")
-            if (selectedSingMultiPos.value == "multiple") return x.pos.includes("+")
-            return true
-        })
-        // Case insensitive string comparison.
-        // join on \n, as it can't be entered into a <input type=text>
-        .filter(x => Object.keys(x.literals.literals).join('\n').toLowerCase().includes(literalFilter.value.toLowerCase()))
-})
-const columns = [
-    { key: 'lemma', label: 'lemma', sortOn: (x: Distribution) => x.lemma },
-    { key: 'pos', label: 'PoS', sortOn: (x: Distribution) => x.pos },
-    { key: 'count', label: 'total\noccurrences', sortOn: (x: Distribution) => x.count },
-    { key: 'variantCount', label: 'number\nof types', sortOn: (x: Distribution) => Object.keys(x.literals.literals).length },
-    { key: 'variants', label: 'types' },
-]
-const singMultiPosOptions = [
-    { value: 'single', text: 'Single' },
-    { value: 'multiple', text: 'Multiple' },
-    { value: 'both', text: 'Both' },
-]
-const selectedSingMultiPos = ref(singMultiPosOptions[0].value)
-const filteredPosses = computed(() => {
-    if (selectedSingMultiPos.value === 'single') {
-        return distributionStore.posses.filter(pos => !pos.includes("+"))
-    } else if (selectedSingMultiPos.value === 'multiple') {
-        return distributionStore.posses.filter(pos => pos.includes("+"))
-    } else {
-        return distributionStore.posses
-    }
-})
-
-// Watches
-/**
- * On switching jobs, turn on all PoS checkboxes. We check for change in distributionStore.posses, not in 
- * jobSelection.hypothesisJobId, because of the network delay.
- */
-watch(() => distributionStore.posses, () => {
-    distributionStore.posses.forEach(pos => includePos.value[pos] = true)
-}, { immediate: true })
-</script>
-
-<style scoped lang="scss">
-#searchWordForms,
-#searchLemma {
-    flex: 1;
-    max-width: 200px;
-}
-
-div:not(#modal)::v-deep() .g-card .content-wrapper .content {
-    display: flex;
-    flex-direction: column;
-    justify-content: safe center;
-    align-items: safe center;
-}
-
-:deep(table) {
-    max-width: 100%;
-
-    th {
-        word-break: break-word;
-    }
-}
-
-.posGrid {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
-    column-gap: 0px;
-}
-
-.posGrid span>div {
-    width: fit-content;
-}
-
-:deep(#prepend) {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-}
-</style>
+<template>
+    <div>
+        <div class="left">
+        </div>
+        <GTable class="right" :title="'Distribution of ' + (jobSelection.hypothesisJobId || 'the hypothesis layer')"
+            helpSubject="evaluation" :columns :items="itemsToDisplay" :loading="distributionStore.loading"
+            sortedByColumn="count">
+            <template #table-empty-instruction>
+                <p v-if="distribution.generated">No results for current filter settings.</p>
+                <p v-else>Select a hypothesis layer to generate a distribution.</p>
+            </template>
+            <template #help>
+                <p>The distribution shows what lemma, part-of-speech pairs have been assigned to which types. When there
+                    are more than five types you can click on the inspect symbol to view all types of a lemma-PoS
+                    combination.</p>
+            </template>
+            <template #header>
+                <p>
+                    <b v-if="distribution.trimmed">
+                        Because of the large corpus size only the 1000 most frequent lemma,
+                        part-of-speech pairs are shown.
+                    </b>
+                </p>
+            </template>
+
+            <!-- count -->
+            <template #cell-count="data">
+                <div>{{ `${data.value}` }}</div>
+            </template>
+
+            <!-- variantCount -->
+            <template #cell-variantCount="data">
+                <div>{{ `${Object.keys(data.item.literals.literals).length}` }}</div>
+            </template>
+
+            <!-- variants-->
+            <template #cell-variants="data">
+                <div style="min-width:200px">
+                    <template v-if="Object.keys(data.item.literals.literals).length <= 5">
+                        <span
+                            v-for="(literal, index) in Object.keys(data.item.literals.literals).sort(function (a, b) { return data.item.literals.literals[b] - data.item.literals.literals[a] })"
+                            :key="literal">
+                            {{ literal }} <b>{{ `${data.item.literals.literals[literal]}` }}</b>{{ index !=
+                                Object.keys(data.item.literals.literals).length - 1 ? ', ' : '' }}
+                        </span>
+                    </template>
+                    <template v-else>
+                        <RightFloatCell>
+                            <template #left>
+                                <span
+                                    v-for="literal in Object.keys(data.item.literals.literals).sort(function (a, b) { return data.item.literals.literals[b] - data.item.literals.literals[a] }).slice(0, 5)"
+                                    :key="literal">
+                                    {{ literal }} <b>{{ `${data.item.literals.literals[literal]}` }}</b>,
+                                </span>
+                                <i>... and {{ Object.keys(data.item.literals.literals).length - 5 }} more</i>
+                            </template>
+                            <template #right>
+                                <InspectButton @click="variantsToDisplay = data.item" />
+                            </template>
+                        </RightFloatCell>
+                    </template>
+                </div>
+            </template>
+
+            <template #prepend v-if="distribution.generated">
+                <div class="table-controls">
+                    <!-- search lemma-->
+                    <div class="table-control" id="searchLemma">
+                        Search lemma:
+                        <GInput type="text" v-model="lemmaFilter" placeholder="Lemma" clearBtn />
+                    </div>
+                    <!-- search literals -->
+                    <div class="table-control" id="searchWordForms">
+                        Search types:
+                        <GInput type="text" v-model="literalFilter" placeholder="Type" clearBtn />
+                    </div>
+                    <div class="table-control" id="searchWordForms">
+                        Single/multiple PoS:
+                        <GInput type="select" :options="singMultiPosOptions" v-model="selectedSingMultiPos"
+                            placeholder="Type" clearBtn />
+                    </div>
+                    <!-- filter PoS -->
+                </div>
+                <div id="filterPos">
+                    Include PoS: <br>
+                    <div class="posGrid">
+                        <span v-for="pos in filteredPosses" :key="pos">
+                            <GInput style="display: inline-block" type="checkbox" v-model="includePos[pos]">
+                                <span v-if="pos">{{ pos }}</span>
+                                <span v-else><i>None</i></span>
+                            </GInput>
+                        </span>
+                    </div>
+                </div>
+            </template>
+
+        </GTable>
+
+        <EvaluationInfoBox :eval="distribution" />
+
+        <VariantsModal :variantsToDisplay="variantsToDisplay" :show="variantsToDisplay !== null"
+            @hide="variantsToDisplay = null" id="modal" />
+    </div>
+</template>
+
+<script setup lang='ts'>
+// Libraries & stores
+import { computed, ref, watch } from 'vue'
+import stores, { DistributionStore } from '@/stores'
+import { storeToRefs } from 'pinia'
+// API & types
+import { Distribution } from '@/types/evaluation'
+// Components
+import { GInput, GTable, EvaluationInfoBox, InspectButton, RightFloatCell, VariantsModal } from '@/components'
+
+// Stores
+const distributionStore = stores.useDistribution() as DistributionStore
+// Doesn't need to be ref'ed, but it's easier to read.
+const { distribution } = storeToRefs(distributionStore)
+const jobSelection = stores.useJobSelection()
+
+// Fields
+// Table controls.
+const includePos = ref({} as { [pos: string]: boolean })
+const lemmaFilter = ref('')
+const literalFilter = ref('')
+// GModal for variants
+const variantsToDisplay = ref(null as null | Distribution)
+// Filtered table items.
+const itemsToDisplay = computed((): Distribution[] => {
+    // When distribution not yet generated.
+    if (!distribution.value?.distribution?.length) return []
+
+    return distribution.value?.distribution
+        // Case insensitive string comparison.
+        .filter(x => x.lemma.toLowerCase().includes(lemmaFilter.value.toLowerCase()))
+        .filter(x => includePos.value[x.pos] !== false)
+        // Filter by single/multiple PoS
+        .filter(x => {
+            if (selectedSingMultiPos.value == "single") return !x.pos.includes("+")
+            if (selectedSingMultiPos.value == "multiple") return x.pos.includes("+")
+            return true
+        })
+        // Case insensitive string comparison.
+        // join on \n, as it can't be entered into a <input type=text>
+        .filter(x => Object.keys(x.literals.literals).join('\n').toLowerCase().includes(literalFilter.value.toLowerCase()))
+})
+const columns = [
+    { key: 'lemma', label: 'lemma', sortOn: (x: Distribution) => x.lemma },
+    { key: 'pos', label: 'PoS', sortOn: (x: Distribution) => x.pos },
+    { key: 'count', label: 'total\noccurrences', sortOn: (x: Distribution) => x.count },
+    { key: 'variantCount', label: 'number\nof types', sortOn: (x: Distribution) => Object.keys(x.literals.literals).length },
+    { key: 'variants', label: 'types' },
+]
+const singMultiPosOptions = [
+    { value: 'single', text: 'Single' },
+    { value: 'multiple', text: 'Multiple' },
+    { value: 'both', text: 'Both' },
+]
+const selectedSingMultiPos = ref(singMultiPosOptions[0].value)
+const filteredPosses = computed(() => {
+    if (selectedSingMultiPos.value === 'single') {
+        return distributionStore.posses.filter(pos => !pos.includes("+"))
+    } else if (selectedSingMultiPos.value === 'multiple') {
+        return distributionStore.posses.filter(pos => pos.includes("+"))
+    } else {
+        return distributionStore.posses
+    }
+})
+
+// Watches
+/**
+ * On switching jobs, turn on all PoS checkboxes. We check for change in distributionStore.posses, not in 
+ * jobSelection.hypothesisJobId, because of the network delay.
+ */
+watch(() => distributionStore.posses, () => {
+    distributionStore.posses.forEach(pos => includePos.value[pos] = true)
+}, { immediate: true })
+</script>
+
+<style scoped lang="scss">
+#searchWordForms,
+#searchLemma {
+    flex: 1;
+    max-width: 200px;
+}
+
+div:not(#modal)::v-deep() .g-card .content-wrapper .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: safe center;
+    align-items: safe center;
+}
+
+:deep(table) {
+    max-width: 100%;
+
+    th {
+        word-break: break-word;
+    }
+}
+
+.posGrid {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
+    column-gap: 0px;
+}
+
+.posGrid span>div {
+    width: fit-content;
+}
+
+:deep(#prepend) {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+}
+</style>
diff --git a/client/src/views/overview/subviews/BenchmarksView.vue b/client/src/views/overview/subviews/BenchmarksView.vue
index 103c2fc..86baf42 100644
--- a/client/src/views/overview/subviews/BenchmarksView.vue
+++ b/client/src/views/overview/subviews/BenchmarksView.vue
@@ -1,159 +1,159 @@
-<template>
-    <div class="center">
-        <GCard title="Benchmarks" helpSubject="benchmarks">
-            <template #help>
-                <p>
-                    Benchmarks show the performance of taggers on the default datasets.
-                    The accuracy scores are given for lemma, PoS, and both.
-                    <br />
-                    For more details on the datasets, see the
-                    <GNav :route="{ path: '/overview/datasets' }">
-                        datasets overview
-                    </GNav>.
-                </p>
-                <b>*</b>: when taggers use a different tagset than the reference tagset, the score can be very low.
-            </template>
-
-            <GTable headless :columns :items :loading="assaysStore.loading" noHelp sortedByField="accuracy">
-
-                <template #table-empty-instruction>
-                    Select a dataset to view benchmarks.
-                </template>
-
-                <!-- tagger name -->
-
-                <template #cell-tagger="d">
-                    <ExternalLink v-if="d.item.tagger !== SOURCE_LAYER"
-                        :href="`/galahad/overview/taggers#${d.item.tagger}`">
-                        {{ d.item.tagger }}
-                    </ExternalLink>
-                    <div v-else>
-                        <span style="font-weight: bold">{{ d.item.tagger }}</span>
-                    </div>
-                </template>
-
-                <template #cell="d">
-                    {{ d.value ? d.value.toFixed(2) : "0.00" }}<span v-if="showAsterisk(d)">*</span>
-                </template>
-
-                <template #cell-details="d">
-                    <ExternalLink
-                        :href="`/galahad/annotate/evaluate?corpus=${selectedDatasetUuid}&hypothesis=${d.item.tagger}`">
-                        Details
-                    </ExternalLink>
-                </template>
-
-                <template #prepend>
-                    <div class="table-controls">
-                        <div class="table-control">
-                            Dataset:
-                            <GInput type="select" :options="datasetOptions" v-model="selectedDatasetUuid" />
-                        </div>
-                    </div>
-                    <MetricsFilter ref="metricsFilter" v-if="selectedDatasetUuid" />
-                </template>
-
-            </GTable>
-        </GCard>
-    </div>
-</template>
-
-<script setup lang='ts'>
-// Libraries & stores
-import { computed, onMounted, ref } from 'vue'
-import stores, { AssaysStore } from '@/stores'
-// API & Types
-import { MetricTypeAssay } from '@/types/assays'
-import { SOURCE_LAYER } from '@/types/jobs'
-import { TableData } from '@/types/table'
-// Components
-import { MailAddress, GTable, GInfo, GCard, GNav } from '@/components'
-import MetricsFilter from '@/components/tables/MetricsFilter.vue'
-
-// Types
-type AssayRow = { tagger: string, accuracy: number, precision: number, recall: number, f1: number }
-
-// Stores
-const assaysStore = stores.useAssays() as AssaysStore
-const corporaStore = stores.useCorpora()
-
-// Fields
-const datasetOptions = computed(() => corporaStore.datasetCorpora.map((d) => ({ value: d.uuid, text: d.name })).sort((a, b) => a.text.localeCompare(b.text)))
-const selectedDatasetUuid = ref(null)
-const selectedDatasetName = computed(() => corporaStore.datasetCorpora.find((d) => d.uuid == selectedDatasetUuid.value)?.name)
-const metricsFilter = ref(null)
-const columns = [
-    { key: "tagger", label: "tagger" },
-    { key: "precision", label: "macro\nprecision", sortOn: i => i.precision },
-    { key: "recall", label: "macro\nrecall", sortOn: i => i.recall },
-    { key: "f1", label: "macro\nf1", sortOn: i => i.f1 },
-    { key: "accuracy", label: "micro\naccuracy", sortOn: i => i.accuracy },
-    { key: "details", label: "detailed\nevaluation" },
-]
-/**
- * Our input data is in the form:
- * {
- *     "dataset-1": {
- *         "posByPos": {
- *             "tagger-1": {
- *                 "micro": { ... }, "macro": { ... }
- *             },
- *             "tagger-2": { ... },
- *         },
- *         "lemmaByLemma": { ... },
- *     },
- *     "dataset-2": { ... },
- * }
- * We want to transform this to:
- * [
- *    { tagger: "tagger-1", microAccuracy: 0, macroPrecision: 0, ... },
- *    { ... },
- * ]
- * Filtered by the selected dataset and metric type.
- */
-const items = computed(() => {
-    const metricName = metricsFilter.value?.metricName
-    return Object.entries(assaysStore.assays[selectedDatasetName.value]?.[metricName] ?? {}).map((taggerAndMetric) => {
-        const tagger: string = taggerAndMetric[0]
-        const mta: MetricTypeAssay = taggerAndMetric[1]
-        const result = {
-            tagger: tagger,
-            accuracy: mta.micro.accuracy,
-            precision: mta.macro.precision,
-            recall: mta.macro.recall,
-            f1: mta.macro.f1,
-        }
-        return result
-    })
-})
-
-// Watches & mounts
-// Only needs to load once
-onMounted(() => {
-    corporaStore.reload()
-    assaysStore.reload()
-})
-
-// Methods
-/** Calculate the score to 2 decimals */
-function score(assay: Assay, desc: AssayDescription): string {
-    // We access the object value with a string,
-    // so typescript needs some explicit typing.
-    return (assay[desc.id as keyof Assay] as number / assay.count).toFixed(2)
-}
-
-/**
- * Show an asterisk for extremely low PoS scores
- */
-function showAsterisk(d: TableData<AssayRow>): boolean {
-    return !d.value || parseFloat(d.value) <= 0.02
-}
-</script>
-
-<style scoped lang="scss">
-.center {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-}
-</style>
+<template>
+    <div class="center">
+        <GCard title="Benchmarks" helpSubject="benchmarks">
+            <template #help>
+                <p>
+                    Benchmarks show the performance of taggers on the default datasets.
+                    The accuracy scores are given for lemma, PoS, and both.
+                    <br />
+                    For more details on the datasets, see the
+                    <GNav :route="{ path: '/overview/datasets' }">
+                        datasets overview
+                    </GNav>.
+                </p>
+                <b>*</b>: when taggers use a different tagset than the reference tagset, the score can be very low.
+            </template>
+
+            <GTable headless :columns :items :loading="assaysStore.loading" noHelp sortedByColumn="accuracy">
+
+                <template #table-empty-instruction>
+                    Select a dataset to view benchmarks.
+                </template>
+
+                <!-- tagger name -->
+
+                <template #cell-tagger="d">
+                    <ExternalLink v-if="d.item.tagger !== SOURCE_LAYER"
+                        :href="`/galahad/overview/taggers#${d.item.tagger}`">
+                        {{ d.item.tagger }}
+                    </ExternalLink>
+                    <div v-else>
+                        <span style="font-weight: bold">{{ d.item.tagger }}</span>
+                    </div>
+                </template>
+
+                <template #cell="d">
+                    {{ d.value ? d.value.toFixed(2) : "0.00" }}<span v-if="showAsterisk(d)">*</span>
+                </template>
+
+                <template #cell-details="d">
+                    <ExternalLink
+                        :href="`/galahad/annotate/evaluate?corpus=${selectedDatasetUuid}&hypothesis=${d.item.tagger}`">
+                        Details
+                    </ExternalLink>
+                </template>
+
+                <template #prepend>
+                    <div class="table-controls">
+                        <div class="table-control">
+                            Dataset:
+                            <GInput type="select" :options="datasetOptions" v-model="selectedDatasetUuid" />
+                        </div>
+                    </div>
+                    <MetricsFilter ref="metricsFilter" v-if="selectedDatasetUuid" />
+                </template>
+
+            </GTable>
+        </GCard>
+    </div>
+</template>
+
+<script setup lang='ts'>
+// Libraries & stores
+import { computed, onMounted, ref } from 'vue'
+import stores, { AssaysStore } from '@/stores'
+// API & Types
+import { MetricTypeAssay } from '@/types/assays'
+import { SOURCE_LAYER } from '@/types/jobs'
+import { TableData } from '@/types/table'
+// Components
+import { MailAddress, GTable, GInfo, GCard, GNav } from '@/components'
+import MetricsFilter from '@/components/tables/MetricsFilter.vue'
+
+// Types
+type AssayRow = { tagger: string, accuracy: number, precision: number, recall: number, f1: number }
+
+// Stores
+const assaysStore = stores.useAssays() as AssaysStore
+const corporaStore = stores.useCorpora()
+
+// Fields
+const datasetOptions = computed(() => corporaStore.datasetCorpora.map((d) => ({ value: d.uuid, text: d.name })).sort((a, b) => a.text.localeCompare(b.text)))
+const selectedDatasetUuid = ref(null)
+const selectedDatasetName = computed(() => corporaStore.datasetCorpora.find((d) => d.uuid == selectedDatasetUuid.value)?.name)
+const metricsFilter = ref(null)
+const columns = [
+    { key: "tagger", label: "tagger" },
+    { key: "precision", label: "macro\nprecision", sortOn: i => i.precision },
+    { key: "recall", label: "macro\nrecall", sortOn: i => i.recall },
+    { key: "f1", label: "macro\nf1", sortOn: i => i.f1 },
+    { key: "accuracy", label: "micro\naccuracy", sortOn: i => i.accuracy },
+    { key: "details", label: "detailed\nevaluation" },
+]
+/**
+ * Our input data is in the form:
+ * {
+ *     "dataset-1": {
+ *         "posByPos": {
+ *             "tagger-1": {
+ *                 "micro": { ... }, "macro": { ... }
+ *             },
+ *             "tagger-2": { ... },
+ *         },
+ *         "lemmaByLemma": { ... },
+ *     },
+ *     "dataset-2": { ... },
+ * }
+ * We want to transform this to:
+ * [
+ *    { tagger: "tagger-1", microAccuracy: 0, macroPrecision: 0, ... },
+ *    { ... },
+ * ]
+ * Filtered by the selected dataset and metric type.
+ */
+const items = computed(() => {
+    const metricName = metricsFilter.value?.metricName
+    return Object.entries(assaysStore.assays[selectedDatasetName.value]?.[metricName] ?? {}).map((taggerAndMetric) => {
+        const tagger: string = taggerAndMetric[0]
+        const mta: MetricTypeAssay = taggerAndMetric[1]
+        const result = {
+            tagger: tagger,
+            accuracy: mta.micro.accuracy,
+            precision: mta.macro.precision,
+            recall: mta.macro.recall,
+            f1: mta.macro.f1,
+        }
+        return result
+    })
+})
+
+// Watches & mounts
+// Only needs to load once
+onMounted(() => {
+    corporaStore.reload()
+    assaysStore.reload()
+})
+
+// Methods
+/** Calculate the score to 2 decimals */
+function score(assay: Assay, desc: AssayDescription): string {
+    // We access the object value with a string,
+    // so typescript needs some explicit typing.
+    return (assay[desc.id as keyof Assay] as number / assay.count).toFixed(2)
+}
+
+/**
+ * Show an asterisk for extremely low PoS scores
+ */
+function showAsterisk(d: TableData<AssayRow>): boolean {
+    return !d.value || parseFloat(d.value) <= 0.02
+}
+</script>
+
+<style scoped lang="scss">
+.center {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+</style>

From d41d8d8e3119a21ea46b767f6bd2f6874a03dbae Mon Sep 17 00:00:00 2001
From: Vincent Prins <vincent.prins@ivdnt.org>
Date: Mon, 17 Jun 2024 12:24:15 +0200
Subject: [PATCH 07/15] Sort TaggersView on id

Because the server response reads yaml in a random order and presents it as such
---
 .../views/overview/subviews/TaggersView.vue   | 243 +++++++++---------
 1 file changed, 121 insertions(+), 122 deletions(-)

diff --git a/client/src/views/overview/subviews/TaggersView.vue b/client/src/views/overview/subviews/TaggersView.vue
index 63ed620..f8222cc 100644
--- a/client/src/views/overview/subviews/TaggersView.vue
+++ b/client/src/views/overview/subviews/TaggersView.vue
@@ -1,123 +1,122 @@
-<template>
-    <div>
-        <GTable title="Taggers overview" :columns :items="taggerStore.taggers">
-            <template #help>
-                Here you can see an overview of all available taggers within Galahad. <br>
-                For more information on the taggers, please visit GitHub:
-                <ExternalLink
-                    href="https://github.com/INL/galahad-taggers-dockerized/">
-                    galahad-taggers-dockerized
-                </ExternalLink>
-            </template>
-
-            <template #table-empty-instruction>
-                No taggers appeared? That is not right! Please contact the INT at
-                <MailAddress />
-            </template>
-
-            <!-- id -->
-
-            <template #cell-id="d">
-                <span :class="markActive(d.item.id)">{{ d.value }}</span>
-            </template>
-
-            <!-- tagset -->
-
-            <template #cell-tagset="d">
-                <span v-if="d.value">{{ d.value }}</span>
-                <i v-else>Unknown</i><br />
-            </template>
-
-            <!-- era -->
-
-            <template #cell-era="d"> {{ d.item.eraFrom }} - {{ d.item.eraTo }} </template>
-
-            <!-- produces -->
-
-            <template #cell-produces="d">
-                {{ sort_tagger_produces(d.value).join(", ") }}
-            </template>
-
-            <!-- attributions -->
-
-            <template #cell-attributions="d">
-                <table class="attrib">
-                    <!-- ugly, but it works -->
-                    <tr v-for="key in Object.keys(d.value)" :key="key">
-                        <td style="text-align: right; white-space: nowrap">
-                            <b>{{ key }}</b>
-                        </td>
-                        <td style="text-align: left; overflow-wrap: break-word">{{ d.value[key] }}</td>
-                    </tr>
-                </table>
-            </template>
-
-            <!-- links -->
-
-            <template #cell-model="d">
-                <ExternalLink :href="d.value.href">
-                    {{ d.value.name }}
-                </ExternalLink>
-            </template>
-            <template #cell-software="d">
-                <ExternalLink :href="d.value.href">
-                    {{ d.value.name }}
-                </ExternalLink>
-            </template>
-            <template #cell-dataset="d">
-                <ExternalLink :href="d.value.href">
-                    {{ d.value.name }}
-                </ExternalLink>
-            </template>
-        </GTable>
-    </div>
-</template>
-
-<script setup lang="ts">
-// Libraries & stores
-import stores, { TaggersStore } from "@/stores"
-// Components
-import { MailAddress, GTable, ExternalLink } from "@/components"
-// API & types
-import { sort_tagger_produces } from "@/stores/taggers"
-
-// Stores
-const taggerStore = stores.useTaggers() as TaggersStore
-
-// Fields
-const columns = [
-    { key: "id", label: "name" },
-    { key: "description" },
-    { key: "tagset" },
+<template>
+    <div>
+        <GTable title="Taggers overview" :columns :items="taggerStore.taggers" sortedByColumn="id" :sortDesc="false">
+            <template #help>
+                Here you can see an overview of all available taggers within Galahad. <br>
+                For more information on the taggers, please visit GitHub:
+                <ExternalLink href="https://github.com/INL/galahad-taggers-dockerized/">
+                    galahad-taggers-dockerized
+                </ExternalLink>
+            </template>
+
+            <template #table-empty-instruction>
+                No taggers appeared? That is not right! Please contact the INT at
+                <MailAddress />
+            </template>
+
+            <!-- id -->
+
+            <template #cell-id="d">
+                <span :class="markActive(d.item.id)">{{ d.value }}</span>
+            </template>
+
+            <!-- tagset -->
+
+            <template #cell-tagset="d">
+                <span v-if="d.value">{{ d.value }}</span>
+                <i v-else>Unknown</i><br />
+            </template>
+
+            <!-- era -->
+
+            <template #cell-era="d"> {{ d.item.eraFrom }} - {{ d.item.eraTo }} </template>
+
+            <!-- produces -->
+
+            <template #cell-produces="d">
+                {{ sort_tagger_produces(d.value).join(", ") }}
+            </template>
+
+            <!-- attributions -->
+
+            <template #cell-attributions="d">
+                <table class="attrib">
+                    <!-- ugly, but it works -->
+                    <tr v-for="key in Object.keys(d.value)" :key="key">
+                        <td style="text-align: right; white-space: nowrap">
+                            <b>{{ key }}</b>
+                        </td>
+                        <td style="text-align: left; overflow-wrap: break-word">{{ d.value[key] }}</td>
+                    </tr>
+                </table>
+            </template>
+
+            <!-- links -->
+
+            <template #cell-model="d">
+                <ExternalLink :href="d.value.href">
+                    {{ d.value.name }}
+                </ExternalLink>
+            </template>
+            <template #cell-software="d">
+                <ExternalLink :href="d.value.href">
+                    {{ d.value.name }}
+                </ExternalLink>
+            </template>
+            <template #cell-dataset="d">
+                <ExternalLink :href="d.value.href">
+                    {{ d.value.name }}
+                </ExternalLink>
+            </template>
+        </GTable>
+    </div>
+</template>
+
+<script setup lang="ts">
+// Libraries & stores
+import stores, { TaggersStore } from "@/stores"
+// Components
+import { MailAddress, GTable, ExternalLink } from "@/components"
+// API & types
+import { sort_tagger_produces } from "@/stores/taggers"
+
+// Stores
+const taggerStore = stores.useTaggers() as TaggersStore
+
+// Fields
+const columns = [
+    { key: "id", label: "name", sortOn: (x: any) => x.id },
+    { key: "description" },
+    { key: "tagset" },
     { key: "era", label: "period" },
-    { key: "produces" },
-    { key: "model" },
-    { key: "software" },
-    { key: "dataset" },
-]
-
-// Methods
-/**
- * Mark the active row, retrieved from the url anchor.
- */
-function markActive(id: string) {
-    const hash = window.location.hash.substring(1)
-    if (id == hash) {
-        return "active"
-    }
-    return ""
-}
-</script>
-
-<style scoped lang="scss">
-.attrib {
-    box-sizing: border-box;
-    margin: 0;
-    padding: 0;
-    display: inline-block;
-}
-
-:deep(tr):has(> td > span.active) {
-    background-color: var(--int-theme-lighter);
-}
-</style>
+    { key: "produces" },
+    { key: "model" },
+    { key: "software" },
+    { key: "dataset" },
+]
+
+// Methods
+/**
+ * Mark the active row, retrieved from the url anchor.
+ */
+function markActive(id: string) {
+    const hash = window.location.hash.substring(1)
+    if (id == hash) {
+        return "active"
+    }
+    return ""
+}
+</script>
+
+<style scoped lang="scss">
+.attrib {
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+    display: inline-block;
+}
+
+:deep(tr):has(> td > span.active) {
+    background-color: var(--int-theme-lighter);
+}
+</style>

From fde83b2c60bd214cde86a41e267f6e3ac14fe1c3 Mon Sep 17 00:00:00 2001
From: Vincent Prins <vincent.prins@ivdnt.org>
Date: Mon, 17 Jun 2024 12:25:03 +0200
Subject: [PATCH 08/15] Improved period sorting

Within a group of eraFrom it also sorts on eraTo (by sorting them as strings)
---
 .../src/views/annotate/subviews/JobsView.vue  | 636 +++++++++---------
 .../views/overview/subviews/TaggersView.vue   |   2 +-
 2 files changed, 319 insertions(+), 319 deletions(-)

diff --git a/client/src/views/annotate/subviews/JobsView.vue b/client/src/views/annotate/subviews/JobsView.vue
index 40f9f53..a93110e 100644
--- a/client/src/views/annotate/subviews/JobsView.vue
+++ b/client/src/views/annotate/subviews/JobsView.vue
@@ -1,320 +1,320 @@
-<template>
-    <AnnotateTab hideAnnotationsError>
-        <GTable :title="`Jobs for corpus ${corporaStore.activeCorpus?.name}`" helpSubject="jobs" :columns
+<template>
+    <AnnotateTab hideAnnotationsError>
+        <GTable :title="`Jobs for corpus ${corporaStore.activeCorpus?.name}`" helpSubject="jobs" :columns
             :items="displayJobs" :loading="jobsStore.loading" fill hoverRow sortedByColumn="id" :sortDesc="false"
-            class="jobsview">
-
-            <template #help>
-                <component :is="help.jobs"></component>
-            </template>
-            <template #table-empty-instruction>
-                <p v-if="Object.keys(jobsStore.taggableJobs).length">No results for current filter settings</p>
-                <div v-else>No taggers showed up? Something went wrong! Please contact support.</div>
-            </template>
-
-            <!-- id cell -->
-            <template #cell-id="d">
-                <ExternalLink v-if="d.item.tagger.id !== SOURCE_LAYER"
-                    :href="`/galahad/overview/taggers#${d.item.tagger.id}`">
-                    {{ d.item.tagger.id }}
-                </ExternalLink>
-                <div v-else>
-                    <span style="font-weight: bold">{{ d.item.tagger.id }}</span>
-                </div>
-            </template>
-
-            <!-- tagset cell -->
-            <template #cell-tagset="d">
-                <div v-if="!d.item.tagger.tagset"><i>Unknown</i></div>
-                <div v-else>{{ d.item.tagger.tagset }}</div>
-            </template>
-
-            <!-- produces cell -->
-            <template #cell-produces="d">
-                {{ sort_tagger_produces(d.item.tagger.produces).join(", ") }}
-                <i v-if="d.item.tagger.produces.length === 0">None</i>
-            </template>
-
-            <!-- result summary cell -->
-            <template #cell-resultSummary="d">
-                <!-- <span v-for="key in Object.keys(d.value)" :key="key"><span :key="key" v-if="d.value[key] > 0">{{ key }}: {{ d.value[key] }}, </span></span> -->
-                {{ d.value.numWordForms }}
-            </template>
-
-            <!-- era cell -->
-            <template #cell-era="d">
-                <div style="white-space: nowrap"><b v-if="eraRange[0] <= d.item.tagger.eraFrom">{{ d.item.tagger.eraFrom
-                        }}</b><span v-else>{{ d.item.tagger.eraFrom }}</span>
-                    &ndash;
-                    <b v-if="eraRange[1] >= d.item.tagger.eraTo">{{ d.item.tagger.eraTo }}</b><span v-else>{{
-                        d.item.tagger.eraTo
-                    }}</span>
-                </div>
-            </template>
-
-            <!-- last modified cell -->
-            <template #cell-lastModified="d">
-                <span style="white-space:nowrap">{{ unixToString(d.item.lastModified) }}</span>
-            </template>
-
-            <!-- progress cell -->
-            <template #cell-progress="d">
-                <span>
-                    <!-- note that percentage is calculated based on num documents, ie not very accurate -->
-                    {{ d.item.progress.total === 0 ? '' : formatProgress(d.item.progress) }}
-                    <span v-if="d.item.progress.hasError" style="color: var(--int-red)">error !!</span>
-                </span>
-                <GSpinner class="spinner" small v-show="d.item.progress.busy" />
-            </template>
-
-            <!-- actions cell -->
-            <template v-slot:cell-actions="d">
-                <GNav v-if="!corporaStore.hasDocs" :route="{ path: '/annotate/data/documents' }">
-                    Upload documents to start job
-                </GNav>
-                <GButton v-else @click="jobId = d.item.tagger.id"> View &amp; Tag
-                </GButton>
-            </template>
-
-            <template #prepend>
-
-                <div class="table-controls">
-
-                    <div class="table-control">
-                        Search tagger name:
-                        <GInput type="text" v-model="taggerNameFilter" placeholder="Tagger name" clearBtn></GInput>
-                    </div>
-
-                    <div class="table-control">
-                        Tagset, any of:
-                        <div v-for="tagset in tagsets" :key="tagset" style="white-space: nowrap;">
-                            <GInput type="checkbox" v-model="includeTagset[tagset]"> {{ tagset || 'Unknown' }} </GInput>
-                        </div>
-                    </div>
-
-                    <div class="table-control">
-                        Require type:
-                        <div v-for="type in types" :key="type" style="white-space: nowrap;">
-                            <GInput type="checkbox" v-model="requireType[type]"> {{ type }}</GInput>
-                        </div>
-                    </div>
-
-                    <div class="table-control slider">
-                        Era range: {{ eraRange[0] }} &ndash; {{ eraRange[1] }}
-                        <vue-slider ref="slider" class="vue-slider" v-model="eraRange" :interval="50" :min="500"
-                            :max="2050" :min-range="1" lazy :marks="{
-                                '500': '500',
-                                '1000': '1000',
-                                '1500': '1500',
-                                '2000': '2000',
-                            }" piecewise :piecewise-filter="x => x.label % 250 === 0" piecewise-label process-dragable
-                            :tooltip-dir="['bottom', 'top']">
-                        </vue-slider>
-                    </div>
-
-                </div>
-
-                <p>
-                    Shown <b>{{ displayJobs.length }}</b> of <b>{{ Object.keys(jobsStore.taggableJobs).length }}</b>
-                    taggers.
-                </p>
-            </template>
-
-        </GTable>
-
-
-        <!-- job modal -->
-        <JobModal :show="!!jobId" v-if="jobId" :jobId="jobId" @hide="jobId = null" />
-
-    </AnnotateTab>
-</template>
-
-<script setup lang="ts">
-// Libraries & stores
-import { computed, onMounted, ref, watch } from 'vue'
-import VueSlider from 'vue-slider-component'
-import 'vue-slider-component/theme/default.css'
-import stores, { DocumentsStore, JobsStore, UserStore, CorporaStore } from '@/stores'
-// API & types
-import { Job, Progress, SOURCE_LAYER } from '@/types/jobs'
-import { Field } from '@/types/table'
-import { sort_tagger_produces } from "@/stores/taggers"
-// Components
-import { GButton, GNav, GTable, GInput, GSpinner, AnnotateTab, JobModal } from '@/components'
-import help from '@/components/help'
-
-// Stores
-const userStore = stores.useUser() as UserStore
-const documentsStore = stores.useDocuments() as DocumentsStore
-const jobsStore = stores.useJobs() as JobsStore
-const corporaStore = stores.useCorpora() as CorporaStore
-
-// Fields
-const taggerNameFilter = ref('')
-const includeTagset = ref({} as { [tagset: string]: boolean })
-const requireType = ref({} as { [type: string]: boolean })
-const eraRange = ref([500, 2050])
-const jobId = ref(null as null | string)
-
-const displayJobs = computed(() =>
-    Object.values(jobsStore.taggableJobs as Job[])
-        .filter((job) => {
-            // Case insensitive string comparison.
-            return job.tagger.id.toLowerCase().includes(taggerNameFilter.value.toLowerCase())
-        })
-        .filter(job => {
-            return (eraRange.value[0] <= job.tagger.eraTo) &&
-                (eraRange.value[1] >= job.tagger.eraFrom)
-        })
-        .filter(job => {
-            return includeTagset.value[job.tagger.tagset]
-        })
-        .filter(job => {
-            let pass = true
-            Object.keys(requireType.value).forEach(key => {
-                if (requireType.value[key] && !(job.tagger.produces.includes(key))) {
-                    pass = false
-                }
-            })
-            return pass
-        })
-)
-
-const tagsets = computed(() => {
-    return Object.values(jobsStore.taggableJobs)
-        .map((x: Job) => x.tagger.tagset)
-        .filter((val, ind, arr) => arr.indexOf(val) === ind) // unique values
-        .sort()
-})
-
-const columns = computed(() => {
-    const publicFields = [
-        { key: "id", label: "tagger", sortOn: x => x.tagger.id, textAlign: "left" },
-        { key: "tagset", sortOn: x => x.tagger.tagset },
-        { key: "produces", label: "type", },
-        { key: "resultSummary", label: "tokens", sortOn: x => x.resultSummary.numWordForms },
-        { key: "era", label: "period", sortOn: x => x.tagger.eraFrom },
-        { key: "lastModified", label: "last modified", sortOn: x => x.lastModified },
-        { key: "progress", sortOn: x => x.progress.finished / x.progress.total },
-    ] as Field[];
-    if (userStore.hasWriteAccess) {
-        return publicFields.concat(
-            { key: "actions" },
-        )
-    } else {
-        return publicFields
-    }
-})
-
-const types = computed(() => {
-    return Object.values(jobsStore.taggableJobs)
-        .flatMap((x: Job) => x.tagger.produces)
-        .filter((val, ind, arr) => arr.indexOf(val) === ind) // unique values
-        .sort()
-})
-
-// Watches & mounts
-onMounted(() => {
-    jobsStore.reload()
-    // We also need to load the documents, because a time estimate is made based on documents.totalSizeInChars.
-    documentsStore.reloadDocumentsForCorpus(corporaStore.activeUUID)
-})
-watch(tagsets, enableAllTagsets)
-onMounted(enableAllTagsets)
-
-// Methods
-// Checkmarks
-function enableAllTagsets() {
-    tagsets.value.forEach(tagset => includeTagset.value[tagset] = true)
-}
-// Format progress with Math.floor, because e.g. toFixed(0) rounds up 99.9% to 100%, which is confusing.
-function formatProgress(progress: Progress) {
-    return `${Math.floor(100 * progress.finished / progress.total)}%`
-}
-
-function unixToString(time: number) {
-    if (time <= 0) {
-        return "Never"
-    } else {
-        return new Date(time).toLocaleString("nl", {
-            year: "2-digit",
-            month: "2-digit",
-            day: "numeric",
-            hour: "2-digit",
-            minute: "2-digit",
-        })
-    }
-}
-
-</script>
-
-<style scoped>
-.spinner {
-    position: relative;
-    top: 3px;
-}
-
-/* Set a width even when there are no results after filtering.*/
-:deep(#prepend) {
-    width: 900px;
-    max-width: 100%;
-}
-
-table button {
-    background-color: rgba(0, 0, 0, 0);
-    border: var(--int-grey) solid 1px;
-
-    &:hover {
-        background-color: rgba(0, 0, 0, 0.1);
-    }
-
-    &:active {
-        background-color: rgba(0, 0, 0, 0.15);
-    }
-}
-
-/* The slider itself */
-:deep(.vue-slider) .vue-slider-rail {
-    height: 15px;
-    background: var(--int-very-light-grey);
-    border-radius: 5px;
-    cursor: pointer;
-}
-
-:deep(.vue-slider) .vue-slider-process {
-    background: var(--int-theme);
-}
-
-:deep(.vue-slider) .vue-slider-rail:hover {
-    background: var(--int-very-light-grey-hover);
-}
-
-:deep(.vue-slider) .vue-slider-rail:hover .vue-slider-process {
-    background: var(--int-theme-hover);
-}
-
-:deep(.vue-slider) .vue-slider-dot {
-    width: 25px !important;
-    height: 25px !important;
-}
-
-:deep(.vue-slider) .vue-slider-dot-handle {
-    background: var(--int-theme);
-    border: 2px solid #000;
-    box-shadow: none;
-}
-
-:deep(.vue-slider) .vue-slider-dot-handle:hover {
-    background: var(--int-theme-hover);
-}
-
-:deep(.vue-slider) .vue-slider-dot-handle:active {
-    background: var(--int-theme-active);
-}
-
-:deep(.vue-slider) .vue-slider-dot-tooltip-inner {
-    background: var(--int-theme);
-    color: var(--black);
-    border-color: var(--int-theme);
-}
+            class="jobsview">
+
+            <template #help>
+                <component :is="help.jobs"></component>
+            </template>
+            <template #table-empty-instruction>
+                <p v-if="Object.keys(jobsStore.taggableJobs).length">No results for current filter settings</p>
+                <div v-else>No taggers showed up? Something went wrong! Please contact support.</div>
+            </template>
+
+            <!-- id cell -->
+            <template #cell-id="d">
+                <ExternalLink v-if="d.item.tagger.id !== SOURCE_LAYER"
+                    :href="`/galahad/overview/taggers#${d.item.tagger.id}`">
+                    {{ d.item.tagger.id }}
+                </ExternalLink>
+                <div v-else>
+                    <span style="font-weight: bold">{{ d.item.tagger.id }}</span>
+                </div>
+            </template>
+
+            <!-- tagset cell -->
+            <template #cell-tagset="d">
+                <div v-if="!d.item.tagger.tagset"><i>Unknown</i></div>
+                <div v-else>{{ d.item.tagger.tagset }}</div>
+            </template>
+
+            <!-- produces cell -->
+            <template #cell-produces="d">
+                {{ sort_tagger_produces(d.item.tagger.produces).join(", ") }}
+                <i v-if="d.item.tagger.produces.length === 0">None</i>
+            </template>
+
+            <!-- result summary cell -->
+            <template #cell-resultSummary="d">
+                <!-- <span v-for="key in Object.keys(d.value)" :key="key"><span :key="key" v-if="d.value[key] > 0">{{ key }}: {{ d.value[key] }}, </span></span> -->
+                {{ d.value.numWordForms }}
+            </template>
+
+            <!-- era cell -->
+            <template #cell-era="d">
+                <div style="white-space: nowrap"><b v-if="eraRange[0] <= d.item.tagger.eraFrom">{{ d.item.tagger.eraFrom
+                        }}</b><span v-else>{{ d.item.tagger.eraFrom }}</span>
+                    &ndash;
+                    <b v-if="eraRange[1] >= d.item.tagger.eraTo">{{ d.item.tagger.eraTo }}</b><span v-else>{{
+                        d.item.tagger.eraTo
+                        }}</span>
+                </div>
+            </template>
+
+            <!-- last modified cell -->
+            <template #cell-lastModified="d">
+                <span style="white-space:nowrap">{{ unixToString(d.item.lastModified) }}</span>
+            </template>
+
+            <!-- progress cell -->
+            <template #cell-progress="d">
+                <span>
+                    <!-- note that percentage is calculated based on num documents, ie not very accurate -->
+                    {{ d.item.progress.total === 0 ? '' : formatProgress(d.item.progress) }}
+                    <span v-if="d.item.progress.hasError" style="color: var(--int-red)">error !!</span>
+                </span>
+                <GSpinner class="spinner" small v-show="d.item.progress.busy" />
+            </template>
+
+            <!-- actions cell -->
+            <template v-slot:cell-actions="d">
+                <GNav v-if="!corporaStore.hasDocs" :route="{ path: '/annotate/data/documents' }">
+                    Upload documents to start job
+                </GNav>
+                <GButton v-else @click="jobId = d.item.tagger.id"> View &amp; Tag
+                </GButton>
+            </template>
+
+            <template #prepend>
+
+                <div class="table-controls">
+
+                    <div class="table-control">
+                        Search tagger name:
+                        <GInput type="text" v-model="taggerNameFilter" placeholder="Tagger name" clearBtn></GInput>
+                    </div>
+
+                    <div class="table-control">
+                        Tagset, any of:
+                        <div v-for="tagset in tagsets" :key="tagset" style="white-space: nowrap;">
+                            <GInput type="checkbox" v-model="includeTagset[tagset]"> {{ tagset || 'Unknown' }} </GInput>
+                        </div>
+                    </div>
+
+                    <div class="table-control">
+                        Require type:
+                        <div v-for="type in types" :key="type" style="white-space: nowrap;">
+                            <GInput type="checkbox" v-model="requireType[type]"> {{ type }}</GInput>
+                        </div>
+                    </div>
+
+                    <div class="table-control slider">
+                        Era range: {{ eraRange[0] }} &ndash; {{ eraRange[1] }}
+                        <vue-slider ref="slider" class="vue-slider" v-model="eraRange" :interval="50" :min="500"
+                            :max="2050" :min-range="1" lazy :marks="{
+                                '500': '500',
+                                '1000': '1000',
+                                '1500': '1500',
+                                '2000': '2000',
+                            }" piecewise :piecewise-filter="x => x.label % 250 === 0" piecewise-label process-dragable
+                            :tooltip-dir="['bottom', 'top']">
+                        </vue-slider>
+                    </div>
+
+                </div>
+
+                <p>
+                    Shown <b>{{ displayJobs.length }}</b> of <b>{{ Object.keys(jobsStore.taggableJobs).length }}</b>
+                    taggers.
+                </p>
+            </template>
+
+        </GTable>
+
+
+        <!-- job modal -->
+        <JobModal :show="!!jobId" v-if="jobId" :jobId="jobId" @hide="jobId = null" />
+
+    </AnnotateTab>
+</template>
+
+<script setup lang="ts">
+// Libraries & stores
+import { computed, onMounted, ref, watch } from 'vue'
+import VueSlider from 'vue-slider-component'
+import 'vue-slider-component/theme/default.css'
+import stores, { DocumentsStore, JobsStore, UserStore, CorporaStore } from '@/stores'
+// API & types
+import { Job, Progress, SOURCE_LAYER } from '@/types/jobs'
+import { Field } from '@/types/table'
+import { sort_tagger_produces } from "@/stores/taggers"
+// Components
+import { GButton, GNav, GTable, GInput, GSpinner, AnnotateTab, JobModal } from '@/components'
+import help from '@/components/help'
+
+// Stores
+const userStore = stores.useUser() as UserStore
+const documentsStore = stores.useDocuments() as DocumentsStore
+const jobsStore = stores.useJobs() as JobsStore
+const corporaStore = stores.useCorpora() as CorporaStore
+
+// Fields
+const taggerNameFilter = ref('')
+const includeTagset = ref({} as { [tagset: string]: boolean })
+const requireType = ref({} as { [type: string]: boolean })
+const eraRange = ref([500, 2050])
+const jobId = ref(null as null | string)
+
+const displayJobs = computed(() =>
+    Object.values(jobsStore.taggableJobs as Job[])
+        .filter((job) => {
+            // Case insensitive string comparison.
+            return job.tagger.id.toLowerCase().includes(taggerNameFilter.value.toLowerCase())
+        })
+        .filter(job => {
+            return (eraRange.value[0] <= job.tagger.eraTo) &&
+                (eraRange.value[1] >= job.tagger.eraFrom)
+        })
+        .filter(job => {
+            return includeTagset.value[job.tagger.tagset]
+        })
+        .filter(job => {
+            let pass = true
+            Object.keys(requireType.value).forEach(key => {
+                if (requireType.value[key] && !(job.tagger.produces.includes(key))) {
+                    pass = false
+                }
+            })
+            return pass
+        })
+)
+
+const tagsets = computed(() => {
+    return Object.values(jobsStore.taggableJobs)
+        .map((x: Job) => x.tagger.tagset)
+        .filter((val, ind, arr) => arr.indexOf(val) === ind) // unique values
+        .sort()
+})
+
+const columns = computed(() => {
+    const publicFields = [
+        { key: "id", label: "tagger", sortOn: x => x.tagger.id, textAlign: "left" },
+        { key: "tagset", sortOn: x => x.tagger.tagset },
+        { key: "produces", label: "type", },
+        { key: "resultSummary", label: "tokens", sortOn: x => x.resultSummary.numWordForms },
+        { key: "era", label: "period", sortOn: x => x.tagger.eraFrom.toString() + x.tagger.eraTo.toString() },
+        { key: "lastModified", label: "last modified", sortOn: x => x.lastModified },
+        { key: "progress", sortOn: x => x.progress.finished / x.progress.total },
+    ] as Field[];
+    if (userStore.hasWriteAccess) {
+        return publicFields.concat(
+            { key: "actions" },
+        )
+    } else {
+        return publicFields
+    }
+})
+
+const types = computed(() => {
+    return Object.values(jobsStore.taggableJobs)
+        .flatMap((x: Job) => x.tagger.produces)
+        .filter((val, ind, arr) => arr.indexOf(val) === ind) // unique values
+        .sort()
+})
+
+// Watches & mounts
+onMounted(() => {
+    jobsStore.reload()
+    // We also need to load the documents, because a time estimate is made based on documents.totalSizeInChars.
+    documentsStore.reloadDocumentsForCorpus(corporaStore.activeUUID)
+})
+watch(tagsets, enableAllTagsets)
+onMounted(enableAllTagsets)
+
+// Methods
+// Checkmarks
+function enableAllTagsets() {
+    tagsets.value.forEach(tagset => includeTagset.value[tagset] = true)
+}
+// Format progress with Math.floor, because e.g. toFixed(0) rounds up 99.9% to 100%, which is confusing.
+function formatProgress(progress: Progress) {
+    return `${Math.floor(100 * progress.finished / progress.total)}%`
+}
+
+function unixToString(time: number) {
+    if (time <= 0) {
+        return "Never"
+    } else {
+        return new Date(time).toLocaleString("nl", {
+            year: "2-digit",
+            month: "2-digit",
+            day: "numeric",
+            hour: "2-digit",
+            minute: "2-digit",
+        })
+    }
+}
+
+</script>
+
+<style scoped>
+.spinner {
+    position: relative;
+    top: 3px;
+}
+
+/* Set a width even when there are no results after filtering.*/
+:deep(#prepend) {
+    width: 900px;
+    max-width: 100%;
+}
+
+table button {
+    background-color: rgba(0, 0, 0, 0);
+    border: var(--int-grey) solid 1px;
+
+    &:hover {
+        background-color: rgba(0, 0, 0, 0.1);
+    }
+
+    &:active {
+        background-color: rgba(0, 0, 0, 0.15);
+    }
+}
+
+/* The slider itself */
+:deep(.vue-slider) .vue-slider-rail {
+    height: 15px;
+    background: var(--int-very-light-grey);
+    border-radius: 5px;
+    cursor: pointer;
+}
+
+:deep(.vue-slider) .vue-slider-process {
+    background: var(--int-theme);
+}
+
+:deep(.vue-slider) .vue-slider-rail:hover {
+    background: var(--int-very-light-grey-hover);
+}
+
+:deep(.vue-slider) .vue-slider-rail:hover .vue-slider-process {
+    background: var(--int-theme-hover);
+}
+
+:deep(.vue-slider) .vue-slider-dot {
+    width: 25px !important;
+    height: 25px !important;
+}
+
+:deep(.vue-slider) .vue-slider-dot-handle {
+    background: var(--int-theme);
+    border: 2px solid #000;
+    box-shadow: none;
+}
+
+:deep(.vue-slider) .vue-slider-dot-handle:hover {
+    background: var(--int-theme-hover);
+}
+
+:deep(.vue-slider) .vue-slider-dot-handle:active {
+    background: var(--int-theme-active);
+}
+
+:deep(.vue-slider) .vue-slider-dot-tooltip-inner {
+    background: var(--int-theme);
+    color: var(--black);
+    border-color: var(--int-theme);
+}
 </style>
\ No newline at end of file
diff --git a/client/src/views/overview/subviews/TaggersView.vue b/client/src/views/overview/subviews/TaggersView.vue
index f8222cc..0fd95d1 100644
--- a/client/src/views/overview/subviews/TaggersView.vue
+++ b/client/src/views/overview/subviews/TaggersView.vue
@@ -88,7 +88,7 @@ const columns = [
     { key: "id", label: "name", sortOn: (x: any) => x.id },
     { key: "description" },
     { key: "tagset" },
-    { key: "era", label: "period" },
+    { key: "era", label: "period", sortOn: (x: any) => x.eraFrom.toString() + x.eraTo.toString() },
     { key: "produces" },
     { key: "model" },
     { key: "software" },

From 72906ab66d63d46ccdc38d753bba4b968f16e533 Mon Sep 17 00:00:00 2001
From: Vincent Prins <vincent.prins@ivdnt.org>
Date: Mon, 17 Jun 2024 12:31:22 +0200
Subject: [PATCH 09/15] Reload DocumentsView even on upload error

Reason being that some documents might have uploaded sucessfully even if some other document had an error. So, reload to show them.
---
 client/src/stores/documents.ts | 392 +++++++++++++++++----------------
 1 file changed, 197 insertions(+), 195 deletions(-)

diff --git a/client/src/stores/documents.ts b/client/src/stores/documents.ts
index b67619d..120dcc7 100644
--- a/client/src/stores/documents.ts
+++ b/client/src/stores/documents.ts
@@ -1,195 +1,197 @@
-// Libraries & stores
-import { computed, ref, reactive } from 'vue'
-import { defineStore } from 'pinia'
-import stores, { AppStore, CorporaStore } from '@/stores'
-// Types & API
-import { DocumentMetadata, Format } from '@/types/documents'
-import { UUID } from '@/types/corpora'
-import * as API from '@/api/documents'
-import * as Utils from '@/api/utils'
-
-const MAX_FILE_SIZE = 10485760 // 10 MB
-
-// Custom types
-type FileStatus = {
-    status: 'busy' | 'success' | 'error',
-    message?: string
-}
-
-/** 
- * Contains the documents for the corporaStore.activeUUID
- * as well as functionality related to the user's documents, like uploading.
- */
-const documents = defineStore('documents', () => {
-    // Stores
-    const app = stores.useApp() as AppStore
-    const corporaStore = stores.useCorpora() as CorporaStore
-
-    // Fields
-    const loading = ref(false)
-    const available = ref([] as DocumentMetadata[])
-    const numSourceAnnotations = computed(() => available.value.filter(i => i.layerSummary?.numTerms > 0).length)
-    const totalSizeInChars = computed(() => available.value.reduce((x, y) => x + y.numChars, 0))
-    const uploading: Record<string, FileStatus> = reactive({})
-    const uploadBusyCount = computed(() => Object.values(uploading).filter(i => i.status === "busy").length)
-    const uploadErrorCount = computed(() => Object.values(uploading).filter(i => i.status === "error").length)
-    const filesToUpload = ref([] as File[])
-    const illegalFiles = computed((): File[] => {
-        return filesToUpload.value.filter((x: any) => {
-            const ext = x.name.split('.').at(-1)
-            return !(['xml', 'tsv', 'txt', 'zip', 'conllu', 'naf'].includes(ext))
-        })
-    })
-    const tooLargeFiles = computed((): File[] => {
-        return filesToUpload.value.filter((x: any) => x.size > MAX_FILE_SIZE)
-    })
-
-    // Methods
-    /**
-     * Reloads documentsStore.available for a given corpus.
-     * @param corpus 
-     */
-    function reloadDocumentsForCorpus(corpus: UUID) {
-        if (!corpus) return
-        // Reset
-        loading.value = true
-        // Fetch
-        API.getDocuments(corpus)
-            .then(response => {
-                // Only update if the response is for the active corpus.
-                if (response.request.responseURL.includes(corpus)) {
-                    available.value = response.data
-                }
-            })
-            .catch(error => { app.handleServerError("fetch documents", error) })
-            .finally(() => loading.value = false)
-    }
-
-    /**
-     * Reload documents for the active user corpus and updates the corpora list.
-     * The latter is to update the document count which unlocks, e.g., the job tab.
-     */
-    function reloadForActiveUserCorpus() {
-        reloadDocumentsForCorpus(corporaStore.activeUUID)
-        corporaStore.reload()
-    }
-
-    /**
-     * Delete a document.
-     * @param documentName Document name.
-     */
-    function deleteDocument(documentName: string) {
-        API.deleteDocument(corporaStore.activeUUID, documentName)
-            .catch(error => app.handleServerError("delete document", error))
-            .finally(reloadForActiveUserCorpus)
-    }
-
-    /**
-     * Download original source document.
-     * @param documentName Document name.
-     */
-    function downloadRaw(documentName: string) {
-        API.getRawDocument(corporaStore.activeUUID, documentName)
-            .then(Utils.browserDownloadResponseFile)
-            .catch(res => Utils.handleBlobError(res, "download raw document", app))
-    }
-
-    /**
-     * Upload all files in filesToUpload.
-     * Creates timeouts to spread load.
-     */
-    function uploadAll() {
-        for (let i = 0; i < filesToUpload.value.length; i++) {
-            const formData = new FormData();
-            const file = filesToUpload.value[i];
-            // if( file.size > MAX_FILE_SIZE ) continue // skip too large files
-            formData.append('file', file)
-            uploading[file.name] = { status: "busy" }
-            // Spread the uploads a little
-            setTimeout(() => upload(formData), i / 10 * 100)
-        }
-        filesToUpload.value = []
-    }
-
-    /**
-     * Clear errors from not yet uploaded files.
-     */
-    function clearUploadErrors() {
-        Object.keys(uploading).forEach(key => {
-            if (uploading[key].status === "error")
-                delete uploading[key]
-        })
-    }
-
-    /**
-     * Add content type header.
-     * @param fd FormData with file to upload.
-     * @param contentType Content type header.
-     * @param exts File extensions to apply the content type header to.
-     */
-    function addContentTypeHeader(fd: FormData): Record<string, string> | null {
-        let exts_and_headers = {
-            "tsv": "text/tab-separated-values",
-            "conllu": "text/tab-separated-values",
-            "naf": "text/xml",
-        }
-
-        let file = fd.get("file") as File
-        const extension = file?.name.split('.').at(-1)
-        let header = null
-
-        if (Object.keys(exts_and_headers).includes(extension)) {
-            const contentType = exts_and_headers[extension]
-            file = new File([file], file.name, { type: contentType })
-            header = { 'Content-Type': contentType }
-            fd.set("file", file)
-        }
-        return header
-    }
-
-    /**
-     * Upload a single file. Takes http content type header into account.
-     * @param formData FormData with file to upload.
-     */
-    function upload(formData: FormData) {
-        let file = formData.get("file") as File
-        
-        // Some files need an explicit content type header.
-        let header = addContentTypeHeader(formData)
-
-        // Update status on upload, on success and on error.
-        uploading[(file?.name)] = { status: 'busy' }
-        API.postDocument(corporaStore.activeUUID, formData, header)
-            .then(() => {
-                uploading[file?.name] = { status: 'success' }
-                if (uploadBusyCount.value == 0)
-                    reloadForActiveUserCorpus()
-            })
-            .catch(error => uploading[file.name] = { status: 'error', message: error.response.data.message })
-    }
-
-    /**
-     * Checks if the documentsStore.available contains at least one file of the given format.
-     */
-    function containsFormat(format: Format): boolean {
-        return available.value.some(i => {
-            // Overwrite the format for legacy formats.
-            let otherFormat = i.format
-            if (otherFormat == Format.Tei_p5_legacy) {
-                otherFormat = Format.Tei_p5
-            }
-            return otherFormat == format
-        })
-    }
-
-    // Exports
-    return {
-        // Fields
-        available, filesToUpload, illegalFiles, loading, tooLargeFiles, uploading,
-        uploadBusyCount, uploadErrorCount, totalSizeInChars, numSourceAnnotations,
-        // Methods
-        reloadDocumentsForCorpus, deleteDocument, downloadRaw, uploadAll, clearUploadErrors, containsFormat
-    }
-})
-
-export default documents
+// Libraries & stores
+import { computed, ref, reactive } from 'vue'
+import { defineStore } from 'pinia'
+import stores, { AppStore, CorporaStore } from '@/stores'
+// Types & API
+import { DocumentMetadata, Format } from '@/types/documents'
+import { UUID } from '@/types/corpora'
+import * as API from '@/api/documents'
+import * as Utils from '@/api/utils'
+
+const MAX_FILE_SIZE = 10485760 // 10 MB
+
+// Custom types
+type FileStatus = {
+    status: 'busy' | 'success' | 'error',
+    message?: string
+}
+
+/** 
+ * Contains the documents for the corporaStore.activeUUID
+ * as well as functionality related to the user's documents, like uploading.
+ */
+const documents = defineStore('documents', () => {
+    // Stores
+    const app = stores.useApp() as AppStore
+    const corporaStore = stores.useCorpora() as CorporaStore
+
+    // Fields
+    const loading = ref(false)
+    const available = ref([] as DocumentMetadata[])
+    const numSourceAnnotations = computed(() => available.value.filter(i => i.layerSummary?.numTerms > 0).length)
+    const totalSizeInChars = computed(() => available.value.reduce((x, y) => x + y.numChars, 0))
+    const uploading: Record<string, FileStatus> = reactive({})
+    const uploadBusyCount = computed(() => Object.values(uploading).filter(i => i.status === "busy").length)
+    const uploadErrorCount = computed(() => Object.values(uploading).filter(i => i.status === "error").length)
+    const filesToUpload = ref([] as File[])
+    const illegalFiles = computed((): File[] => {
+        return filesToUpload.value.filter((x: any) => {
+            const ext = x.name.split('.').at(-1)
+            return !(['xml', 'tsv', 'txt', 'zip', 'conllu', 'naf'].includes(ext))
+        })
+    })
+    const tooLargeFiles = computed((): File[] => {
+        return filesToUpload.value.filter((x: any) => x.size > MAX_FILE_SIZE)
+    })
+
+    // Methods
+    /**
+     * Reloads documentsStore.available for a given corpus.
+     * @param corpus 
+     */
+    function reloadDocumentsForCorpus(corpus: UUID) {
+        if (!corpus) return
+        // Reset
+        loading.value = true
+        // Fetch
+        API.getDocuments(corpus)
+            .then(response => {
+                // Only update if the response is for the active corpus.
+                if (response.request.responseURL.includes(corpus)) {
+                    available.value = response.data
+                }
+            })
+            .catch(error => { app.handleServerError("fetch documents", error) })
+            .finally(() => loading.value = false)
+    }
+
+    /**
+     * Reload documents for the active user corpus and updates the corpora list.
+     * The latter is to update the document count which unlocks, e.g., the job tab.
+     */
+    function reloadForActiveUserCorpus() {
+        reloadDocumentsForCorpus(corporaStore.activeUUID)
+        corporaStore.reload()
+    }
+
+    /**
+     * Delete a document.
+     * @param documentName Document name.
+     */
+    function deleteDocument(documentName: string) {
+        API.deleteDocument(corporaStore.activeUUID, documentName)
+            .catch(error => app.handleServerError("delete document", error))
+            .finally(reloadForActiveUserCorpus)
+    }
+
+    /**
+     * Download original source document.
+     * @param documentName Document name.
+     */
+    function downloadRaw(documentName: string) {
+        API.getRawDocument(corporaStore.activeUUID, documentName)
+            .then(Utils.browserDownloadResponseFile)
+            .catch(res => Utils.handleBlobError(res, "download raw document", app))
+    }
+
+    /**
+     * Upload all files in filesToUpload.
+     * Creates timeouts to spread load.
+     */
+    function uploadAll() {
+        for (let i = 0; i < filesToUpload.value.length; i++) {
+            const formData = new FormData();
+            const file = filesToUpload.value[i];
+            // if( file.size > MAX_FILE_SIZE ) continue // skip too large files
+            formData.append('file', file)
+            uploading[file.name] = { status: "busy" }
+            // Spread the uploads a little
+            setTimeout(() => upload(formData), i / 10 * 100)
+        }
+        filesToUpload.value = []
+    }
+
+    /**
+     * Clear errors from not yet uploaded files.
+     */
+    function clearUploadErrors() {
+        Object.keys(uploading).forEach(key => {
+            if (uploading[key].status === "error")
+                delete uploading[key]
+        })
+    }
+
+    /**
+     * Add content type header.
+     * @param fd FormData with file to upload.
+     * @param contentType Content type header.
+     * @param exts File extensions to apply the content type header to.
+     */
+    function addContentTypeHeader(fd: FormData): Record<string, string> | null {
+        let exts_and_headers = {
+            "tsv": "text/tab-separated-values",
+            "conllu": "text/tab-separated-values",
+            "naf": "text/xml",
+        }
+
+        let file = fd.get("file") as File
+        const extension = file?.name.split('.').at(-1)
+        let header = null
+
+        if (Object.keys(exts_and_headers).includes(extension)) {
+            const contentType = exts_and_headers[extension]
+            file = new File([file], file.name, { type: contentType })
+            header = { 'Content-Type': contentType }
+            fd.set("file", file)
+        }
+        return header
+    }
+
+    /**
+     * Upload a single file. Takes http content type header into account.
+     * @param formData FormData with file to upload.
+     */
+    function upload(formData: FormData) {
+        let file = formData.get("file") as File
+        
+        // Some files need an explicit content type header.
+        let header = addContentTypeHeader(formData)
+
+        // Update status on upload, on success and on error.
+        uploading[(file?.name)] = { status: 'busy' }
+        API.postDocument(corporaStore.activeUUID, formData, header)
+            .then(() => {
+                uploading[file?.name] = { status: 'success' }
+            })
+            .catch(error => uploading[file.name] = { status: 'error', message: error.response.data.message })
+            .finally(() => {
+                if (uploadBusyCount.value == 0)
+                    reloadForActiveUserCorpus()
+            })
+    }
+
+    /**
+     * Checks if the documentsStore.available contains at least one file of the given format.
+     */
+    function containsFormat(format: Format): boolean {
+        return available.value.some(i => {
+            // Overwrite the format for legacy formats.
+            let otherFormat = i.format
+            if (otherFormat == Format.Tei_p5_legacy) {
+                otherFormat = Format.Tei_p5
+            }
+            return otherFormat == format
+        })
+    }
+
+    // Exports
+    return {
+        // Fields
+        available, filesToUpload, illegalFiles, loading, tooLargeFiles, uploading,
+        uploadBusyCount, uploadErrorCount, totalSizeInChars, numSourceAnnotations,
+        // Methods
+        reloadDocumentsForCorpus, deleteDocument, downloadRaw, uploadAll, clearUploadErrors, containsFormat
+    }
+})
+
+export default documents

From 2717a7fced21254cf508e0cad332d16beffde8ed Mon Sep 17 00:00:00 2001
From: Vincent Prins <vincent.prins@ivdnt.org>
Date: Mon, 17 Jun 2024 12:58:11 +0200
Subject: [PATCH 10/15] Small update of help text

---
 .../components/help/DifferentTagsetsHelp.vue  |  2 +-
 .../src/views/help/subviews/GeneralView.vue   | 65 +++++++++----------
 2 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/client/src/components/help/DifferentTagsetsHelp.vue b/client/src/components/help/DifferentTagsetsHelp.vue
index c8af1ca..a53366c 100644
--- a/client/src/components/help/DifferentTagsetsHelp.vue
+++ b/client/src/components/help/DifferentTagsetsHelp.vue
@@ -2,7 +2,7 @@
     <p>
         <i>
             <b>*</b> When the tagset used in the reference layer differs from the tagset of the hypothesis layer, the
-            information on the accuracy of the PoS tagging below is meaningless. If so, please use the PoS confusion
+            information on the accuracy of the PoS tagging below is meaningless. If so, please use the PoS Confusion
             table to get more insight into the performance of the evaluated tagger.
         </i>
     </p>
diff --git a/client/src/views/help/subviews/GeneralView.vue b/client/src/views/help/subviews/GeneralView.vue
index 1a89985..0c566c9 100644
--- a/client/src/views/help/subviews/GeneralView.vue
+++ b/client/src/views/help/subviews/GeneralView.vue
@@ -98,26 +98,18 @@
           fragmented, mutually incompatible, and far from providing a completely satisfactory solution.
         </p>
         <p>
-          We have addressed this problem in the CLARIAH+ task <i>Infrastructure for historical Dutch</i>, by:
-        </p>
-        <ol>
-          <li>
-            Defining a <a href="https://ivdnt.org/wp-content/uploads/2021/05/TDN_INT_WP_1.pdf">tagset</a> applicable to
-            all phases of historical Dutch (TDN), with mappings to the
-            tagsets used in existing historical and modern corpora.
-          </li>
-          <li>
-            Harmonising and extending <a href="https://github.com/INL/galahad-corpus-data/">training and evaluation
-              material</a>.
-          </li>
-          <li>
-            Developing an online infrastructure for historical corpus building and deployment, consisting of the <a
-              href="https://autosearch.ivdnt.org/">Autosearch</a> corpus exploration environment, the <a
-              href="https://portal.clarin.ivdnt.org/lancelot/">LAnCeLoT</a> tool for manual correction of linguistic
-            annotation and the GaLAHaD application for the deployment and evaluation of various approaches to automatic
-            linguistic annotation.
-          </li>
-        </ol>
+          We have addressed this problem in the CLARIAH+ task <i>Infrastructure for historical Dutch</i>, by 1.
+          defining a <a href="https://ivdnt.org/wp-content/uploads/2021/05/TDN_INT_WP_1.pdf">tagset</a> applicable to
+          all phases of historical Dutch (TDN), with mappings to the
+          tagsets used in existing historical and modern corpora, 2. by harmonising and extending <a
+            href="https://github.com/INL/galahad-corpus-data/">training and evaluation
+            material</a>, and 3. by developing an online infrastructure for historical corpus building and deployment,
+          consisting of the <a href="https://autosearch.ivdnt.org/">Autosearch</a> corpus exploration environment, the
+          <a href="https://portal.clarin.ivdnt.org/lancelot/">LAnCeLoT</a> tool for manual correction of linguistic
+          annotation and the GaLAHaD application for the deployment and evaluation of various approaches to automatic
+          linguistic annotation.
+        </p>
+
 
         <!-- H2: Introducing GaLAHaD -->
         <h2 id="galahad">Introducing GaLAHaD</h2>
@@ -169,7 +161,7 @@
         <h3 id="own-corpus">Scenario 1: Annotate and evaluate your own corpus</h3>
         <p>
           You can create a corpus within the platform that you would like to annotate. Corpora you have uploaded will be
-          listed in <code>Corpora</code> under "Your corpora". When you have uploaded a corpus, you can always
+          listed in <code>Corpora</code> under "your corpora". When you have uploaded a corpus, you can always
           modify the metadata. You can also remove an uploaded corpus from the platform.
         </p>
 
@@ -201,12 +193,12 @@
         <p>
           To start a tagging job, click on <code>View & Tag</code> in the list of tools and then on <code
             class="green-marker">Start</code> to start a job. This may take a while, depending on the corpus size. The
-          progress of your job or jobs is listed per tool in the tool overview.
+          progress of your job or jobs is listed per tool in the tagger overview.
         </p>
         <p>
           The tagger status (pending, busy, error, finished) will be displayed in the status bar. Tagging is carried out
           in the background. You do not need to keep the application open. The total number of documents that is being
-          processed is given to indicate how busy the server is.
+          processed indicates how busy the server is.
         </p>
         <p>
           You can also stop and delete existing jobs. A preview of the resulting annotation layer is shown as well.
@@ -257,11 +249,13 @@
         <h3 id="explore-benchmark">Scenario 2: explore the evaluation results of the available benchmark corpora</h3>
         <ul>
           <li>Select a corpus by clicking on a row.</li>
-          <li>Click on Documents to view the content of the uploaded corpus.</li>
-          <li>Click on Jobs to get an overview of the taggers used on the benchmark corpus.</li>
-          <li>Click on Evaluate to evaluate the linguistic annotation of the selected corpus. For further information on
-            the evaluation, see the section below.</li>
+          <li>Click on <code>Documents</code> to view the content of the uploaded corpus.</li>
+          <li>Click on <code>Jobs</code> to get an overview of the taggers used on the benchmark corpus.</li>
+          <li>Click on <code>Evaluate</code> to evaluate the linguistic annotation of the selected corpus.</li>
         </ul>
+        <p>
+          For further information on the evaluation, see the section below.
+        </p>
 
         <!-- H2: Evaluation -->
         <h2 id="evaluation">On Evaluation</h2>
@@ -307,7 +301,7 @@
         <p>
           The reference layer is the annotation layer you want to compare the hypothesis layer to. It can either be the
           source layer, i.e. the annotation that was already in your corpus when uploading it to the platform, or an
-          annotation layer of another tagger you tagged your corpus with on the platform.
+          annotation layer coming from another tagger of the platform.
         </p>
 
         <h4>True positive (TP)</h4>
@@ -400,7 +394,7 @@
           available layers in your corpus will be shown in the drop-down list. Once you have selected a reference layer
           and a hypothesis layer, the evaluation metrics will be computed. The result is information on
           <code>Distribution</code>, <code>Global Metrics</code>, <code>Grouped Metrics</code> and
-          <code>Pos confusion</code>. The evaluation results are downloadable.
+          <code>Pos Confusion</code>. The evaluation results are downloadable.
         </p>
 
         <h4 id="distribution">Distribution</h4>
@@ -428,7 +422,7 @@
           have been selected for lemma and PoS comparison.
         </p>
         <p>
-          The <code>Basic Global Metrics</code> table gives information on Lemma, PoS or the combination of Lemma and
+          The <code>Basic Global Metrics</code> table gives information on lemma, PoS or the combination of Lemma and
           PoS. The <code>Extended Global Metrics</code> table gives more detailed information on the accuracy of tokens
           with a single analysis versus tokens with a multiple analysis.
         </p>
@@ -488,7 +482,7 @@
           A data sample of Group NOU-C, False Negative (Annotation PoS; Group by PoS; Both single/multiple analysis):
         </p>
         <img src="@/assets/help/grouped-metrics-sample.png" />
-        <p>
+        <p class="red">
           Note that token mismatches can occur when the tagger treats punctuation for abbreviations as a separate token
           (in abbreviations like "e.g." or "i.e.", or in "mr." in the example above).
         </p>
@@ -504,7 +498,10 @@
           The confusion table contains information on each part of speech and on the amount of no-matches. The category
           "MULTIPLE" contains combined tags like "ADP+NOU-C" or "VRB+PD+PD". These are shown in one cell, but this does
           not mean that the taggers agree on the exact tags. Click on the cell or look at the
-          <code>Global Metrics</code> for more details. No_pos refers to missing part of speech tagging.
+          <code>Global Metrics</code> for more details. NO_POS refers to missing part of speech tagging, PC refers to
+          the encoding of punctuation and <i>Missing Match</i> refers to tokens that could not be aligned (for example,
+          due to how a tagger treats punctuation in abbreviations).
+
         </p>
         <p>
           An example of a confusion matrix:
@@ -586,7 +583,9 @@ img {
   margin: 0 auto;
 }
 
-
+p.red {
+  color: red;
+}
 
 h3,
 h4 {

From 36c58d831b14cb477b4a26f5eb7b687f2f06be19 Mon Sep 17 00:00:00 2001
From: Vincent Prins <vincent.prins@ivdnt.org>
Date: Wed, 19 Jun 2024 11:28:17 +0200
Subject: [PATCH 11/15] Cache evaluation results

---
 client/src/stores/evaluation.ts               |   7 +-
 .../subviews/evaluate/EvaluateView.vue        | 283 ++++++++++--------
 2 files changed, 158 insertions(+), 132 deletions(-)

diff --git a/client/src/stores/evaluation.ts b/client/src/stores/evaluation.ts
index c195090..a93ab25 100644
--- a/client/src/stores/evaluation.ts
+++ b/client/src/stores/evaluation.ts
@@ -6,6 +6,7 @@ import stores, { AppStore, CorporaStore, JobSelectionStore } from '@/stores'
 import * as API from "@/api/evaluation"
 import * as Utils from "@/api/utils"
 import { Term, TermComparison } from "@/types/evaluation"
+import { UUID } from "@/types/corpora"
 
 // For some reason the terms are undefined sometimes
 // We handle it here
@@ -37,6 +38,10 @@ const useEvaluation = defineStore('evaluation', () => {
 
     // Fields
     const loading = ref(false)
+    /** Hypothesis, reference and corpusUUID for which the current evaluations are loaded. */
+    const hypothesis = ref(null as string | null)
+    const reference = ref(null as string | null)
+    const corpusUUID = ref(null as UUID | null)
 
     // Methods
     function downloadCSV() {
@@ -48,7 +53,7 @@ const useEvaluation = defineStore('evaluation', () => {
     }
 
     // Exports
-    return { downloadCSV, loading }
+    return { downloadCSV, loading, hypothesis, reference, corpusUUID }
 })
 
 export default useEvaluation
diff --git a/client/src/views/annotate/subviews/evaluate/EvaluateView.vue b/client/src/views/annotate/subviews/evaluate/EvaluateView.vue
index a569dcc..5727e9e 100644
--- a/client/src/views/annotate/subviews/evaluate/EvaluateView.vue
+++ b/client/src/views/annotate/subviews/evaluate/EvaluateView.vue
@@ -1,132 +1,153 @@
-<!-- Do not put a comment between <template> and <AnnotateTab>
-    It breaks vue... https://github.com/vuejs/vue/issues/2253 -->
-
-<template>
-    <AnnotateTab>
-        <!-- title-only card -->
-        <GCard :title="`Evaluate corpus ${corporaStore.activeCorpus?.name}`" helpSubject="evaluation">
-            <template #help>
-                <component :is="help.evaluate"></component>
-            </template>
-            <!-- Explicitly empty body-->
-            <template></template>
-        </GCard>
-        <!-- Choose hypothesis and reference -->
-        <div style="display: flex; width: 100%; align-items: center; justify-content: center; flex-wrap: wrap">
-            <JobSelect />
-            <JobSelect :isReference="true" />
-            <GCard title="Download as CSV" noHelp>
-                <i v-if="!jobSelection.hypothesisJobId || !jobSelection.referenceJobId">Select both layers first.</i>
-                <DownloadButton v-else wide @click="evaluation.downloadCSV()" :loading="evaluation.loading" />
-            </GCard>
-        </div>
-
-        <!-- Table tabs -->
-        <GTabs ref="tabs" class="level-3" :basePath="basePath" :tabs="[
-            { id: 'distribution', title: 'Distribution' },
-            { id: 'global_metrics', title: 'Global Metrics' },
-            { id: 'grouped_metrics', title: 'Grouped Metrics' },
-            { id: 'confusion', title: 'Pos Confusion' }
-        ]">
-        </GTabs>
-
-    </AnnotateTab>
-</template>
-
-<script setup lang="ts">
-// Libraries & stores
-import { onMounted, watch } from 'vue'
-import stores, {
-    DistributionStore, JobsStore, MetricsStore, EvaluationStore,
-    JobSelectionStore, ConfusionStore, CorporaStore, DocumentsStore
-} from '@/stores'
-// Components
-import { GCard, GTabs, AnnotateTab, JobSelect, DownloadButton } from '@/components'
-import help from '@/components/help'
-import { SOURCE_LAYER } from '@/types/jobs';
-
-// Stores
-const jobsStore = stores.useJobs() as JobsStore
-const evaluation = stores.useEvaluation() as EvaluationStore
-const confusion = stores.useConfusion() as ConfusionStore
-const distribution = stores.useDistribution() as DistributionStore
-const metrics = stores.useMetrics() as MetricsStore
-const jobSelection = stores.useJobSelection() as JobSelectionStore
-const corporaStore = stores.useCorpora() as CorporaStore
-const documentsStore = stores.useDocuments() as DocumentsStore
-
-// Fields
-const props = defineProps(['basePath'])
-
-// Methods
-/**
- * Reloads the three evaluation types for the current hypothesis and reference.
- * Because distribution is affected solely by hypothesis changes, it is not reloaded by default.
- * Check whether the hypothesis has changed yourself.
- * @param reloadDistribution Whether to reload the distribution as well.
- */
-function reloadEvaluationData(reloadDistribution = false) {
-    if (!corporaStore.activeCorpus) return
-    if (!jobSelection.selectionsValid) return
-    const hypothesis = jobSelection.hypothesisJobId
-    const reference = jobSelection.referenceJobId
-
-    if (reference != null && hypothesis != null) {
-        confusion.reset()
-        metrics.reset()
-        confusion.reloadForUUIDHypothesisReference(corporaStore.activeUUID, hypothesis, reference)
-        metrics.reloadForUUIDHypothesisReference(corporaStore.activeUUID, hypothesis, reference)
-    }
-    // Distribution is unaffected by reference changes, so explicitly ask for it.
-    if (reloadDistribution && hypothesis != null) {
-        distribution.reset()
-        distribution.reloadForUUIDHypothesis(corporaStore.activeUUID, hypothesis)
-    }
-}
-
-// Watches & mounts
-onMounted(() => {
-    // Always reset, because e.g. the selected corpus might have changed
-    confusion.reset()
-    metrics.reset()
-    distribution.reset()
-})
-
-// On corpus (=dataset) selection, reload jobs & docs for that corpus
-watch(() => corporaStore.activeCorpus, () => {
-    // Jobs needed for jobs <select>.
-    jobsStore.reload()
-    // Docs needed to determine whether the sourceLayer job has annotations.
-    documentsStore.reloadDocumentsForCorpus(corporaStore.activeUUID)
-}, { immediate: true })
-
-// Reload data on job selection changes.
-watch(() => jobSelection.hypothesisJobId, () => {
-    reloadEvaluationData(true)
-})
-watch(() => jobSelection.referenceJobId, () => {
-    reloadEvaluationData()
-})
-// OnLoad, we also have to wait on validation.
-watch(() => jobSelection.selectionsValid, () => {
-    if (jobSelection.selectionsValid) {
-        reloadEvaluationData(true)
-    }
-    // At this point, invalid selections are set to null.
-    // So we can override the reference to a default.
-    if (jobSelection.referenceJobId == null) {
-        jobSelection.referenceJobId = SOURCE_LAYER
-    }
-}, { immediate: true })
-
-</script>
-
-<style scoped lang="scss">
-.level-3 {
-    margin-top: 2em;
-
-    :deep(h3) {
-        margin-bottom: 0;
-    }
-}
+<!-- Do not put a comment between <template> and <AnnotateTab>
+    It breaks vue... https://github.com/vuejs/vue/issues/2253 -->
+
+<template>
+    <AnnotateTab>
+        <!-- title-only card -->
+        <GCard :title="`Evaluate corpus ${corporaStore.activeCorpus?.name}`" helpSubject="evaluation">
+            <template #help>
+                <component :is="help.evaluate"></component>
+            </template>
+            <!-- Explicitly empty body-->
+            <template></template>
+        </GCard>
+        <!-- Choose hypothesis and reference -->
+        <div style="display: flex; width: 100%; align-items: center; justify-content: center; flex-wrap: wrap">
+            <JobSelect />
+            <JobSelect :isReference="true" />
+            <GCard title="Download as CSV" noHelp>
+                <i v-if="!jobSelection.hypothesisJobId || !jobSelection.referenceJobId">Select both layers first.</i>
+                <DownloadButton v-else wide @click="evaluation.downloadCSV()" :loading="evaluation.loading" />
+            </GCard>
+        </div>
+
+        <!-- Table tabs -->
+        <GTabs ref="tabs" class="level-3" :basePath="basePath" :tabs="[
+            { id: 'distribution', title: 'Distribution' },
+            { id: 'global_metrics', title: 'Global Metrics' },
+            { id: 'grouped_metrics', title: 'Grouped Metrics' },
+            { id: 'confusion', title: 'Pos Confusion' }
+        ]">
+        </GTabs>
+
+    </AnnotateTab>
+</template>
+
+<script setup lang="ts">
+// Libraries & stores
+import { onMounted, watch } from 'vue'
+import stores, {
+    DistributionStore, JobsStore, MetricsStore, EvaluationStore,
+    JobSelectionStore, ConfusionStore, CorporaStore, DocumentsStore
+} from '@/stores'
+// Components
+import { GCard, GTabs, AnnotateTab, JobSelect, DownloadButton } from '@/components'
+import help from '@/components/help'
+import { SOURCE_LAYER } from '@/types/jobs';
+
+// Stores
+const jobsStore = stores.useJobs() as JobsStore
+const evaluation = stores.useEvaluation() as EvaluationStore
+const confusion = stores.useConfusion() as ConfusionStore
+const distribution = stores.useDistribution() as DistributionStore
+const metrics = stores.useMetrics() as MetricsStore
+const jobSelection = stores.useJobSelection() as JobSelectionStore
+const corporaStore = stores.useCorpora() as CorporaStore
+const documentsStore = stores.useDocuments() as DocumentsStore
+
+// Fields
+const props = defineProps(['basePath'])
+
+// Methods
+/**
+ * Whether the corpusUUID or the hypothesis/reference has changed since the last generated evaluation.
+ */
+function evaluationRequestHasChanged(): boolean {
+    return evaluation.corpusUUID != corporaStore.activeUUID
+        || evaluation.hypothesis != jobSelection.hypothesisJobId
+        || evaluation.reference != jobSelection.referenceJobId
+}
+
+/**
+ * Reloads the three evaluation types for the current hypothesis and reference.
+ * Because distribution is affected solely by hypothesis changes, it is not reloaded by default.
+ * Check whether the hypothesis has changed yourself.
+ * @param reloadDistribution Whether to reload the distribution as well.
+ */
+function reloadEvaluationData(reloadDistribution = false) {
+    if (!corporaStore.activeCorpus) return
+    if (!jobSelection.selectionsValid) return
+    const hypothesis = jobSelection.hypothesisJobId
+    const reference = jobSelection.referenceJobId
+
+    // Only reload if either the corpus uuid or the hypothesis/reference has changed.
+    if (!evaluationRequestHasChanged()) {
+        return
+    }
+
+    if (reference != null && hypothesis != null) {
+        confusion.reloadForUUIDHypothesisReference(corporaStore.activeUUID, hypothesis, reference)
+        metrics.reloadForUUIDHypothesisReference(corporaStore.activeUUID, hypothesis, reference)
+    }
+    // Distribution is unaffected by reference changes, so explicitly ask for it.
+    if (reloadDistribution && hypothesis != null) {
+        distribution.reloadForUUIDHypothesis(corporaStore.activeUUID, hypothesis)
+    }
+
+    // Save the evaluation request, so we don't reload it again (we cache it).
+    if (hypothesis != null) evaluation.hypothesis = hypothesis
+    if (reference != null) evaluation.reference = reference
+    evaluation.corpusUUID = corporaStore.activeUUID
+}
+
+// Watches & mounts
+onMounted(() => {
+    // Always reset, because e.g. the selected corpus might have changed
+    if (!evaluationRequestHasChanged()) {
+        return
+    }
+    confusion.reset()
+    metrics.reset()
+    distribution.reset()
+})
+
+// On corpus (=dataset) selection, reload jobs & docs for that corpus
+watch(() => corporaStore.activeCorpus, () => {
+    // Jobs needed for jobs <select>.
+    jobsStore.reload()
+    // Docs needed to determine whether the sourceLayer job has annotations.
+    documentsStore.reloadDocumentsForCorpus(corporaStore.activeUUID)
+}, { immediate: true })
+
+// Reload data on job selection changes.
+watch(() => jobSelection.hypothesisJobId, () => {
+    if (!jobSelection.selectionsValid) return
+    reloadEvaluationData(true)
+})
+watch(() => jobSelection.referenceJobId, () => {
+    if (!jobSelection.selectionsValid) return
+    reloadEvaluationData()
+})
+// OnLoad, we also have to wait on validation.
+watch(() => jobSelection.selectionsValid, () => {
+    if (jobSelection.selectionsValid) {
+        reloadEvaluationData(true)
+    }
+    // At this point, invalid selections are set to null.
+    // So we can override the reference to the sourceLayer as a default (if it exists).
+    if (jobSelection.referenceJobId == null && documentsStore.numSourceAnnotations > 0) {
+        jobSelection.referenceJobId = SOURCE_LAYER
+    }
+}, { immediate: true })
+
+</script>
+
+<style scoped lang="scss">
+.level-3 {
+    margin-top: 2em;
+
+    :deep(h3) {
+        margin-bottom: 0;
+    }
+}
 </style>
\ No newline at end of file

From 4ad80de18bd5941b2fa6328cebe5a4d0d2134af3 Mon Sep 17 00:00:00 2001
From: Vincent Prins <vincent.prins@ivdnt.org>
Date: Wed, 19 Jun 2024 11:52:51 +0200
Subject: [PATCH 12/15] Fixed TEI merging bug

Fixing the scenario: w<a>o<b>rd </b>w</a>ord
---
 .../galahad/port/tei/export/TEITextMerger.kt  | 650 +++++++++---------
 .../org/ivdnt/galahad/util/NodeExtensions.kt  |   6 +-
 .../resources/tei/twine/merged-output.xml     | 284 ++++----
 .../src/test/resources/tei/twine/pie-tdn.tsv  |  22 +-
 .../test/resources/tei/twine/plaintext.txt    |  14 +
 .../test/resources/tei/twine/twine.input.xml  |  11 +
 6 files changed, 525 insertions(+), 462 deletions(-)

diff --git a/server/src/main/kotlin/org/ivdnt/galahad/port/tei/export/TEITextMerger.kt b/server/src/main/kotlin/org/ivdnt/galahad/port/tei/export/TEITextMerger.kt
index b1f008d..50cddb5 100644
--- a/server/src/main/kotlin/org/ivdnt/galahad/port/tei/export/TEITextMerger.kt
+++ b/server/src/main/kotlin/org/ivdnt/galahad/port/tei/export/TEITextMerger.kt
@@ -1,310 +1,342 @@
-package org.ivdnt.galahad.port.tei.export
-
-import org.ivdnt.galahad.app.report.Report
-import org.ivdnt.galahad.data.layer.Layer
-import org.ivdnt.galahad.port.folia.export.deepcopy
-import org.ivdnt.galahad.port.xml.getPlainTextContent
-import org.ivdnt.galahad.util.insertFirst
-import org.ivdnt.galahad.util.containedIn
-import org.ivdnt.galahad.util.matchesUpTo
-import org.w3c.dom.Document
-import org.w3c.dom.Element
-import org.w3c.dom.Node
-import java.util.*
-import kotlin.collections.ArrayList
-import org.ivdnt.galahad.data.document.DocumentFormat
-import org.ivdnt.galahad.data.layer.WordForm
-
-fun HashSet<String>.contains(s: String?, ignoreCase: Boolean = false): Boolean {
-    return any { it.equals(s, ignoreCase) }
-}
-
-fun Node.wrapChildrenIn(newNode: Node) {
-    val children = this.childNodes.deepcopy()
-    for (child in children) {
-        newNode.appendChild(child)
-    }
-    // this.childnodes.length is now zero
-    newNode.parentNode.insertBefore(this, newNode)
-    this.appendChild(newNode)
-}
-
-open class TEITextMerger(
-    var node: Node,
-    var offset: Int,
-    var document: Document,
-    val wordFormIter: ListIterator<WordForm>,
-    private val deleteList: ArrayList<Node>,
-    val layer: Layer,
-    val format: DocumentFormat,
-) {
-    var newWTag: Element? = null
-
-    open fun merge() {
-        if (node.nodeType == Node.TEXT_NODE) {
-            handeTextNode()
-        } else if (node.nodeType == Node.ELEMENT_NODE) {
-            handleElementNode()
-        }
-    }
-
-    private fun handeTextNode() {
-        // Check whether there are wordforms to add
-        val wordFromsToAdd = getWordFormsToAdd().sortedBy { it.offset }
-        if (wordFromsToAdd.isNotEmpty()) {
-            // add the wordforms, mark this node for deletion
-            markForDeletion(node)
-            var previousEndOffset = offset
-            for (wf in wordFromsToAdd) {
-                if (wf.offset < offset) {
-                    previousEndOffset = updateEndOffset(wf, previousEndOffset)
-                    continue // It has been merged with a previous <w>.
-                }
-                addWordForm(previousEndOffset, wf)
-                previousEndOffset = wf.endOffset
-            }
-            addTrailingChars(wordFromsToAdd)
-        }
-    }
-
-    protected fun markForDeletion(n: Node): Boolean {
-        // If not contained in w, delete it.
-        val shouldDelete = !n.containedIn("w")
-        if (shouldDelete) deleteList.add(n)
-        return shouldDelete
-    }
-
-    private fun addTrailingChars(wordFromsToAdd: List<WordForm>) {
-        var startIndex: Int = wordFromsToAdd.last().endOffset - offset
-        if (startIndex > node.textContent.length) {
-            startIndex = node.textContent.length
-        }
-        if (node.nodeType == Node.TEXT_NODE) {
-            val trailingText = node.textContent.substring(startIndex, node.textContent.length)
-            if (trailingText.isNotEmpty()) {
-                val trailingChars = document.createTextNode(trailingText)
-                node.parentNode.insertBefore(trailingChars, node)
-            }
-        }
-    }
-
-    private fun updateEndOffset(wf: WordForm, previousEndOffset: Int): Int {
-        val words = node.textContent.split(Regex("""\s+"""))
-        if (words[0].isNotEmpty()) {
-            var i = 0
-            var startIndex: Int
-            do {
-                startIndex = wf.literal.lastIndexOf(words[0].substring(0, words[0].length - i))
-                i++
-            } while (startIndex == -1)
-            return previousEndOffset + wf.literal.length - startIndex
-        }
-        return previousEndOffset
-    }
-
-    protected open fun addWordForm(previousEndOffset: Int, wf: WordForm) {
-        // add leading characters
-        val leadingCharsText = node.textContent.substring(previousEndOffset - offset, wf.offset - offset)
-        if (leadingCharsText.isNotEmpty()) {
-            val leadingCharsNode = document.createTextNode(leadingCharsText)
-            node.parentNode.insertBefore(leadingCharsNode, node)
-        }
-
-        // add <w> tag or <pc> tag, depending on pos-tag
-        newWTag = createWTag(wf)
-        var endOffset: Int = wf.endOffset - offset
-        if (endOffset > node.textContent.length) {
-            endOffset = node.textContent.length
-        }
-
-        // If our current text matches only partially, we will have to merge nodes.
-        val baseText = node.textContent.substring(wf.offset - offset, endOffset)
-        if (wf.literal == baseText) {
-            val newTextNode: Node = document.createTextNode(wf.literal)
-            node.parentNode.insertBefore(newWTag, node)
-            newWTag!!.insertFirst(newTextNode)
-        } else {
-            mergeTextNodes(baseText, newWTag!!, wf)
-        }
-    }
-
-    private fun mergeTextNodes(baseText: String, wTag: Element, wf: WordForm) {
-        // Create a newTextNode, because node is in deleteList.
-        val newTextNode: Node = document.createTextNode(baseText)
-        node.parentNode.replaceChild(wTag, node)
-        // node is now dangling, so give it a textable parent.
-        val tmp = document.createElement("w")
-        tmp.appendChild(node)
-        // Now it is safe to overwrite node.
-        node = newTextNode
-        wTag.appendChild(node)
-        // Start merging the <w> with what comes next.
-        mergeWTagWithSiblings(wTag, wf)
-    }
-
-    private fun mergeWTagWithSiblings(wTag: Element, wf: WordForm) {
-        var wTag: Element = wTag
-        do {
-            // Go up in the tree until we have a nextSibling.
-            while (wTag.nextSibling == null) {
-                //wTag.wrapChildrenIn(wTag.parentNode)
-                wTag = moveWTagUp(wTag)
-            }
-            // Text contents.
-            val sibText = wTag.nextSibling.getPlainTextContent()
-            val plainText = wTag.getPlainTextContent()
-            var wText = ""
-            for (i in plainText.length-1 downTo 0) {
-                val tmp = plainText.substring(i)
-                if (!wf.literal.contains(tmp)) break
-                wText = tmp
-            }
-
-            val stillNeeded = wf.literal.substring(wText.length)
-            // Determine up to where the sibText matches stillNeeded.
-            val matchingIndex = sibText.matchesUpTo(stillNeeded)
-            // Append the part that matches
-            if (sibText.length == matchingIndex) wTag.appendChild(wTag.nextSibling)
-            else {
-                val sibClone = wTag.nextSibling.cloneNode(true)
-                val sibTextToMatch = sibText.substring(0, matchingIndex)
-                val textToMatch = wText + sibTextToMatch
-                while (wText + sibClone.getPlainTextContent() != textToMatch) {
-                    // get last element
-                    var lastChild = sibClone
-                    while (lastChild.lastChild != null) {
-                        lastChild = lastChild.lastChild
-                    }
-                    // cut or delete
-                    if (lastChild.textContent.isNotEmpty()) {
-                        val matchesUpTo: Int = lastChild.textContent.matchesUpTo(sibTextToMatch)
-                        lastChild.textContent = lastChild.textContent.substring(0, matchesUpTo)
-                    } else {
-                        lastChild.parentNode.removeChild(lastChild)
-                    }
-                }
-                wTag.appendChild(sibClone)
-            }
-            // Continue while the literal is still only partially found
-        } while (!wTag.textContent.contains(wf.literal))
-    }
-
-    protected open fun moveWTagUp(wTag: Element): Element {
-        // TODO this still breaks in some cases.
-        wTag.wrapChildrenIn(wTag.parentNode)
-        return wTag
-    }
-
-    protected open fun createWTag(wf: WordForm): Element {
-        val termToAdd = layer.termForWordForm(wf)
-        val wTag = if (layer.tagset.punctuationTags.contains(termToAdd.pos)) {
-            val n = document.createElement("pc")
-            n
-        } else {
-            val n = document.createElement("w")
-            n.setAttribute("lemma", termToAdd.lemma)
-            n
-        }
-        // Both <w> and <pc> have a pos.
-        wTag.setAttribute(posType(), termToAdd.pos)
-        return wTag
-    }
-
-    private fun posType(): String {
-        // For now always write pos to the @pos attribute.
-        // Even for legacy formats, because we want to update to TEIp5.
-        return "pos"
-    }
-
-    protected fun getWordFormForOffsetOrNull(): WordForm? {
-        while(wordFormIter.hasNext()) {
-            val wf = wordFormIter.next()
-            if (wf.offset == offset) {
-                return wf
-            } else if (wf.offset > offset) {
-                // overstepped
-                wordFormIter.previous()
-                break
-            }
-        }
-        return null
-    }
-
-    protected open fun handleElementNode() {
-        val element = node as Element
-        if (element.tagName == "w" || element.tagName == "pc") {
-            var wordFormToAdd: WordForm? = getWordFormForOffsetOrNull()
-            if (wordFormToAdd != null) {
-                // remove all whitespace within a <w>-tag (although this rarely occurs anyway).
-                val sourceLiteral = node.getPlainTextContent().replace(Regex("""\s"""), "")
-                if (wordFormToAdd.literal == sourceLiteral) {
-                    // This is a simple case since the tokenization matches
-                    mergeWTag(wordFormToAdd, element)
-                } else {
-                    // Tokenization mismatch, report it
-                    Report.spottedIncompatibleTokenization(
-                        wordFormToAdd, WordForm(
-                            node.textContent, offset, node.textContent.length,
-                            node.attributes?.getNamedItem("xml:id")?.textContent ?: ""
-                        )
-                    )
-
-                    // Best effort to fix it
-                    if (wordFormToAdd.length > node.getPlainTextContent().length) {
-                        // Add the term to this node,
-                        // The excess length is ignored, which might result in the following token missing it's match
-                        mergeWTag(wordFormToAdd, element)
-                    } else { // wordFormToAdd.length < node.textContent.length
-                        // This is a tricky case, we might want to split up the node
-                        // Will leave this case for now
-                        Report.tokenMissingAnnotation(node.textContent, offset)
-                    }
-                }
-            } else {
-                // This is strange, we would expect an annotation, report it
-                Report.tokenMissingAnnotation(node.textContent, offset)
-            }
-        }
-    }
-
-    private fun mergeWTag(wordFormToAdd: WordForm, element: Element) {
-        val termToAdd = layer.termForWordForm(wordFormToAdd)
-        // <pc> tags do not have a lemma.
-        if (element.tagName == "w") {
-            element.setAttribute("lemma", termToAdd.lemma)
-        }
-        element.setAttribute(posType(), termToAdd.pos)
-        element.removeAttribute("type") // Update legacy formats to TEI p5
-    }
-
-    private fun getWordFormsToAdd(): List<WordForm> {
-        val string = node.textContent // TODO or getplaintextcontent() ???
-        val textEndOffset = offset + string.length
-        val result = mutableListOf<WordForm>()
-        // Go to the previous, if there is any.
-        // To fix scenarios like: abc<hi/>def ghi, when parsing the text node 'def ghi'.
-        if (wordFormIter.hasPrevious()) {
-            val prev = wordFormIter.previous()
-            if (endOfTermWithinText(prev, textEndOffset)) {
-                result.add(prev)
-            }
-            wordFormIter.next()
-        }
-        while (wordFormIter.hasNext()) {
-            val it = wordFormIter.next()
-            // Note: 'start'. The end might be in a following node.
-            val startOfTermWithinText = (it.offset >= offset) && (it.offset < textEndOffset)
-            if (startOfTermWithinText || endOfTermWithinText(it, textEndOffset)) {
-                result.add(it)
-            } else {
-                wordFormIter.previous()
-                break
-            }
-        }
-        return result
-    }
-
-    private fun endOfTermWithinText(it: WordForm, textEndOffset: Int): Boolean {
-        return (it.endOffset > offset) && (it.endOffset <= textEndOffset)
-    }
+package org.ivdnt.galahad.port.tei.export
+
+import org.ivdnt.galahad.app.report.Report
+import org.ivdnt.galahad.data.layer.Layer
+import org.ivdnt.galahad.port.folia.export.deepcopy
+import org.ivdnt.galahad.port.xml.getPlainTextContent
+import org.w3c.dom.Document
+import org.w3c.dom.Element
+import org.w3c.dom.Node
+import java.util.*
+import kotlin.collections.ArrayList
+import org.ivdnt.galahad.data.document.DocumentFormat
+import org.ivdnt.galahad.data.layer.WordForm
+import org.ivdnt.galahad.util.*
+
+fun HashSet<String>.contains(s: String?, ignoreCase: Boolean = false): Boolean {
+    return any { it.equals(s, ignoreCase) }
+}
+
+open class TEITextMerger(
+    var node: Node,
+    var offset: Int,
+    var document: Document,
+    val wordFormIter: ListIterator<WordForm>,
+    private val deleteList: ArrayList<Node>,
+    val layer: Layer,
+    val format: DocumentFormat,
+) {
+    var newWTag: Element? = null
+
+    open fun merge() {
+        if (node.nodeType == Node.TEXT_NODE) {
+            handeTextNode()
+        } else if (node.nodeType == Node.ELEMENT_NODE) {
+            handleElementNode()
+        }
+    }
+
+    private fun handeTextNode() {
+        // Check whether there are wordforms to add
+        val wordFromsToAdd = getWordFormsToAdd().sortedBy { it.offset }
+        if (wordFromsToAdd.isNotEmpty()) {
+            // add the wordforms, mark this node for deletion
+            markForDeletion(node)
+            var previousEndOffset = offset
+            for (wf in wordFromsToAdd) {
+                if (wf.offset < offset) {
+                    previousEndOffset = updateEndOffset(wf, previousEndOffset)
+                    continue // It has been merged with a previous <w>.
+                }
+                addWordForm(previousEndOffset, wf)
+                previousEndOffset = wf.endOffset
+            }
+            addTrailingChars(wordFromsToAdd)
+        }
+    }
+
+    protected fun markForDeletion(n: Node): Boolean {
+        // If not contained in w, delete it.
+        val shouldDelete = !n.containedIn("w")
+        if (shouldDelete) deleteList.add(n)
+        return shouldDelete
+    }
+
+    private fun addTrailingChars(wordFromsToAdd: List<WordForm>) {
+        var startIndex: Int = wordFromsToAdd.last().endOffset - offset
+        if (startIndex > node.textContent.length) {
+            startIndex = node.textContent.length
+        }
+        if (node.nodeType == Node.TEXT_NODE) {
+            val trailingText = node.textContent.substring(startIndex, node.textContent.length)
+            if (trailingText.isNotBlank()) {
+                val trailingChars = document.createTextNode(trailingText)
+                node.parentNode.insertBefore(trailingChars, node)
+            } else if (trailingText.isBlank() && trailingText.isNotEmpty()) {
+                // Remove any empty nodes after trailing text has been removed.
+                // Example scenario: <p>exa<hi>mple </hi></p>
+                // After constructing the <w>, the space before the </hi> remains. So we remove it and the parent (the <hi>).
+                if (node.getPlainTextContent() == node.parentNode.getPlainTextContent()) {
+                    deleteList.add(node.parentNode)
+                }
+            }
+        }
+    }
+
+    private fun updateEndOffset(wf: WordForm, previousEndOffset: Int): Int {
+        val words = node.textContent.split(Regex("""\s+"""))
+        if (words[0].isNotEmpty()) {
+            var i = 0
+            var startIndex: Int
+            do {
+                startIndex = wf.literal.lastIndexOf(words[0].substring(0, words[0].length - i))
+                i++
+            } while (startIndex == -1)
+            return previousEndOffset + wf.literal.length - startIndex
+        }
+        return previousEndOffset
+    }
+
+    protected open fun addWordForm(previousEndOffset: Int, wf: WordForm) {
+        // add leading characters
+        val leadingCharsText = node.textContent.substring(previousEndOffset - offset, wf.offset - offset)
+        if (leadingCharsText.isNotEmpty()) {
+            val leadingCharsNode = document.createTextNode(leadingCharsText)
+            node.parentNode.insertBefore(leadingCharsNode, node)
+        }
+
+        // add <w> tag or <pc> tag, depending on pos-tag
+        newWTag = createWTag(wf)
+        var endOffset: Int = wf.endOffset - offset
+        if (endOffset > node.textContent.length) {
+            endOffset = node.textContent.length
+        }
+
+        // If our current text matches only partially, we will have to merge nodes.
+        val baseText = node.textContent.substring(wf.offset - offset, endOffset)
+        if (wf.literal == baseText) {
+            val newTextNode: Node = document.createTextNode(wf.literal)
+            node.parentNode.insertBefore(newWTag, node)
+            newWTag!!.insertFirst(newTextNode)
+        } else {
+            mergeTextNodes(baseText, newWTag!!, wf)
+        }
+    }
+
+    private fun mergeTextNodes(baseText: String, wTag: Element, wf: WordForm) {
+        // Create a newTextNode, because node is in deleteList.
+        val newTextNode: Node = document.createTextNode(baseText)
+        node.parentNode.replaceChild(wTag, node)
+        // node is now dangling, so give it a textable parent.
+        val tmp = document.createElement("w")
+        tmp.appendChild(node)
+        // Now it is safe to overwrite node.
+        node = newTextNode
+        wTag.appendChild(node)
+        // Start merging the <w> with what comes next.
+        mergeWTagWithSiblings(wTag, wf)
+    }
+
+    private fun mergeWTagWithSiblings(wTag: Element, wf: WordForm) {
+        var wTag: Element = wTag
+        do {
+            // Go up in the tree until we have a nextSibling.
+            while (wTag.nextSibling == null) {
+                //wTag.wrapChildrenIn(wTag.parentNode)
+                wTag = moveWTagUp(wTag)
+            }
+            // Text contents.
+            val sibText = wTag.nextSibling.getPlainTextContent()
+            val plainText = wTag.getPlainTextContent()
+            var wText = ""
+            for (i in plainText.length-1 downTo 0) {
+                val tmp = plainText.substring(i)
+                if (!wf.literal.contains(tmp)) break
+                wText = tmp
+            }
+
+            val stillNeeded = wf.literal.substring(wText.length)
+            // Determine up to where the sibText matches stillNeeded.
+            val matchingIndex = sibText.matchesUpTo(stillNeeded)
+            // Append the part that matches
+            if (sibText.length == matchingIndex) {
+                // The whole sibling text matches: e.g. van<ex>den</ex>
+                wTag.appendChild(wTag.nextSibling)
+            }
+            else { // The sibling text matches partially: e.g. van<ex>den graal</ex>
+                val sibClone = wTag.nextSibling.cloneNode(true)
+                val clean = wTag.nextSibling.cloneNode(false)
+                if (clean.nodeType == Node.TEXT_NODE) {
+                    clean.textContent = ""
+                }
+                val sibTextToMatch = sibText.substring(0, matchingIndex)
+                treeTraversal(sibClone, sibTextToMatch, clean, clean)
+                wTag.appendChild(clean)
+            }
+            // Continue while the literal is still only partially found
+        } while (!wTag.textContent.contains(wf.literal))
+    }
+
+    private fun treeTraversal(node: Node, textToMatch: String, clean: Node, cleanIndex: Node): Boolean {
+        // leaf node action: either add the text as a whole, or add a part
+        if (node.nodeType == Node.TEXT_NODE) {
+            val nodeText = node.getPlainTextContent()
+            if (nodeText.isNotEmpty()) { // some text: e.g. van<ex>den graal</ex>
+                val correctedTextToMatch = textToMatch.substring(clean.getPlainTextContent().length)
+                val matchesUpTo: Int = nodeText.matchesUpTo(correctedTextToMatch)
+                cleanIndex.textContent = nodeText.substring(0, matchesUpTo)
+            } else {
+                // Nothing to do. Remember: [node] is already cloned to [clean].
+            }
+            // Are we done now?
+            if (clean.getPlainTextContent() == textToMatch) {
+                return true
+            }
+        }
+        // Not a leaf node, recurse.
+        else {
+            for (i in 0 until node.childNodes.length) {
+                val child = node.childNodes.item(i)
+                val cleanChild = child.cloneNode(false)
+                if (cleanChild.nodeType == Node.TEXT_NODE) {
+                    cleanChild.textContent = ""
+                }
+                cleanIndex.appendChild(cleanChild)
+                // And if at any point the text matches, we return.
+                if (treeTraversal(child, textToMatch, clean, cleanChild)) return true
+            }
+        }
+        // We are in a leaf node and we are not yet done.
+        return false
+    }
+
+    protected open fun moveWTagUp(wTag: Element): Element {
+        val refToParent = wTag.parentNode
+
+        val clonedParent = wTag.parentNode.cloneNode(false)
+        val children = wTag.childNodes.deepcopy()
+        for (child in children) {
+            clonedParent.appendChild(child)
+        }
+        wTag.appendChild(clonedParent)
+        wTag.parentNode.parentNode.insertAfter(wTag, wTag.parentNode)
+
+        if (refToParent.childOrNull("w", recurse=true) == null) {
+            deleteList.add(refToParent)
+        }
+        return wTag
+    }
+
+    protected open fun createWTag(wf: WordForm): Element {
+        val termToAdd = layer.termForWordForm(wf)
+        val wTag = if (layer.tagset.punctuationTags.contains(termToAdd.pos)) {
+            val n = document.createElement("pc")
+            n
+        } else {
+            val n = document.createElement("w")
+            n.setAttribute("lemma", termToAdd.lemma)
+            n
+        }
+        // Both <w> and <pc> have a pos.
+        wTag.setAttribute(posType(), termToAdd.pos)
+        return wTag
+    }
+
+    private fun posType(): String {
+        // For now always write pos to the @pos attribute.
+        // Even for legacy formats, because we want to update to TEIp5.
+        return "pos"
+    }
+
+    protected fun getWordFormForOffsetOrNull(): WordForm? {
+        while(wordFormIter.hasNext()) {
+            val wf = wordFormIter.next()
+            if (wf.offset == offset) {
+                return wf
+            } else if (wf.offset > offset) {
+                // overstepped
+                wordFormIter.previous()
+                break
+            }
+        }
+        return null
+    }
+
+    protected open fun handleElementNode() {
+        val element = node as Element
+        if (element.tagName == "w" || element.tagName == "pc") {
+            var wordFormToAdd: WordForm? = getWordFormForOffsetOrNull()
+            if (wordFormToAdd != null) {
+                // remove all whitespace within a <w>-tag (although this rarely occurs anyway).
+                val sourceLiteral = node.getPlainTextContent().replace(Regex("""\s"""), "")
+                if (wordFormToAdd.literal == sourceLiteral) {
+                    // This is a simple case since the tokenization matches
+                    mergeWTag(wordFormToAdd, element)
+                } else {
+                    // Tokenization mismatch, report it
+                    Report.spottedIncompatibleTokenization(
+                        wordFormToAdd, WordForm(
+                            node.textContent, offset, node.textContent.length,
+                            node.attributes?.getNamedItem("xml:id")?.textContent ?: ""
+                        )
+                    )
+
+                    // Best effort to fix it
+                    if (wordFormToAdd.length > node.getPlainTextContent().length) {
+                        // Add the term to this node,
+                        // The excess length is ignored, which might result in the following token missing it's match
+                        mergeWTag(wordFormToAdd, element)
+                    } else { // wordFormToAdd.length < node.textContent.length
+                        // This is a tricky case, we might want to split up the node
+                        // Will leave this case for now
+                        Report.tokenMissingAnnotation(node.textContent, offset)
+                    }
+                }
+            } else {
+                // This is strange, we would expect an annotation, report it
+                Report.tokenMissingAnnotation(node.textContent, offset)
+            }
+        }
+    }
+
+    private fun mergeWTag(wordFormToAdd: WordForm, element: Element) {
+        val termToAdd = layer.termForWordForm(wordFormToAdd)
+        // <pc> tags do not have a lemma.
+        if (element.tagName == "w") {
+            element.setAttribute("lemma", termToAdd.lemma)
+        }
+        element.setAttribute(posType(), termToAdd.pos)
+        element.removeAttribute("type") // Update legacy formats to TEI p5
+    }
+
+    private fun getWordFormsToAdd(): List<WordForm> {
+        val string = node.textContent
+        val textEndOffset = offset + string.length
+        val result = mutableListOf<WordForm>()
+        // Go to the previous, if there is any.
+        // To fix scenarios like: abc<hi/>def ghi, when parsing the text node 'def ghi'.
+        if (wordFormIter.hasPrevious()) {
+            val prev = wordFormIter.previous()
+            if (endOfTermWithinText(prev, textEndOffset)) {
+                result.add(prev)
+            }
+            wordFormIter.next()
+        }
+        while (wordFormIter.hasNext()) {
+            val it = wordFormIter.next()
+            // Note: 'start'. The end might be in a following node.
+            val startOfTermWithinText = (it.offset >= offset) && (it.offset < textEndOffset)
+            if (startOfTermWithinText || endOfTermWithinText(it, textEndOffset)) {
+                result.add(it)
+            } else {
+                wordFormIter.previous()
+                break
+            }
+        }
+        return result
+    }
+
+    private fun endOfTermWithinText(it: WordForm, textEndOffset: Int): Boolean {
+        return (it.endOffset > offset) && (it.endOffset <= textEndOffset)
+    }
 }
\ No newline at end of file
diff --git a/server/src/main/kotlin/org/ivdnt/galahad/util/NodeExtensions.kt b/server/src/main/kotlin/org/ivdnt/galahad/util/NodeExtensions.kt
index 97859a3..bacb055 100644
--- a/server/src/main/kotlin/org/ivdnt/galahad/util/NodeExtensions.kt
+++ b/server/src/main/kotlin/org/ivdnt/galahad/util/NodeExtensions.kt
@@ -38,12 +38,16 @@ fun Node.nextNonTextSibling(): Node? {
 }
 
 /** Looks for the first child node, 1 deep, or null. */
-fun Node.childOrNull(childTag: String): Node? {
+fun Node.childOrNull(childTag: String, recurse: Boolean = false): Node? {
     for (i in 0 until this.childNodes.length) {
         if (this.childNodes.item(i).nodeType == Node.ELEMENT_NODE) {
             if ((this.childNodes.item(i) as Element).tagName == childTag) {
                 return this.childNodes.item(i)
             }
+            val childReturn = this.childNodes.item(i).childOrNull(childTag, recurse)
+            if (childReturn != null) {
+                return childReturn
+            }
         }
     }
     return null
diff --git a/server/src/test/resources/tei/twine/merged-output.xml b/server/src/test/resources/tei/twine/merged-output.xml
index b383f69..0c6893b 100644
--- a/server/src/test/resources/tei/twine/merged-output.xml
+++ b/server/src/test/resources/tei/twine/merged-output.xml
@@ -1,151 +1,135 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:dump="http://www.masereeuw.nl/xslt/dump-xml" xmlns:egXML="http://www.tei-c.org/ns/Examples" xmlns:ivdnt="http://www.ivdnt.org/xslt/namespaces" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <teiHeader>
-    <fileDesc><sourceDesc><listBibl xml:id="galahadMetadata">
-    <bibl>
-        <interpGrp type="model">
-            <interp>pie-tdn-all</interp>
-        </interpGrp>
-        <interpGrp type="tagset">
-            <interp>TDN-Core</interp>
-        </interpGrp>
-        <interpGrp type="corpus_name">
-            <interp>testCorpus</interp>
-        </interpGrp>
-        <interpGrp type="corpus_uuid">
-            <interp>872e7126-848d-4603-a57d-bc8abb889b96</interp>
-        </interpGrp>
-        <interpGrp type="date">
-            <interp>2024-03-12 10:34:09</interp>
-        </interpGrp>
-        <interpGrp type="user_id">
-            <interp>testUser</interp>
-        </interpGrp>
-        <interpGrp type="pid">
-            <interp>814bd005-ac80-4ee9-96fc-8582438714e1</interp>
-        </interpGrp>
-        <interpGrp type="title">
-            <interp>twine.input</interp>
-        </interpGrp>
-    </bibl>
-</listBibl></sourceDesc></fileDesc></teiHeader>
-<text>
-<body>
-<p><w lemma="net" pos="AA(degree=pos,position=free)">n<hi rend="bold">e</hi>t</w> <milestone n="1va" unit="fol"/> <w lemma="zijn" pos="VRB(finiteness=fin,tense=past)"><hi rend="bold">w</hi><hi rend="bold">a</hi><hi rend="bold">s</hi></w> <w lemma="ik" pos="PD(type=pers,position=free)">ik</w> <w lemma="naar" pos="ADP(type=pre)"><hi rend="bold">n</hi>aar</w> <w lemma="school" pos="NOU-C(number=sg)">sc<hi rend="bold">h</hi><hi rend="bold">o</hi>o<hi rend="bold">l</hi></w> <w lemma="heengaan" pos="ADV(type=reg)">heen</w> <w lemma="en" pos="CONJ(type=coor)">en</w> <w lemma="terugkomen" pos="VRB(finiteness=fin,tense=past)">t<hi rend="bold">e</hi>r<hi rend="bold">u</hi>g</w> <w lemma="wezen" pos="VRB(finiteness=inf)">w<hi rend="bold">eze</hi>n</w> <w lemma="lopen" pos="VRB(finiteness=inf)">lope<hi rend="bold">n</hi></w> <w lemma="hetzovoor" pos="ADV(type=reg)"><hi rend="bold">enz</hi>o</w></p>
-
-<pc lemma="onzin" pos="LET">.</pc>
-<pc pos="LET">.</pc>
-<pc pos="LET">.</pc>
-<w lemma="school" pos="NOU-C(number=pl)">scholen</w>
-<w lemma="school" pos="NOU-C(number=pl)">scholen</w>
-
-<w lemma="school" pos="NOU-C(number=pl)"> scholen </w>
-<w lemma="school" pos="NOU-C(number=pl)">scho len</w>
-<w lemma="school" pos="NOU-C(number=pl)">scho
-len</w>
-
-<p> <w lemma="electus" pos="VRB(finiteness=fin,tense=pres)+PD(type=pers,position=free)">electu</w><p><w lemma="arie" pos="NOU-C(number=pl)">arien</w> <w lemma="zijn" pos="VRB(finiteness=prespart)">zijnde</w></p> </p>
-
-<p> <w lemma="electus" pos="VRB(finiteness=fin,tense=pres)+PD(type=pers,position=free)">electu</w><p> <w lemma="arie" pos="NOU-C(number=pl)">arien</w></p> </p>
-
-<q> <w lemma="electus" pos="VRB(finiteness=fin,tense=pres)+PD(type=pers,position=free)">electu</w><p><w lemma="arie" pos="NOU-C(number=pl)">arien</w></p> </q>
-
-<q> <w lemma="electus" pos="VRB(finiteness=fin,tense=pres)+PD(type=pers,position=free)">electu</w><p> <w lemma="arie" pos="NOU-C(number=pl)">arien</w></p> </q>
-
-<p><w lemma="te+esten" pos="PD(type=d-p,subtype=art,position=prenom)+NOU-C(number=sg)"><hi rend="bold">test</hi>en</w></p>
-
-<p><w lemma="te+eest" pos="NUM(type=ord,position=prenom,representation=let)"><hi rend="bold">test</hi>en</w> <w lemma="woord" pos="NOU-C(number=sg)">woord</w></p>
-
-<p><w lemma="imlond" pos="RES(type=for)"><hi rend="bold"><w lemma="kabel" pos="AA(degree=pos,position=free)">cba</w> <w lemma="fedacht" pos="NOU-C(number=sg)">fed<expan>abc</expan></w><w lemma="defigen" pos="NOU-C(number=sg)"><expan> def</expan>ghi</w> jkl</hi>mno</w></p>
-<p> <w lemma="abchak" pos="NOU-C(number=sg)">abc</w> <w lemma="sint-jazoris" pos="NOU-C(number=sg)"><hi class="bold"><w lemma="door" pos="CONJ(type=coor)">def</w> <w lemma="geminnel" pos="NOU-P">ghi<hi class="italic">jkl</hi><hi class="red"><hi class="sub">mno</hi></hi></w><w lemma="christus" pos="RES(type=for)"><hi class="red"><hi class="sub"/> pqr</hi>stu</w> xyz</hi>abc</w> <w lemma="doen" pos="VRB(finiteness=fin,tense=past)">def</w> </p>
-<p> <w lemma="te" pos="ADP(type=pre)">To</w> <w lemma="obedië" pos="INT">ob<hi class="italic">ey</hi></w> <w lemma="ord" pos="INT">or</w> <w lemma="not" pos="NOU-C(number=sg)">n<hi class="bold">o</hi>t</w> <w lemma="te" pos="ADP(type=pre)">to</w> <w lemma="zij" pos="RES(type=meta)">be</w><w lemma="" pos="LET">,</w><br/><w lemma="het+hat" pos="PD(type=d-p,subtype=art,position=prenom)+NOU-C(number=sg)">that</w> <w lemma="zijn" pos="VRB(finiteness=fin,tense=pres)">is</w> <w lemma="the" pos="RES(type=for)">the</w> <w lemma="jermina" pos="NOU-C(number=sg)"><hi class="bold"><w lemma="one" pos="RES(type=for)">one</w> <hi class="red"><w lemma="cussitus" pos="RES(type=for)">question</w></hi> <w lemma="het+hat" pos="PD(type=d-p,subtype=art,position=prenom)+NOU-C(number=sg)">that</w> y<hi class="italic">re</hi>main</hi>ed</w><w lemma="" pos="LET">.</w> </p>
-
-<!-- 2 levels deep-->
-<p><hi rend="bold"><expan><w lemma="acht" pos="ADV(type=reg)">abc</w></expan></hi></p>
-<p><w lemma="achterblijven" pos="NOU-C(number=sg)"><hi rend="bold"><expan>abc</expan></hi>def</w></p>
-<p><w lemma="achterblijven" pos="NOU-C(number=sg)">abc<hi rend="bold"><expan>def</expan></hi></w></p>
-
-<p><hi rend="bold"><w lemma="achterblijven" pos="NOU-C(number=sg)">abc<expan>def</expan></w></hi></p>
-<p><w lemma="asgebid" pos="NOU-C(number=sg)">abc<hi rend="bold">def<expan>ghi</expan></hi></w></p>
-<p><w lemma="defgelijk" pos="PD(type=d-p,subtype=art,position=prenom)+NOU-C(number=sg)"><hi rend="bold">def<expan>ghi</expan></hi>jkl</w></p>
-<p><w lemma="afgebicht" pos="NOU-C(number=sg)">abc<hi rend="bold">def<expan>ghi</expan></hi>jkl</w></p>
-
-<p><hi rend="bold"><w lemma="achterblijven" pos="NOU-C(number=sg)"><expan>abc</expan>def</w></hi></p>
-<p><w lemma="asgebid" pos="NOU-C(number=sg)"><hi rend="bold"><expan>abc</expan>def</hi>ghi</w></p>
-<p><w lemma="asgebid" pos="NOU-C(number=sg)">abc<hi rend="bold"><expan>def</expan>ghi</hi></w></p>
-<p><w lemma="afgebicht" pos="NOU-C(number=sg)">abc<hi rend="bold"><expan>def</expan>ghi</hi>jkl</w></p>
-
-<p><hi rend="bold"><w lemma="kabacht" pos="NOU-C(number=sg)">cba<expan>abc</expan>def</w></hi></p>
-<p><w lemma="kabachten+gij" pos="NOU-C(number=sg)"><hi rend="bold">cba<expan>abc</expan>def</hi>ghi</w></p>
-<p><w lemma="accobbedige" pos="NOU-C(number=sg)">abc<hi rend="bold">cba<expan>def</expan>ghi</hi></w></p>
-<p><w lemma="achtbakkerijk" pos="NOU-C(number=sg)">abc<hi rend="bold">cba<expan>def</expan>ghi</hi>jkl</w></p>
-
-
-<p> <w lemma="de" pos="PD(type=d-p,subtype=art,position=prenom)" xml:id="enge022vand01_01.TEI.2.text.body.div.lg.7633.s.1.w.11">die</w> <w lemma="droogheid" n="mw_288" pos="NOU-C(number=sg)" xml:id="enge022vand01_01.TEI.2.text.body.div.lg.7633.s.1.w.12">droecheit<join n="mw_288"/>
-    </w> <w lemma="rebellen" lexicon="molex" pos="VRB(finiteness=fin,tense=pres)" xml:id="w.185"><seg>rebellen</seg></w><pc lemma="e." pos="LET" xml:id="pc.000005">.</pc> </p>
-
-<p> <w lemma="school" pos="NOU-C(number=pl)">scholen</w><w lemma="" pos="LET">.</w> </p>
-
-<p> <w lemma="willen" pos="VRB(finiteness=fin,tense=pres)">wilt</w> <w lemma="verwittigen" pos="VRB(finiteness=inf)">v<expan>er</expan>wittigen</w><w lemma="" pos="LET">.</w> <w lemma="eerzaam" pos="AA(degree=pos,position=prenom)">Eersame</w> <w lemma="vroom" pos="AA(degree=pos,position=prenom)">vrome</w> </p>
-
-<p><milestone n="1va" unit="fol"/><w lemma="te+de" pos="NOU-C(number=sg)">test</w></p>
-
-<p> <w lemma="copie" pos="NOU-C(number=sg)">Copie</w> <w lemma="worden" pos="VRB(finiteness=fin,tense=past)">Wert</w> <w lemma="belasten" pos="VRB(finiteness=pastpart)">belast</w> <w lemma="en" pos="CONJ(type=coor)">en<expan>de</expan></w> <w lemma="bevelen" pos="VRB(finiteness=pastpart)">bevolen</w> </p>
-
-<p> <w lemma="ander" pos="PD(type=indef,subtype=oth,position=prenom)">andere</w> <w lemma="officier" pos="NOU-C(number=pl)">offic<expan ana="#add2expan" resp="ed">i</expan>eren</w><w lemma="" pos="LET">.</w> <w lemma="concluderen" pos="NOU-C(number=sg)">Concludeert</w> <w lemma="daarom" pos="ADV(type=pron)">daeromme</w> </p>
-
-<p> <w lemma="na" pos="ADP(type=pre)">na</w> <w lemma="de" pos="PD(type=d-p,subtype=art,position=prenom)">de</w> <ref target="http://de-wit.net/bronnen/histo/politieke_ordonnantie_holland-1580.htm"><w lemma="ordonnantie" pos="NOU-C(number=sg)">Ordonnantie</w> <w lemma="en" pos="CONJ(type=coor)">en</w> <w lemma="plakkaat" pos="NOU-C(number=pl)">Placaaten</w> <w lemma="van" pos="ADP(type=pre)">van</w> <w lemma="de" pos="PD(type=d-p,subtype=art,position=prenom)">de</w> <w lemma="politie" pos="NOU-C(number=sg)">Politie</w></ref><w lemma="" pos="LET">,</w> <w lemma="haar" pos="PD(type=poss,position=prenom)">haare</w> <w lemma="af" pos="ADP(type=circ)">af</w> <w lemma="kunding" pos="NOU-C(number=sg)">kundinge</w> </p>
-
-
-<p><hi rend="italic"><w lemma="hoe" pos="ADV(type=reg)">Hoe</w> <w lemma="walwein" pos="NOU-P">Walewein</w> <w lemma="landkoop" pos="NOU-C(number=sg)">Lancelote</w> <w lemma="beschudden" pos="NOU-C(number=sg)">bescudde</w> <w lemma="en" pos="CONJ(type=coor)">en</w> <w lemma="een" pos="PD(type=indef,subtype=art,position=prenom)">enen</w> <w lemma="kamp" pos="NOU-C(number=sg)">camp</w> <w lemma="voor" pos="ADP(type=pre)">voor</w> <w lemma="hij" pos="PD(type=pers,position=free)">hem</w> <w lemma="vachten" pos="VRB(finiteness=fin,tense=past)">vacht</w><w lemma="" pos="LET">.</w> </hi></p>
-
-<p><w lemma="te+de" pos="ADP(type=pre)+PD(type=d-p,subtype=art,position=prenom)">ter</w> <w lemma="putiëntie" pos="NOU-C(number=sg)">putie<expan>ntie<expan ana="#add2expan" resp="ed"/></expan></w><expan><expan ana="#add2expan" resp="ed"><w lemma="" pos="LET">?</w></expan></expan> <w lemma="van" pos="ADP(type=pre)">van</w> <w lemma="mijn" pos="PD(type=poss,position=prenom)">mijn</w> <w lemma="heer" pos="NOU-C(number=sg)">heer</w></p>
-
-<p><w lemma="alhier" pos="ADV(type=reg)">alhier</w> <del><w lemma="nog" pos="ADV(type=reg)">noe</w></del> <w lemma="hoognechtig" pos="AA(degree=pos,position=free)">hoechnoedich</w></p>
-
-<p><w lemma="met" pos="ADP(type=pre)">met</w> <w lemma="nog" pos="ADV(type=reg)">noch</w> <gap reason="illegible"/><w lemma="dalk" pos="AA(degree=pos,position=free)">dlik</w><expan ana="#add2expan" resp="ed"><w lemma="" pos="LET">?</w></expan> <w lemma="uit" pos="ADP(type=pre)">uuyt</w> <w lemma="deze" pos="PD(type=d-p,subtype=oth,position=prenom)">desen</w></p>
-
-<p><w lemma="houplieden" pos="NOU-C(number=pl)">hopluyden</w> <del><w lemma="oftenden" pos="VRB(finiteness=prespart)">oftmeden<expan>de</expan></w></del> <w lemma="knecht" pos="NOU-C(number=pl)">knechten</w></p>
-
-<p> <w lemma="nemen" pos="VRB(finiteness=fin,tense=past)">naemen</w> <w lemma="van" pos="ADP(type=pre)">van</w> <w lemma="de" pos="PD(type=d-p,subtype=art,position=prenom)">de</w> <w lemma="keizerlijk" pos="AA(degree=pos,position=prenom)">K<expan ana="#add2expan" resp="ed">eyserlicke</expan></w> <w lemma="majesteit" pos="NOU-C(number=sg)">M<expan ana="#add2expan" resp="ed">ajestey</expan>t</w> <w lemma="de" pos="PD(type=d-p,subtype=art,position=prenom)">de</w> <w lemma="justitie" pos="NOU-C(number=sg)">jus<expan ana="#add2expan" resp="ed">t</expan>icie</w> <w lemma="om" pos="ADP(type=pre)">om</w> <w lemma="vergiffenis" pos="NOU-C(number=sg)">vergiffenisse</w><w lemma="" pos="LET">.</w> </p>
-
-
-<p><w lemma="niet" pos="ADV(type=reg)">nyet</w> <w lemma="ne" pos="ADV(type=reg)">en</w> <w lemma="zijn" pos="VRB(finiteness=fin,tense=pres)">es</w><w lemma="" pos="LET">,</w> <del><gap extent="word" reason="illegible"/></del> <w lemma="maar" pos="CONJ(type=coor)">maer</w> <w lemma="die" pos="PD(type=d-p,position=free)">der</w> <w lemma="zelf" pos="PD(type=d-p,position=free)">selver</w></p> <!--the newline here is important-->
-
-<p><w lemma="ik" pos="PD(type=pers,position=free)">ik</w> <w lemma="lopen" pos="VRB(finiteness=fin,tense=pres)">loop</w> <hi><w lemma="naar" pos="ADP(type=pre)">naar</w></hi> <w lemma="school" pos="NOU-C(number=sg)">school</w></p> <!--the newline here is important-->
-
-<p><w lemma="ik" pos="PD(type=pers,position=free)">ik</w> <w lemma="lopen" pos="VRB(finiteness=fin,tense=pres)">loop</w> <w lemma="naar" pos="ADP(type=pre)">naar</w> <hi><w lemma="huis" pos="NOU-C(number=sg)">huis</w></hi></p> <!--the newline here is important-->
-
-<p><w lemma="stad" pos="NOU-C(number=sg)">stadt</w> <w lemma="supthop" pos="NOU-P">Sutphen</w> <add place="margin"> <w lemma="receptio" pos="RES(type=for)">R<expan>ecept</expan>ae</w> <w lemma="zestien" pos="NUM(type=card,position=prenom,representation=dig)">16</w> <w lemma="martii" pos="NOU-P">Martii</w></add></p>
-
-<p><w lemma="frunde" pos="NOU-C(number=pl)">frunde<expan>n</expan></w> <add place="onder"> <w lemma="receptio" pos="RES(type=for)">R<expan>ecept</expan>ae</w> <w lemma="zestien" pos="NUM(type=card,position=prenom,representation=dig)">16</w> <w lemma="martii" pos="NOU-P">Martii</w></add></p>
-
-<p><w lemma="mijr" pos="CONJ(type=sub)">mir</w> <w lemma="dat" pos="NOU-C(number=sg)">das</w> <gap reason="illegible"/><w lemma="ring" pos="NOU-C(number=sg)">ring</w><w lemma="" pos="LET">,</w> <w lemma="das" pos="NOU-C(number=sg)">das</w> <w lemma="zonst" pos="VRB(finiteness=fin,tense=past)">sonst</w></p>
-
-<p><w lemma="te+eten" pos="ADP(type=pre)+VRB(finiteness=inf)">test-en</w></p>
-
-<p><w lemma="geneig" pos="PD(type=indef,position=free)">genige</w> <w lemma="voorschrijven" pos="AA(degree=pos,position=free)">voirs<expan>chreven</expan></w> <add place="begin"><w lemma="dan" pos="CONJ(type=coor)">dan</w> <w lemma="dat" pos="CONJ(type=sub)">dat</w> <w lemma="ook" pos="ADV(type=reg)">oick</w> <w lemma="die" pos="PD(type=d-p,subtype=oth,position=prenom)">die</w> <w lemma="fijn" pos="NOU-C(number=sg)">fia<expan>n</expan>dt</w> <w lemma="am dam" pos="NOU-C(number=sg)">ahm</w> <w lemma="gezijn" pos="VRB(finiteness=fin,tense=pres)">gesyn</w> <w lemma="zich" pos="PD(type=refl,position=free)">sich</w> <w lemma="versmalen" pos="VRB(finiteness=inf)">v<expan>er</expan>sammelen</w> <w lemma="en" pos="CONJ(type=coor)">und</w> <w lemma="zin" pos="NOU-C(number=pl)">sines</w> <w lemma="arlisse" pos="NOU-C(number=sg)">arlisztes</w> <w lemma="geweldig" pos="AA(degree=pos,position=free)">gewelttig</w> <w lemma="mogen" pos="AA(degree=pos,position=free)">moth</w> <w lemma="zijn" pos="VRB(finiteness=inf)">sijn</w><w lemma="" pos="LET">,</w></add> <w lemma="vijftig" pos="NUM(type=card,position=prenom,representation=let)">vifftig</w> <del><w lemma="oors" pos="ADV(type=reg)">oders</w></del></p>
-
-<!--hoe moet dit überhaupt-->
-<p><w lemma="blijven" pos="VRB(finiteness=fin,tense=pres)+PD(type=pers,position=free)">blievet</w> <w lemma="frome" pos="VRB(finiteness=fin,tense=pres)+PD(type=pers,position=free)">froeme</w> <w lemma="dat" pos="CONJ(type=sub)">dat</w> <w lemma="le" pos="NOU-C(number=sg)">l</w><gap reason="illegible"/> <w lemma="gij" pos="PD(type=pers,position=free)">g</w><gap reason="illegible"/><del> <w lemma="i" pos="NOU-C(number=sg)">i</w></del> <w lemma="in" pos="ADP(type=pre)">in</w> <w lemma="gezondheid" pos="NOU-C(number=sg)">gesontheid</w></p>
-
-<p><w lemma="wij" pos="PD(type=pers,position=free)">wij</w> <add place="begin"><w lemma="in" pos="ADP(type=pre)">in</w> <w lemma="deze" pos="PD(type=d-p,subtype=oth,position=prenom)">dese</w> <w lemma="wessaad" pos="NOU-C(number=sg)">weszhae</w> <w lemma="zeer" pos="AA(degree=pos,position=free)">zeer</w> <w lemma="verfallen" pos="VRB(finiteness=fin,tense=pres)">verfallene</w> <w lemma="en" pos="CONJ(type=coor)">und</w> <w lemma="geporsepd" pos="AA(degree=pos,position=prenom)">geoppressirde</w> <w lemma="not" pos="CONJ(type=coor)">nots</w> <del><w lemma="ke" pos="PD(type=pers,position=free)">ke</w></del> <w lemma="geen" pos="PD(type=indef,subtype=oth,position=prenom)">ghiene</w> <w lemma="provisie" pos="NOU-C(number=sg)">provisi</w> <w lemma="van" pos="ADP(type=pre)">va<expan>n</expan></w> <w lemma="hout" pos="NOU-C(number=sg)">holt</w></add> <w lemma="bij" pos="ADP(type=pre)">bij</w></p>
-
-<p><w lemma="gunstig" pos="AA(degree=pos,position=prenom)">gunstige</w> <w lemma="heer" pos="NOU-C(number=sg)">here</w><w lemma="" pos="LET">,</w> <w lemma="wij" pos="PD(type=pers,position=free)">wij</w> <del><w lemma="hebben" pos="VRB(finiteness=fin,tense=pres)">hebben</w> <w lemma="hiervoren" pos="ADV(type=pron)">hierbevoerens</w></del> <w lemma="hebben" pos="VRB(finiteness=fin,tense=past)">hadden</w></p>
-
-<p><add place="margin"> <w lemma="aan" pos="ADP(type=pre)">An</w> <w lemma="de" pos="PD(type=d-p,subtype=art,position=prenom)">d<expan>en</expan></w> <w lemma="schout" pos="NOU-C(number=sg)">scholtis</w> <w lemma="te" pos="ADP(type=pre)">to</w> <w lemma="zutphen" pos="NOU-P">Zutphe<expan>n</expan></w> <w lemma="of" pos="CONJ(type=coor)">of</w> <w lemma="zijn" pos="PD(type=poss,position=prenom)">sijne<expan>n</expan></w> <w lemma="statholoder" pos="NOU-C(number=sg)">stathold<expan>er</expan></w></add> <w lemma="erfente" pos="NOU-C(number=sg)">Erentfeste</w></p>
-
-<p><w lemma="welk" pos="PD(type=w-p,position=free)">welcker</w> <w lemma="voorschreven" pos="AA(degree=pos,position=prenom)">voirs<expan>creuen</expan></w> <add place="left"> <w lemma="les" pos="NUM(type=card,position=prenom,representation=rom)">LVj</w> </add><del><w lemma="150" pos="NUM(type=card,position=prenom,representation=rom)">LXj</w></del> <w lemma="ridder" pos="NOU-C(number=pl)">rydders</w> <w lemma="die" pos="PD(type=d-p,position=free)">die</w></p>
-
-<p><w lemma="deze" pos="PD(type=d-p,subtype=oth,position=prenom)">desse</w> <w lemma="brief" pos="NOU-C(number=sg)">breiff</w><w lemma="" pos="LET">.</w> <add place="left"><w lemma="vermelden" pos="VRB(finiteness=pastpart)">vermeldet</w></add> <w lemma="zo" pos="ADV(type=reg)">Soe</w> <w lemma="zijn" pos="VRB(finiteness=fin,tense=pres)">is</w></p>
-
-
-<p><w lemma="vijftig" pos="NUM(type=card,position=prenom,representation=let)">vyfftich</w> <del><w lemma="overkomen" pos="NOU-C(number=sg)">auerkomen</w> <w lemma="en" pos="CONJ(type=coor)">en<expan>de</expan></w></del><expan/> <w lemma="met" pos="ADP(type=pre)">met</w></p>
-
-<p><w lemma="pater" pos="NOU-C(number=sg)">pater</w> <w lemma="toe" pos="ADP(type=pre)">toe</w> <hi rend="font-weight:bold"><w lemma="ael+zij" pos="NOU-P">Aelsum</w> </hi><w lemma="" pos="LET">(</w><w lemma="" pos="">bij</w> <w lemma="" pos="">Akkrum</w><w lemma="" pos="LET">)</w><w lemma="" pos="LET">,</w> <w lemma="en" pos="CONJ(type=coor)">ende</w></p>
-
-<p><w lemma="mijn" pos="PD(type=poss,position=prenom)">Mijnen</w> <w lemma="gans" pos="NOU-C(number=sg)">gans</w> <w lemma="goedwillengelijk" pos="AA(degree=pos,position=prenom)">goetwijlleghen</w> <w lemma="dienst" pos="NOU-C(number=sg)">dijens[t]</w> <w lemma="na" pos="ADP(type=pre)">na</w> <w lemma="al" pos="PD(type=indef,position=free)">allen</w> <w lemma="vermogen" pos="VRB(finiteness=fin,tense=pres)">vermoeghen</w> <w lemma="altijd" pos="ADV(type=reg)">altijt</w> <w lemma="tibus" pos="RES(type=for)">tibi</w> <w lemma="hoorn" pos="NOU-P">honorem</w><ref target="N044"><hi rend="font-size:8pt;font-weight:bold"> <w lemma="een+derde" pos="NOU-P(WF=abbr)">*</w> </hi></ref> <w lemma="" pos="LET">.</w> <w lemma="eerbaar" pos="AA(degree=pos,position=free)">Eerbare</w><w lemma="" pos="LET">,</w></p>
-
-
-</body>
-</text>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:dump="http://www.masereeuw.nl/xslt/dump-xml" xmlns:egXML="http://www.tei-c.org/ns/Examples" xmlns:ivdnt="http://www.ivdnt.org/xslt/namespaces" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <teiHeader>
+    <fileDesc><titleStmt><title>twine.input</title><respStmt><resp>linguistic annotation by GaLAHaD (https://portal.clarin.ivdnt.org/galahad)</resp><orgName xml:lang="nl">Instituut voor de Nederlandse Taal</orgName><orgName xml:lang="en">Dutch Language Institute</orgName></respStmt><respStmt><resp>TEI merged by GaLAHaD (https://portal.clarin.ivdnt.org/galahad)</resp><orgName xml:lang="nl">Instituut voor de Nederlandse Taal</orgName><orgName xml:lang="en">Dutch Language Institute</orgName></respStmt></titleStmt><publicationStmt><publisher>!Needs to be filled in!</publisher><idno type="sourceID">twine.input</idno><idno type="GaLAHaDPersistentIdentifier">__UUID_IGNORED_BY_TEST___tei</idno></publicationStmt><notesStmt><note resp="GaLAHaD" type="corpusName">testCorpus</note><note resp="GaLAHaD" type="sourceCollection">source name</note><note resp="GaLAHaD" type="sourceCollectionURL">http://source.url</note></notesStmt><sourceDesc><ab><idno type="sourceID">twine.input</idno></ab><ab type="date"><date from="0" to="0"/></ab></sourceDesc></fileDesc><encodingDesc><appInfo resp="GaLAHaD"><application ident="pie-tdn-all" version="1.0.1" xml:id="pie-tdn-all"><label>POS-tagger and lemmatiser</label><ptr target="https://github.com/INL/galahad-taggers-dockerized/tree/1.0.2/pie/TDN-ALL"/></application></appInfo><editorialDecl resp="GaLAHaD"><interpretation xml:id="A0001"><ab subtype="POS-tagging_lemmatisation" type="linguisticAnnotation"><interpGrp type="annotationStyle"><interp>inline</interp></interpGrp><interpGrp type="Documentation"><interp/></interpGrp><interpGrp type="annotationSet"><interp>TDN-Core</interp></interpGrp><interpGrp type="annotationDescription"><interp>The file was automatically annotated within the platform GaLAHaD, which is a central hub for enriching historical Dutch.</interp></interpGrp><interpGrp type="annotationFormat"><interp>TEI xml</interp></interpGrp></ab><ab subtype="POS-tagging_lemmatisationProvenance1" type="linguisticAnnotation"><interpGrp type="annotationMode"><interp>automatically annotated</interp></interpGrp><interpGrp type="processor"><interp sameAs="#pie-tdn-all"/></interpGrp><date from="2024-06-19" to="2024-06-19"/></ab></interpretation></editorialDecl></encodingDesc><profileDesc><langUsage><language ident="nl">Dutch<interpGrp type="dominantLanguage"><interp>true</interp></interpGrp></language></langUsage></profileDesc></teiHeader>
+<text>
+<body>
+<p><w lemma="net" pos="AA(degree=pos,position=free)">n<hi rend="bold">e</hi>t</w><milestone n="1va" unit="fol"/> <w lemma="zijn" pos="VRB(finiteness=fin,tense=past)"><hi rend="bold">w</hi><hi rend="bold">a</hi><hi rend="bold">s</hi></w> <w lemma="ik" pos="PD(type=pers,position=free)">ik</w><w lemma="naar" pos="ADP(type=pre)"><hi rend="bold">n</hi>aar</w> <w lemma="school" pos="NOU-C(number=sg)">sc<hi rend="bold">h</hi><hi rend="bold">o</hi>o<hi rend="bold">l</hi></w> <w lemma="heengaan" pos="ADV(type=reg)">heen</w> <w lemma="en" pos="CONJ(type=coor)">en</w> <w lemma="terugkomen" pos="VRB(finiteness=fin,tense=past)">t<hi rend="bold">e</hi>r<hi rend="bold">u</hi>g</w> <w lemma="wezen" pos="VRB(finiteness=inf)">w<hi rend="bold">eze</hi>n</w> <w lemma="lopen" pos="VRB(finiteness=inf)">lope<hi rend="bold">n</hi></w> <w lemma="hetzovoor" pos="ADV(type=reg)"><hi rend="bold">enz</hi>o</w></p>
+
+<pc lemma="onzin" pos="LET">.</pc>
+<pc pos="LET">.</pc>
+<pc pos="LET">.</pc>
+<w lemma="school" pos="NOU-C(number=pl)">scholen</w>
+<w lemma="school" pos="NOU-C(number=pl)">scholen</w>
+
+<w lemma="school" pos="NOU-C(number=pl)"> scholen </w>
+<w lemma="school" pos="NOU-C(number=pl)">scho len</w>
+<w lemma="school" pos="NOU-C(number=pl)">scho
+len</w>
+
+<p> <w lemma="electus" pos="VRB(finiteness=fin,tense=pres)+PD(type=pers,position=free)">electu</w><p><w lemma="arie" pos="NOU-C(number=pl)">arien</w> <w lemma="zijn" pos="VRB(finiteness=prespart)">zijnde</w></p> </p>
+
+<p> <w lemma="electus" pos="VRB(finiteness=fin,tense=pres)+PD(type=pers,position=free)">electu</w><p> <w lemma="arie" pos="NOU-C(number=pl)">arien</w></p> </p>
+
+<q> <w lemma="electus" pos="VRB(finiteness=fin,tense=pres)+PD(type=pers,position=free)">electu</w><p><w lemma="arie" pos="NOU-C(number=pl)">arien</w></p> </q>
+
+<q> <w lemma="electus" pos="VRB(finiteness=fin,tense=pres)+PD(type=pers,position=free)">electu</w><p> <w lemma="arie" pos="NOU-C(number=pl)">arien</w></p> </q>
+
+<p><w lemma="test" pos="NOU-C(number=pl)"><hi rend="bold">test</hi>en</w></p>
+
+<p><w lemma="test" pos="NOU-C(number=pl)"><hi rend="bold">test</hi>en</w> <w lemma="woord" pos="NOU-C(number=sg)">woord</w></p>
+
+<p><w lemma="test" pos="NOU-C(number=pl)">test<hi rend="bold">en</hi></w></p>
+<p><w lemma="woord" pos="NOU-C(number=sg)">woord</w> <w lemma="test" pos="NOU-C(number=pl)">test<hi rend="bold">en</hi></w></p>
+
+<p><w lemma="woord" pos="NOU-C(number=sg)">woord</w><w lemma="test" pos="NOU-C(number=pl)"><hi rend="bold">test</hi>en</w> <w lemma="woord" pos="NOU-C(number=sg)">woord</w></p>
+<p><w lemma="woord" pos="NOU-C(number=sg)">woord</w> <w lemma="test" pos="NOU-C(number=pl)">test<hi rend="bold">en</hi></w> <w lemma="woord" pos="NOU-C(number=sg)">woord</w></p>
+
+<p><w lemma="test" pos="NOU-C(number=pl)">test<hi>en</hi></w></p>
+<p><w lemma="test" pos="NOU-C(number=pl)"><hi>test</hi>en</w></p>
+
+
+<p><hi rend="bold"><w lemma="kabel" pos="AA(degree=pos,position=free)">cba</w> <w lemma="fedacht" pos="NOU-C(number=sg)">fed<expan>abc</expan></w><w lemma="defigen" pos="NOU-C(number=sg)"><expan>def</expan>ghi</w> </hi><w lemma="imlond" pos="RES(type=for)"><hi rend="bold">jkl</hi>mno</w></p>
+<p> <w lemma="abchak" pos="NOU-C(number=sg)">abc</w><hi class="bold"><w lemma="door" pos="CONJ(type=coor)">def</w> <w lemma="geminnel" pos="NOU-P">ghi<hi class="italic">jkl</hi><hi class="red"><hi class="sub">mno</hi></hi></w><w lemma="christus" pos="RES(type=for)"><hi class="red">pqr</hi>stu</w> </hi><w lemma="sint-jazoris" pos="NOU-C(number=sg)"><hi class="bold">xyz</hi>abc</w> <w lemma="doen" pos="VRB(finiteness=fin,tense=past)">def</w></p>
+<p> <w lemma="te" pos="ADP(type=pre)">To</w> <w lemma="obedië" pos="INT">ob<hi class="italic">ey</hi></w> <w lemma="ord" pos="INT">or</w> <w lemma="not" pos="NOU-C(number=sg)">n<hi class="bold">o</hi>t</w> <w lemma="te" pos="ADP(type=pre)">to</w> <w lemma="zij" pos="RES(type=meta)">be</w><w lemma="" pos="LET">,</w><br/><w lemma="het+hat" pos="PD(type=d-p,subtype=art,position=prenom)+NOU-C(number=sg)">that</w> <w lemma="zijn" pos="VRB(finiteness=fin,tense=pres)">is</w> <w lemma="the" pos="RES(type=for)">the</w><hi class="bold"><w lemma="one" pos="RES(type=for)">one</w><hi class="red"><w lemma="cussitus" pos="RES(type=for)">question</w></hi> <w lemma="het+hat" pos="PD(type=d-p,subtype=art,position=prenom)+NOU-C(number=sg)">that</w> </hi><w lemma="jermina" pos="NOU-C(number=sg)"><hi class="bold">y<hi class="italic">re</hi>main</hi>ed</w><w lemma="" pos="LET">.</w></p>
+
+<!-- 2 levels deep-->
+<p><hi rend="bold"><expan><w lemma="acht" pos="ADV(type=reg)">abc</w></expan></hi></p>
+<p><w lemma="achterblijven" pos="NOU-C(number=sg)"><hi rend="bold"><expan>abc</expan></hi>def</w></p>
+<p><w lemma="achterblijven" pos="NOU-C(number=sg)">abc<hi rend="bold"><expan>def</expan></hi></w></p>
+
+<p><hi rend="bold"><w lemma="achterblijven" pos="NOU-C(number=sg)">abc<expan>def</expan></w></hi></p>
+<p><w lemma="asgebid" pos="NOU-C(number=sg)">abc<hi rend="bold">def<expan>ghi</expan></hi></w></p>
+<p><w lemma="defgelijk" pos="PD(type=d-p,subtype=art,position=prenom)+NOU-C(number=sg)"><hi rend="bold">def<expan>ghi</expan></hi>jkl</w></p>
+<p><w lemma="afgebicht" pos="NOU-C(number=sg)">abc<hi rend="bold">def<expan>ghi</expan></hi>jkl</w></p>
+
+<p><hi rend="bold"><w lemma="achterblijven" pos="NOU-C(number=sg)"><expan>abc</expan>def</w></hi></p>
+<p><w lemma="asgebid" pos="NOU-C(number=sg)"><hi rend="bold"><expan>abc</expan>def</hi>ghi</w></p>
+<p><w lemma="asgebid" pos="NOU-C(number=sg)">abc<hi rend="bold"><expan>def</expan>ghi</hi></w></p>
+<p><w lemma="afgebicht" pos="NOU-C(number=sg)">abc<hi rend="bold"><expan>def</expan>ghi</hi>jkl</w></p>
+
+<p><hi rend="bold"><w lemma="kabacht" pos="NOU-C(number=sg)">cba<expan>abc</expan>def</w></hi></p>
+<p><w lemma="kabachten+gij" pos="NOU-C(number=sg)"><hi rend="bold">cba<expan>abc</expan>def</hi>ghi</w></p>
+<p><w lemma="accobbedige" pos="NOU-C(number=sg)">abc<hi rend="bold">cba<expan>def</expan>ghi</hi></w></p>
+<p><w lemma="achtbakkerijk" pos="NOU-C(number=sg)">abc<hi rend="bold">cba<expan>def</expan>ghi</hi>jkl</w></p>
+
+
+<p> <w lemma="de" pos="PD(type=d-p,subtype=art,position=prenom)" xml:id="enge022vand01_01.TEI.2.text.body.div.lg.7633.s.1.w.11">die</w> <w lemma="droogheid" n="mw_288" pos="NOU-C(number=sg)" xml:id="enge022vand01_01.TEI.2.text.body.div.lg.7633.s.1.w.12">droecheit<join n="mw_288"/>
+    </w> <w lemma="rebellen" lexicon="molex" pos="VRB(finiteness=fin,tense=pres)" xml:id="w.185"><seg>rebellen</seg></w><pc lemma="e." pos="LET" xml:id="pc.000005">.</pc> </p>
+
+<p> <w lemma="school" pos="NOU-C(number=pl)">scholen</w><w lemma="" pos="LET">.</w></p>
+
+<p> <w lemma="willen" pos="VRB(finiteness=fin,tense=pres)">wilt</w> <w lemma="verwittigen" pos="VRB(finiteness=inf)">v<expan>er</expan>wittigen</w><w lemma="" pos="LET">.</w> <w lemma="eerzaam" pos="AA(degree=pos,position=prenom)">Eersame</w> <w lemma="vroom" pos="AA(degree=pos,position=prenom)">vrome</w></p>
+
+<p><milestone n="1va" unit="fol"/><w lemma="te+de" pos="NOU-C(number=sg)">test</w></p>
+
+<p> <w lemma="copie" pos="NOU-C(number=sg)">Copie</w> <w lemma="worden" pos="VRB(finiteness=fin,tense=past)">Wert</w> <w lemma="belasten" pos="VRB(finiteness=pastpart)">belast</w> <w lemma="en" pos="CONJ(type=coor)">en<expan>de</expan></w> <w lemma="bevelen" pos="VRB(finiteness=pastpart)">bevolen</w></p>
+
+<p> <w lemma="ander" pos="PD(type=indef,subtype=oth,position=prenom)">andere</w> <w lemma="officier" pos="NOU-C(number=pl)">offic<expan ana="#add2expan" resp="ed">i</expan>eren</w><w lemma="" pos="LET">.</w> <w lemma="concluderen" pos="NOU-C(number=sg)">Concludeert</w> <w lemma="daarom" pos="ADV(type=pron)">daeromme</w></p>
+
+<p> <w lemma="na" pos="ADP(type=pre)">na</w> <w lemma="de" pos="PD(type=d-p,subtype=art,position=prenom)">de</w><ref target="http://de-wit.net/bronnen/histo/politieke_ordonnantie_holland-1580.htm"><w lemma="ordonnantie" pos="NOU-C(number=sg)">Ordonnantie</w> <w lemma="en" pos="CONJ(type=coor)">en</w> <w lemma="plakkaat" pos="NOU-C(number=pl)">Placaaten</w> <w lemma="van" pos="ADP(type=pre)">van</w> <w lemma="de" pos="PD(type=d-p,subtype=art,position=prenom)">de</w> <w lemma="politie" pos="NOU-C(number=sg)">Politie</w></ref><w lemma="" pos="LET">,</w> <w lemma="haar" pos="PD(type=poss,position=prenom)">haare</w> <w lemma="af" pos="ADP(type=circ)">af</w> <w lemma="kunding" pos="NOU-C(number=sg)">kundinge</w></p>
+
+
+<p><hi rend="italic"><w lemma="hoe" pos="ADV(type=reg)">Hoe</w> <w lemma="walwein" pos="NOU-P">Walewein</w> <w lemma="landkoop" pos="NOU-C(number=sg)">Lancelote</w> <w lemma="beschudden" pos="NOU-C(number=sg)">bescudde</w> <w lemma="en" pos="CONJ(type=coor)">en</w> <w lemma="een" pos="PD(type=indef,subtype=art,position=prenom)">enen</w> <w lemma="kamp" pos="NOU-C(number=sg)">camp</w> <w lemma="voor" pos="ADP(type=pre)">voor</w> <w lemma="hij" pos="PD(type=pers,position=free)">hem</w> <w lemma="vachten" pos="VRB(finiteness=fin,tense=past)">vacht</w><w lemma="" pos="LET">.</w></hi></p>
+
+<p><w lemma="te+de" pos="ADP(type=pre)+PD(type=d-p,subtype=art,position=prenom)">ter</w> <w lemma="putiëntie" pos="NOU-C(number=sg)">putie<expan>ntie</expan></w><expan><expan ana="#add2expan" resp="ed"><w lemma="" pos="LET">?</w></expan></expan> <w lemma="van" pos="ADP(type=pre)">van</w> <w lemma="mijn" pos="PD(type=poss,position=prenom)">mijn</w> <w lemma="heer" pos="NOU-C(number=sg)">heer</w></p>
+
+<p><w lemma="alhier" pos="ADV(type=reg)">alhier</w><del><w lemma="nog" pos="ADV(type=reg)">noe</w></del> <w lemma="hoognechtig" pos="AA(degree=pos,position=free)">hoechnoedich</w></p>
+
+<p><w lemma="met" pos="ADP(type=pre)">met</w> <w lemma="nog" pos="ADV(type=reg)">noch</w><gap reason="illegible"/><w lemma="dalk" pos="AA(degree=pos,position=free)">dlik</w><expan ana="#add2expan" resp="ed"><w lemma="" pos="LET">?</w></expan> <w lemma="uit" pos="ADP(type=pre)">uuyt</w> <w lemma="deze" pos="PD(type=d-p,subtype=oth,position=prenom)">desen</w></p>
+
+<p><w lemma="houplieden" pos="NOU-C(number=pl)">hopluyden</w><del><w lemma="oftenden" pos="VRB(finiteness=prespart)">oftmeden<expan>de</expan></w></del> <w lemma="knecht" pos="NOU-C(number=pl)">knechten</w></p>
+
+<p> <w lemma="nemen" pos="VRB(finiteness=fin,tense=past)">naemen</w> <w lemma="van" pos="ADP(type=pre)">van</w> <w lemma="de" pos="PD(type=d-p,subtype=art,position=prenom)">de</w> <w lemma="keizerlijk" pos="AA(degree=pos,position=prenom)">K<expan ana="#add2expan" resp="ed">eyserlicke</expan></w> <w lemma="majesteit" pos="NOU-C(number=sg)">M<expan ana="#add2expan" resp="ed">ajestey</expan>t</w> <w lemma="de" pos="PD(type=d-p,subtype=art,position=prenom)">de</w> <w lemma="justitie" pos="NOU-C(number=sg)">jus<expan ana="#add2expan" resp="ed">t</expan>icie</w> <w lemma="om" pos="ADP(type=pre)">om</w> <w lemma="vergiffenis" pos="NOU-C(number=sg)">vergiffenisse</w><w lemma="" pos="LET">.</w></p>
+
+
+<p><w lemma="niet" pos="ADV(type=reg)">nyet</w> <w lemma="ne" pos="ADV(type=reg)">en</w> <w lemma="zijn" pos="VRB(finiteness=fin,tense=pres)">es</w><w lemma="" pos="LET">,</w><del><gap extent="word" reason="illegible"/></del> <w lemma="maar" pos="CONJ(type=coor)">maer</w> <w lemma="die" pos="PD(type=d-p,position=free)">der</w> <w lemma="zelf" pos="PD(type=d-p,position=free)">selver</w></p> <!--the newline here is important-->
+
+<p><w lemma="ik" pos="PD(type=pers,position=free)">ik</w> <w lemma="lopen" pos="VRB(finiteness=fin,tense=pres)">loop</w><hi><w lemma="naar" pos="ADP(type=pre)">naar</w></hi> <w lemma="school" pos="NOU-C(number=sg)">school</w></p> <!--the newline here is important-->
+
+<p><w lemma="ik" pos="PD(type=pers,position=free)">ik</w> <w lemma="lopen" pos="VRB(finiteness=fin,tense=pres)">loop</w> <w lemma="naar" pos="ADP(type=pre)">naar</w><hi><w lemma="huis" pos="NOU-C(number=sg)">huis</w></hi></p> <!--the newline here is important-->
+
+<p><w lemma="stad" pos="NOU-C(number=sg)">stadt</w> <w lemma="supthop" pos="NOU-P">Sutphen</w><add place="margin"> <w lemma="receptio" pos="RES(type=for)">R<expan>ecept</expan>ae</w> <w lemma="zestien" pos="NUM(type=card,position=prenom,representation=dig)">16</w> <w lemma="martii" pos="NOU-P">Martii</w></add></p>
+
+<p><w lemma="frunde" pos="NOU-C(number=pl)">frunde<expan>n</expan></w> <add place="onder"> <w lemma="receptio" pos="RES(type=for)">R<expan>ecept</expan>ae</w> <w lemma="zestien" pos="NUM(type=card,position=prenom,representation=dig)">16</w> <w lemma="martii" pos="NOU-P">Martii</w></add></p>
+
+<p><w lemma="mijr" pos="CONJ(type=sub)">mir</w> <w lemma="dat" pos="NOU-C(number=sg)">das</w><gap reason="illegible"/><w lemma="ring" pos="NOU-C(number=sg)">ring</w><w lemma="" pos="LET">,</w> <w lemma="das" pos="NOU-C(number=sg)">das</w> <w lemma="zonst" pos="VRB(finiteness=fin,tense=past)">sonst</w></p>
+
+<p><w lemma="te+eten" pos="ADP(type=pre)+VRB(finiteness=inf)">test-en</w></p>
+
+<p><w lemma="geneig" pos="PD(type=indef,position=free)">genige</w> <w lemma="voorschrijven" pos="AA(degree=pos,position=free)">voirs<expan>chreven</expan></w> <add place="begin"><w lemma="dan" pos="CONJ(type=coor)">dan</w> <w lemma="dat" pos="CONJ(type=sub)">dat</w> <w lemma="ook" pos="ADV(type=reg)">oick</w> <w lemma="die" pos="PD(type=d-p,subtype=oth,position=prenom)">die</w> <w lemma="fijn" pos="NOU-C(number=sg)">fia<expan>n</expan>dt</w> <w lemma="am dam" pos="NOU-C(number=sg)">ahm</w> <w lemma="gezijn" pos="VRB(finiteness=fin,tense=pres)">gesyn</w> <w lemma="zich" pos="PD(type=refl,position=free)">sich</w> <w lemma="versmalen" pos="VRB(finiteness=inf)">v<expan>er</expan>sammelen</w> <w lemma="en" pos="CONJ(type=coor)">und</w> <w lemma="zin" pos="NOU-C(number=pl)">sines</w> <w lemma="arlisse" pos="NOU-C(number=sg)">arlisztes</w> <w lemma="geweldig" pos="AA(degree=pos,position=free)">gewelttig</w> <w lemma="mogen" pos="AA(degree=pos,position=free)">moth</w> <w lemma="zijn" pos="VRB(finiteness=inf)">sijn</w><w lemma="" pos="LET">,</w></add> <w lemma="vijftig" pos="NUM(type=card,position=prenom,representation=let)">vifftig</w><del><w lemma="oors" pos="ADV(type=reg)">oders</w></del></p>
+
+<!--hoe moet dit überhaupt-->
+<p><w lemma="blijven" pos="VRB(finiteness=fin,tense=pres)+PD(type=pers,position=free)">blievet</w> <w lemma="frome" pos="VRB(finiteness=fin,tense=pres)+PD(type=pers,position=free)">froeme</w> <w lemma="dat" pos="CONJ(type=sub)">dat</w> <w lemma="le" pos="NOU-C(number=sg)">l</w><gap reason="illegible"/> <w lemma="gij" pos="PD(type=pers,position=free)">g</w><gap reason="illegible"/><del> <w lemma="i" pos="NOU-C(number=sg)">i</w></del> <w lemma="in" pos="ADP(type=pre)">in</w> <w lemma="gezondheid" pos="NOU-C(number=sg)">gesontheid</w></p>
+
+<p><w lemma="wij" pos="PD(type=pers,position=free)">wij</w><add place="begin"><w lemma="in" pos="ADP(type=pre)">in</w> <w lemma="deze" pos="PD(type=d-p,subtype=oth,position=prenom)">dese</w> <w lemma="wessaad" pos="NOU-C(number=sg)">weszhae</w> <w lemma="zeer" pos="AA(degree=pos,position=free)">zeer</w> <w lemma="verfallen" pos="VRB(finiteness=fin,tense=pres)">verfallene</w> <w lemma="en" pos="CONJ(type=coor)">und</w> <w lemma="geporsepd" pos="AA(degree=pos,position=prenom)">geoppressirde</w> <w lemma="not" pos="CONJ(type=coor)">nots</w><del><w lemma="ke" pos="PD(type=pers,position=free)">ke</w></del> <w lemma="geen" pos="PD(type=indef,subtype=oth,position=prenom)">ghiene</w> <w lemma="provisie" pos="NOU-C(number=sg)">provisi</w> <w lemma="van" pos="ADP(type=pre)">va<expan>n</expan></w> <w lemma="hout" pos="NOU-C(number=sg)">holt</w></add> <w lemma="bij" pos="ADP(type=pre)">bij</w></p>
+
+<p><w lemma="gunstig" pos="AA(degree=pos,position=prenom)">gunstige</w> <w lemma="heer" pos="NOU-C(number=sg)">here</w><w lemma="" pos="LET">,</w> <w lemma="wij" pos="PD(type=pers,position=free)">wij</w><del><w lemma="hebben" pos="VRB(finiteness=fin,tense=pres)">hebben</w> <w lemma="hiervoren" pos="ADV(type=pron)">hierbevoerens</w></del> <w lemma="hebben" pos="VRB(finiteness=fin,tense=past)">hadden</w></p>
+
+<p><add place="margin"> <w lemma="aan" pos="ADP(type=pre)">An</w> <w lemma="de" pos="PD(type=d-p,subtype=art,position=prenom)">d<expan>en</expan></w> <w lemma="schout" pos="NOU-C(number=sg)">scholtis</w> <w lemma="te" pos="ADP(type=pre)">to</w> <w lemma="zutphen" pos="NOU-P">Zutphe<expan>n</expan></w> <w lemma="of" pos="CONJ(type=coor)">of</w> <w lemma="zijn" pos="PD(type=poss,position=prenom)">sijne<expan>n</expan></w> <w lemma="statholoder" pos="NOU-C(number=sg)">stathold<expan>er</expan></w></add> <w lemma="erfente" pos="NOU-C(number=sg)">Erentfeste</w></p>
+
+<p><w lemma="welk" pos="PD(type=w-p,position=free)">welcker</w> <w lemma="voorschreven" pos="AA(degree=pos,position=prenom)">voirs<expan>creuen</expan></w> <add place="left"> <w lemma="les" pos="NUM(type=card,position=prenom,representation=rom)">LVj</w></add><del><w lemma="150" pos="NUM(type=card,position=prenom,representation=rom)">LXj</w></del> <w lemma="ridder" pos="NOU-C(number=pl)">rydders</w> <w lemma="die" pos="PD(type=d-p,position=free)">die</w></p>
+
+<p><w lemma="deze" pos="PD(type=d-p,subtype=oth,position=prenom)">desse</w> <w lemma="brief" pos="NOU-C(number=sg)">breiff</w><w lemma="" pos="LET">.</w><add place="left"><w lemma="vermelden" pos="VRB(finiteness=pastpart)">vermeldet</w></add> <w lemma="zo" pos="ADV(type=reg)">Soe</w> <w lemma="zijn" pos="VRB(finiteness=fin,tense=pres)">is</w></p>
+
+
+<p><w lemma="vijftig" pos="NUM(type=card,position=prenom,representation=let)">vyfftich</w><del><w lemma="overkomen" pos="NOU-C(number=sg)">auerkomen</w> <w lemma="en" pos="CONJ(type=coor)">en<expan>de</expan></w></del><expan/> <w lemma="met" pos="ADP(type=pre)">met</w></p>
+
+<p><w lemma="pater" pos="NOU-C(number=sg)">pater</w> <w lemma="toe" pos="ADP(type=pre)">toe</w><hi rend="font-weight:bold"><w lemma="ael+zij" pos="NOU-P">Aelsum</w></hi><w lemma="" pos="LET">(</w><w lemma="" pos="">bij</w> <w lemma="" pos="">Akkrum</w><w lemma="" pos="LET">)</w><w lemma="" pos="LET">,</w> <w lemma="en" pos="CONJ(type=coor)">ende</w></p>
+
+<p><w lemma="mijn" pos="PD(type=poss,position=prenom)">Mijnen</w> <w lemma="gans" pos="NOU-C(number=sg)">gans</w> <w lemma="goedwillengelijk" pos="AA(degree=pos,position=prenom)">goetwijlleghen</w> <w lemma="dienst" pos="NOU-C(number=sg)">dijens[t]</w> <w lemma="na" pos="ADP(type=pre)">na</w> <w lemma="al" pos="PD(type=indef,position=free)">allen</w> <w lemma="vermogen" pos="VRB(finiteness=fin,tense=pres)">vermoeghen</w> <w lemma="altijd" pos="ADV(type=reg)">altijt</w> <w lemma="tibus" pos="RES(type=for)">tibi</w> <w lemma="hoorn" pos="NOU-P">honorem</w><ref target="N044"><hi rend="font-size:8pt;font-weight:bold"> <w lemma="een+derde" pos="NOU-P(WF=abbr)">*</w></hi></ref> <w lemma="" pos="LET">.</w> <w lemma="eerbaar" pos="AA(degree=pos,position=free)">Eerbare</w><w lemma="" pos="LET">,</w></p>
+
+<p><w lemma="gemeente" pos="NOU-C(number=pl)">ghemeynten</w> <w lemma="van+de" pos="ADP(type=pre)+PD(type=d-p,subtype=art,position=prenom)">va<damage>n<supplied resp="#Stapel">den</supplied></damage></w><w lemma="land" pos="NOU-C(number=sg)"><damage>l</damage>ande</w> <w lemma="van" pos="ADP(type=pre)">van</w> <w lemma="Breuites" pos="NOU-P">breuites</w> <w lemma="vitam" pos="RES(type=for)">vita<damage>m</damage></w><w lemma="magistrum" pos="RES(type=for)">m<ex>agist</ex>rum</w></p>
+
+</body>
+</text>
 </TEI>
\ No newline at end of file
diff --git a/server/src/test/resources/tei/twine/pie-tdn.tsv b/server/src/test/resources/tei/twine/pie-tdn.tsv
index e2f94ba..40c9fce 100644
--- a/server/src/test/resources/tei/twine/pie-tdn.tsv
+++ b/server/src/test/resources/tei/twine/pie-tdn.tsv
@@ -27,9 +27,20 @@ electu	electus	VRB(finiteness=fin,tense=pres)+PD(type=pers,position=free)
 arien	arie	NOU-C(number=pl)
 electu	electus	VRB(finiteness=fin,tense=pres)+PD(type=pers,position=free)
 arien	arie	NOU-C(number=pl)
-testen	te+esten	PD(type=d-p,subtype=art,position=prenom)+NOU-C(number=sg)
-testen	te+eest	NUM(type=ord,position=prenom,representation=let)
+testen	test	NOU-C(number=pl)
+testen	test	NOU-C(number=pl)
 woord	woord	NOU-C(number=sg)
+testen	test	NOU-C(number=pl)
+woord	woord	NOU-C(number=sg)
+testen	test	NOU-C(number=pl)
+woord	woord	NOU-C(number=sg)
+testen	test	NOU-C(number=pl)
+woord	woord	NOU-C(number=sg)
+woord	woord	NOU-C(number=sg)
+testen	test	NOU-C(number=pl)
+woord	woord	NOU-C(number=sg)
+testen	test	NOU-C(number=pl)
+testen	test	NOU-C(number=pl)
 cba	kabel	AA(degree=pos,position=free)
 fedabc	fedacht	NOU-C(number=sg)
 defghi	defigen	NOU-C(number=sg)
@@ -272,3 +283,10 @@ honorem	hoorn	NOU-P
 .		LET
 Eerbare	eerbaar	AA(degree=pos,position=free)
 ,		LET
+ghemeynten	gemeente	NOU-C(number=pl)
+vanden	van+de	ADP(type=pre)+PD(type=d-p,subtype=art,position=prenom)
+lande	land	NOU-C(number=sg)
+van	van	ADP(type=pre)
+breuites	Breuites	NOU-P
+vitam	vitam	RES(type=for)
+magistrum	magistrum	RES(type=for)
diff --git a/server/src/test/resources/tei/twine/plaintext.txt b/server/src/test/resources/tei/twine/plaintext.txt
index 25f5aa9..dea8fec 100644
--- a/server/src/test/resources/tei/twine/plaintext.txt
+++ b/server/src/test/resources/tei/twine/plaintext.txt
@@ -26,6 +26,18 @@ testen
 
 testen woord
 
+testen
+
+woord testen
+
+woord testen woord
+
+woord testen woord
+
+testen 
+
+ testen
+
 cba fedabc defghi jklmno
 
  abc def ghijklmno pqrstu xyzabc def 
@@ -133,3 +145,5 @@ pater toe Aelsum (bij Akkrum), ende
 
 Mijnen gans goetwijlleghen dijens[t] na allen vermoeghen altijt tibi honorem *  . Eerbare,
 
+ghemeynten vanden lande van breuites vitam magistrum
+
diff --git a/server/src/test/resources/tei/twine/twine.input.xml b/server/src/test/resources/tei/twine/twine.input.xml
index e1fd6c3..b3f72ad 100644
--- a/server/src/test/resources/tei/twine/twine.input.xml
+++ b/server/src/test/resources/tei/twine/twine.input.xml
@@ -38,6 +38,16 @@ len</w>
 
 <p><hi rend="bold">test</hi>en woord</p>
 
+<p>test<hi rend="bold">en</hi></p>
+<p>woord test<hi rend="bold">en</hi></p>
+
+<p>woord <hi rend="bold">test</hi>en woord</p>
+<p>woord test<hi rend="bold">en</hi> woord</p>
+
+<p>test<hi>en </hi></p>
+<p><hi> test</hi>en</p>
+
+
 <p><hi rend="bold">cba fed<expan>abc def</expan>ghi jkl</hi>mno</p>
 <p>
 abc <hi class="bold">def ghi<hi class="italic">jkl</hi><hi class="red"><hi class="sub">mno</hi> pqr</hi>stu xyz</hi>abc def
@@ -158,6 +168,7 @@ school</p> <!--the newline here is important-->
 
 <p>Mijnen gans goetwijlleghen dijens[t] na allen vermoeghen altijt tibi honorem<ref target="N044"><hi rend="font-size:8pt;font-weight:bold"> * </hi></ref> . Eerbare,</p>
 
+<p>ghemeynten va<damage>n<supplied resp="#Stapel">den </supplied>l</damage>ande van breuites vita<damage>m </damage>m<ex>agist</ex>rum</p>
 
 </body>
 </text>

From 912e257e5a1f8e8f48fe8ff596336658cb2bf5c0 Mon Sep 17 00:00:00 2001
From: Vincent Prins <vincent.prins@ivdnt.org>
Date: Wed, 19 Jun 2024 15:07:47 +0200
Subject: [PATCH 13/15] Updated tests for cmdi teiHeader

And new tei merge test case
---
 .../kotlin/org/ivdnt/galahad/port/Util.kt     |   2 +-
 .../output/from-Conllu-to-TeiP5.tei.xml       | 135 +++++++++++-------
 .../output/from-Folia-to-TeiP5.tei.xml        | 135 +++++++++++-------
 .../output/from-Naf-to-TeiP5.tei.xml          | 135 +++++++++++-------
 .../output/from-Tsv-to-TeiP5.tei.xml          | 135 +++++++++++-------
 .../output/from-Txt-to-TeiP5.tei.xml          | 135 +++++++++++-------
 .../folia/twine/merged-output.folia.xml       |   4 +-
 .../tei/brieven/merged-output.tei.xml         |  45 ++----
 .../mock-TDN-with-punctuation-result.xml      | 119 +++++++++------
 ...tuation-mixed-tags-merge-export-result.xml |  31 +---
 .../test/resources/tei/twine/sourcelayer.json |   2 +-
 11 files changed, 505 insertions(+), 373 deletions(-)

diff --git a/server/src/test/kotlin/org/ivdnt/galahad/port/Util.kt b/server/src/test/kotlin/org/ivdnt/galahad/port/Util.kt
index 1e5d187..b219f24 100644
--- a/server/src/test/kotlin/org/ivdnt/galahad/port/Util.kt
+++ b/server/src/test/kotlin/org/ivdnt/galahad/port/Util.kt
@@ -311,7 +311,7 @@ class TestResult(
 ) {
 
     fun ignoreDate(): TestResult {
-        val date = Regex("\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}")
+        val date = Regex("\\d{4}-\\d{2}-\\d{2}")
 
         actual = date.replace(actual, "__DATE_IGNORED_BY_TEST__")
         expected = date.replace(expected, "__DATE_IGNORED_BY_TEST__")
diff --git a/server/src/test/resources/all-formats/output/from-Conllu-to-TeiP5.tei.xml b/server/src/test/resources/all-formats/output/from-Conllu-to-TeiP5.tei.xml
index 3f82df5..48a6ffc 100644
--- a/server/src/test/resources/all-formats/output/from-Conllu-to-TeiP5.tei.xml
+++ b/server/src/test/resources/all-formats/output/from-Conllu-to-TeiP5.tei.xml
@@ -1,57 +1,88 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <teiHeader>
-        <fileDesc>
-            <titleStmt>
-                <title>input</title>
-            </titleStmt>
-            <publicationStmt>
-                <p>
-                    <date>2024-03-13 14:23:35</date>
-                    <idno type="sourceID">What if source id is undefined?</idno>
-                    <idno type="pid">What if no pid is defined?</idno>
-                </p>
-            </publicationStmt>
-            <sourceDesc>
-                <listBibl xml:id="inlMetadata">
-                    <bibl>
-                        <interpGrp type="questions">
-                            <interp>Welke inl data?</interp>
-                            <interp>wat als er geen is?</interp>
-                        </interpGrp>
-                    </bibl>
-                </listBibl>
-<listBibl xml:id="galahadMetadata">
-    <bibl>
-        <interpGrp type="model">
-            <interp>pie-tdn-all</interp>
-        </interpGrp>
-        <interpGrp type="tagset">
-            <interp>TDN-Core</interp>
-        </interpGrp>
-        <interpGrp type="corpus_name">
-            <interp>testCorpus</interp>
-        </interpGrp>
-        <interpGrp type="corpus_uuid">
-            <interp>059197e6-a1c9-45b3-9428-9fd28e1e8e32</interp>
-        </interpGrp>
-        <interpGrp type="date">
-            <interp>2024-03-13 14:23:35</interp>
-        </interpGrp>
-        <interpGrp type="user_id">
-            <interp>testUser</interp>
-        </interpGrp>
-        <interpGrp type="pid">
-            <interp>d9527977-7a1f-4f93-b19b-5c26c93afea6</interp>
-        </interpGrp>
-        <interpGrp type="title">
-            <interp>input</interp>
-        </interpGrp>
-    </bibl>
-</listBibl>
-            </sourceDesc>
-        </fileDesc>
-    </teiHeader>
+<teiHeader>
+    <fileDesc>
+        <titleStmt>
+            <title>input</title>
+            <respStmt>
+                <resp>linguistic annotation by GaLAHaD (https://portal.clarin.ivdnt.org/galahad)</resp>
+                <orgName xml:lang="nl">Instituut voor de Nederlandse Taal</orgName>
+                <orgName xml:lang="en">Dutch Language Institute</orgName>
+            </respStmt>
+            <respStmt>
+                <resp>exported as tei-p5 by GaLAHaD (https://portal.clarin.ivdnt.org/galahad)</resp>
+                <orgName xml:lang="nl">Instituut voor de Nederlandse Taal</orgName>
+                <orgName xml:lang="en">Dutch Language Institute</orgName>
+            </respStmt>
+        </titleStmt>
+        <publicationStmt>
+            <publisher>!Needs to be filled in!</publisher>
+            <idno type="sourceID">input</idno>
+            <idno type="GaLAHaDPersistentIdentifier">__UUID_IGNORED_BY_TEST___tei</idno>
+        </publicationStmt>
+        <notesStmt>
+            <note resp="GaLAHaD" type="corpusName">testCorpus</note>
+            <note resp="GaLAHaD" type="sourceCollection">source name</note>
+            <note resp="GaLAHaD" type="sourceCollectionURL">http://source.url</note>
+        </notesStmt>
+        <sourceDesc>
+            <ab>
+                <idno type="sourceID">input</idno>
+            </ab>
+            <ab type="date">
+                <date from="0" to="0"/>
+            </ab>
+        </sourceDesc>
+    </fileDesc>
+    <encodingDesc>
+        <appInfo resp="GaLAHaD">
+            <application ident="pie-tdn-all" version="1.0.1" xml:id="pie-tdn-all">
+                <label>POS-tagger and lemmatiser</label>
+                <ptr target="https://github.com/INL/galahad-taggers-dockerized/tree/1.0.2/pie/TDN-ALL"/>
+            </application>
+        </appInfo>
+        <editorialDecl resp="GaLAHaD">
+            <interpretation xml:id="A0001">
+                <ab subtype="POS-tagging_lemmatisation" type="linguisticAnnotation">
+                    <interpGrp type="annotationStyle">
+                        <interp>inline</interp>
+                    </interpGrp>
+                    <interpGrp type="Documentation">
+                        <interp/>
+                    </interpGrp>
+                    <interpGrp type="annotationSet">
+                        <interp>TDN-Core</interp>
+                    </interpGrp>
+                    <interpGrp type="annotationDescription">
+                        <interp>The file was automatically annotated within the platform GaLAHaD, which is a central hub for enriching historical Dutch.</interp>
+                    </interpGrp>
+                    <interpGrp type="annotationFormat">
+                        <interp>TEI xml</interp>
+                    </interpGrp>
+                </ab>
+                <ab subtype="POS-tagging_lemmatisationProvenance1" type="linguisticAnnotation">
+                    <interpGrp type="annotationMode">
+                        <interp>automatically annotated</interp>
+                    </interpGrp>
+                    <interpGrp type="processor">
+                        <interp sameAs="#pie-tdn-all"/>
+                    </interpGrp>
+                    <date from="__DATE_IGNORED_BY_TEST__" to="__DATE_IGNORED_BY_TEST__"/>
+                </ab>
+            </interpretation>
+        </editorialDecl>
+    </encodingDesc>
+    <profileDesc>
+        <langUsage>
+            <language ident="nl">
+                Dutch
+                <interpGrp type="dominantLanguage">
+                    <interp>true</interp>
+                </interpGrp>
+            </language>
+        </langUsage>
+    </profileDesc>
+</teiHeader>
     <text>
         <body>
             <div>
diff --git a/server/src/test/resources/all-formats/output/from-Folia-to-TeiP5.tei.xml b/server/src/test/resources/all-formats/output/from-Folia-to-TeiP5.tei.xml
index 0f0ad88..515a73b 100644
--- a/server/src/test/resources/all-formats/output/from-Folia-to-TeiP5.tei.xml
+++ b/server/src/test/resources/all-formats/output/from-Folia-to-TeiP5.tei.xml
@@ -1,57 +1,88 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <teiHeader>
-        <fileDesc>
-            <titleStmt>
-                <title>input.folia</title>
-            </titleStmt>
-            <publicationStmt>
-                <p>
-                    <date>2024-03-13 13:47:56</date>
-                    <idno type="sourceID">What if source id is undefined?</idno>
-                    <idno type="pid">What if no pid is defined?</idno>
-                </p>
-            </publicationStmt>
-            <sourceDesc>
-                <listBibl xml:id="inlMetadata">
-                    <bibl>
-                        <interpGrp type="questions">
-                            <interp>Welke inl data?</interp>
-                            <interp>wat als er geen is?</interp>
-                        </interpGrp>
-                    </bibl>
-                </listBibl>
-<listBibl xml:id="galahadMetadata">
-    <bibl>
-        <interpGrp type="model">
-            <interp>pie-tdn-all</interp>
-        </interpGrp>
-        <interpGrp type="tagset">
-            <interp>TDN-Core</interp>
-        </interpGrp>
-        <interpGrp type="corpus_name">
-            <interp>testCorpus</interp>
-        </interpGrp>
-        <interpGrp type="corpus_uuid">
-            <interp>3308d415-15b9-4f10-bd10-ddbe605caf91</interp>
-        </interpGrp>
-        <interpGrp type="date">
-            <interp>2024-03-13 13:47:56</interp>
-        </interpGrp>
-        <interpGrp type="user_id">
-            <interp>testUser</interp>
-        </interpGrp>
-        <interpGrp type="pid">
-            <interp>17a41382-9c06-46be-b5e5-7fc86b4dc1bb</interp>
-        </interpGrp>
-        <interpGrp type="title">
-            <interp>input.folia</interp>
-        </interpGrp>
-    </bibl>
-</listBibl>
-            </sourceDesc>
-        </fileDesc>
-    </teiHeader>
+<teiHeader>
+    <fileDesc>
+        <titleStmt>
+            <title>input.folia</title>
+            <respStmt>
+                <resp>linguistic annotation by GaLAHaD (https://portal.clarin.ivdnt.org/galahad)</resp>
+                <orgName xml:lang="nl">Instituut voor de Nederlandse Taal</orgName>
+                <orgName xml:lang="en">Dutch Language Institute</orgName>
+            </respStmt>
+            <respStmt>
+                <resp>exported as tei-p5 by GaLAHaD (https://portal.clarin.ivdnt.org/galahad)</resp>
+                <orgName xml:lang="nl">Instituut voor de Nederlandse Taal</orgName>
+                <orgName xml:lang="en">Dutch Language Institute</orgName>
+            </respStmt>
+        </titleStmt>
+        <publicationStmt>
+            <publisher>!Needs to be filled in!</publisher>
+            <idno type="sourceID">input.folia</idno>
+            <idno type="GaLAHaDPersistentIdentifier">__UUID_IGNORED_BY_TEST___tei</idno>
+        </publicationStmt>
+        <notesStmt>
+            <note resp="GaLAHaD" type="corpusName">testCorpus</note>
+            <note resp="GaLAHaD" type="sourceCollection">source name</note>
+            <note resp="GaLAHaD" type="sourceCollectionURL">http://source.url</note>
+        </notesStmt>
+        <sourceDesc>
+            <ab>
+                <idno type="sourceID">input.folia</idno>
+            </ab>
+            <ab type="date">
+                <date from="0" to="0"/>
+            </ab>
+        </sourceDesc>
+    </fileDesc>
+    <encodingDesc>
+        <appInfo resp="GaLAHaD">
+            <application ident="pie-tdn-all" version="1.0.1" xml:id="pie-tdn-all">
+                <label>POS-tagger and lemmatiser</label>
+                <ptr target="https://github.com/INL/galahad-taggers-dockerized/tree/1.0.2/pie/TDN-ALL"/>
+            </application>
+        </appInfo>
+        <editorialDecl resp="GaLAHaD">
+            <interpretation xml:id="A0001">
+                <ab subtype="POS-tagging_lemmatisation" type="linguisticAnnotation">
+                    <interpGrp type="annotationStyle">
+                        <interp>inline</interp>
+                    </interpGrp>
+                    <interpGrp type="Documentation">
+                        <interp/>
+                    </interpGrp>
+                    <interpGrp type="annotationSet">
+                        <interp>TDN-Core</interp>
+                    </interpGrp>
+                    <interpGrp type="annotationDescription">
+                        <interp>The file was automatically annotated within the platform GaLAHaD, which is a central hub for enriching historical Dutch.</interp>
+                    </interpGrp>
+                    <interpGrp type="annotationFormat">
+                        <interp>TEI xml</interp>
+                    </interpGrp>
+                </ab>
+                <ab subtype="POS-tagging_lemmatisationProvenance1" type="linguisticAnnotation">
+                    <interpGrp type="annotationMode">
+                        <interp>automatically annotated</interp>
+                    </interpGrp>
+                    <interpGrp type="processor">
+                        <interp sameAs="#pie-tdn-all"/>
+                    </interpGrp>
+                    <date from="__DATE_IGNORED_BY_TEST__" to="__DATE_IGNORED_BY_TEST__"/>
+                </ab>
+            </interpretation>
+        </editorialDecl>
+    </encodingDesc>
+    <profileDesc>
+        <langUsage>
+            <language ident="nl">
+                Dutch
+                <interpGrp type="dominantLanguage">
+                    <interp>true</interp>
+                </interpGrp>
+            </language>
+        </langUsage>
+    </profileDesc>
+</teiHeader>
     <text>
         <body>
             <div>
diff --git a/server/src/test/resources/all-formats/output/from-Naf-to-TeiP5.tei.xml b/server/src/test/resources/all-formats/output/from-Naf-to-TeiP5.tei.xml
index 55c9d72..cc90219 100644
--- a/server/src/test/resources/all-formats/output/from-Naf-to-TeiP5.tei.xml
+++ b/server/src/test/resources/all-formats/output/from-Naf-to-TeiP5.tei.xml
@@ -1,57 +1,88 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <teiHeader>
-        <fileDesc>
-            <titleStmt>
-                <title>input.naf</title>
-            </titleStmt>
-            <publicationStmt>
-                <p>
-                    <date>2024-03-13 13:43:11</date>
-                    <idno type="sourceID">What if source id is undefined?</idno>
-                    <idno type="pid">What if no pid is defined?</idno>
-                </p>
-            </publicationStmt>
-            <sourceDesc>
-                <listBibl xml:id="inlMetadata">
-                    <bibl>
-                        <interpGrp type="questions">
-                            <interp>Welke inl data?</interp>
-                            <interp>wat als er geen is?</interp>
-                        </interpGrp>
-                    </bibl>
-                </listBibl>
-<listBibl xml:id="galahadMetadata">
-    <bibl>
-        <interpGrp type="model">
-            <interp>pie-tdn-all</interp>
-        </interpGrp>
-        <interpGrp type="tagset">
-            <interp>TDN-Core</interp>
-        </interpGrp>
-        <interpGrp type="corpus_name">
-            <interp>testCorpus</interp>
-        </interpGrp>
-        <interpGrp type="corpus_uuid">
-            <interp>44a533f9-7a42-48d7-9d92-e6c5d42bb5f5</interp>
-        </interpGrp>
-        <interpGrp type="date">
-            <interp>2024-03-13 13:43:11</interp>
-        </interpGrp>
-        <interpGrp type="user_id">
-            <interp>testUser</interp>
-        </interpGrp>
-        <interpGrp type="pid">
-            <interp>d0070e28-31d4-46e1-b069-c98afc8eeca0</interp>
-        </interpGrp>
-        <interpGrp type="title">
-            <interp>input.naf</interp>
-        </interpGrp>
-    </bibl>
-</listBibl>
-            </sourceDesc>
-        </fileDesc>
-    </teiHeader>
+<teiHeader>
+    <fileDesc>
+        <titleStmt>
+            <title>input.naf</title>
+            <respStmt>
+                <resp>linguistic annotation by GaLAHaD (https://portal.clarin.ivdnt.org/galahad)</resp>
+                <orgName xml:lang="nl">Instituut voor de Nederlandse Taal</orgName>
+                <orgName xml:lang="en">Dutch Language Institute</orgName>
+            </respStmt>
+            <respStmt>
+                <resp>exported as tei-p5 by GaLAHaD (https://portal.clarin.ivdnt.org/galahad)</resp>
+                <orgName xml:lang="nl">Instituut voor de Nederlandse Taal</orgName>
+                <orgName xml:lang="en">Dutch Language Institute</orgName>
+            </respStmt>
+        </titleStmt>
+        <publicationStmt>
+            <publisher>!Needs to be filled in!</publisher>
+            <idno type="sourceID">input.naf</idno>
+            <idno type="GaLAHaDPersistentIdentifier">__UUID_IGNORED_BY_TEST___tei</idno>
+        </publicationStmt>
+        <notesStmt>
+            <note resp="GaLAHaD" type="corpusName">testCorpus</note>
+            <note resp="GaLAHaD" type="sourceCollection">source name</note>
+            <note resp="GaLAHaD" type="sourceCollectionURL">http://source.url</note>
+        </notesStmt>
+        <sourceDesc>
+            <ab>
+                <idno type="sourceID">input.naf</idno>
+            </ab>
+            <ab type="date">
+                <date from="0" to="0"/>
+            </ab>
+        </sourceDesc>
+    </fileDesc>
+    <encodingDesc>
+        <appInfo resp="GaLAHaD">
+            <application ident="pie-tdn-all" version="1.0.1" xml:id="pie-tdn-all">
+                <label>POS-tagger and lemmatiser</label>
+                <ptr target="https://github.com/INL/galahad-taggers-dockerized/tree/1.0.2/pie/TDN-ALL"/>
+            </application>
+        </appInfo>
+        <editorialDecl resp="GaLAHaD">
+            <interpretation xml:id="A0001">
+                <ab subtype="POS-tagging_lemmatisation" type="linguisticAnnotation">
+                    <interpGrp type="annotationStyle">
+                        <interp>inline</interp>
+                    </interpGrp>
+                    <interpGrp type="Documentation">
+                        <interp/>
+                    </interpGrp>
+                    <interpGrp type="annotationSet">
+                        <interp>TDN-Core</interp>
+                    </interpGrp>
+                    <interpGrp type="annotationDescription">
+                        <interp>The file was automatically annotated within the platform GaLAHaD, which is a central hub for enriching historical Dutch.</interp>
+                    </interpGrp>
+                    <interpGrp type="annotationFormat">
+                        <interp>TEI xml</interp>
+                    </interpGrp>
+                </ab>
+                <ab subtype="POS-tagging_lemmatisationProvenance1" type="linguisticAnnotation">
+                    <interpGrp type="annotationMode">
+                        <interp>automatically annotated</interp>
+                    </interpGrp>
+                    <interpGrp type="processor">
+                        <interp sameAs="#pie-tdn-all"/>
+                    </interpGrp>
+                    <date from="__DATE_IGNORED_BY_TEST__" to="__DATE_IGNORED_BY_TEST__"/>
+                </ab>
+            </interpretation>
+        </editorialDecl>
+    </encodingDesc>
+    <profileDesc>
+        <langUsage>
+            <language ident="nl">
+                Dutch
+                <interpGrp type="dominantLanguage">
+                    <interp>true</interp>
+                </interpGrp>
+            </language>
+        </langUsage>
+    </profileDesc>
+</teiHeader>
     <text>
         <body>
             <div>
diff --git a/server/src/test/resources/all-formats/output/from-Tsv-to-TeiP5.tei.xml b/server/src/test/resources/all-formats/output/from-Tsv-to-TeiP5.tei.xml
index 448af28..48a6ffc 100644
--- a/server/src/test/resources/all-formats/output/from-Tsv-to-TeiP5.tei.xml
+++ b/server/src/test/resources/all-formats/output/from-Tsv-to-TeiP5.tei.xml
@@ -1,57 +1,88 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <teiHeader>
-        <fileDesc>
-            <titleStmt>
-                <title>input</title>
-            </titleStmt>
-            <publicationStmt>
-                <p>
-                    <date>2024-03-13 12:56:00</date>
-                    <idno type="sourceID">What if source id is undefined?</idno>
-                    <idno type="pid">What if no pid is defined?</idno>
-                </p>
-            </publicationStmt>
-            <sourceDesc>
-                <listBibl xml:id="inlMetadata">
-                    <bibl>
-                        <interpGrp type="questions">
-                            <interp>Welke inl data?</interp>
-                            <interp>wat als er geen is?</interp>
-                        </interpGrp>
-                    </bibl>
-                </listBibl>
-<listBibl xml:id="galahadMetadata">
-    <bibl>
-        <interpGrp type="model">
-            <interp>pie-tdn-all</interp>
-        </interpGrp>
-        <interpGrp type="tagset">
-            <interp>TDN-Core</interp>
-        </interpGrp>
-        <interpGrp type="corpus_name">
-            <interp>testCorpus</interp>
-        </interpGrp>
-        <interpGrp type="corpus_uuid">
-            <interp>1a0b2143-c380-4422-ad11-103262d53f0a</interp>
-        </interpGrp>
-        <interpGrp type="date">
-            <interp>2024-03-13 12:56:00</interp>
-        </interpGrp>
-        <interpGrp type="user_id">
-            <interp>testUser</interp>
-        </interpGrp>
-        <interpGrp type="pid">
-            <interp>d9806c01-cd99-42a2-8843-c6a91fc6c05b</interp>
-        </interpGrp>
-        <interpGrp type="title">
-            <interp>input</interp>
-        </interpGrp>
-    </bibl>
-</listBibl>
-            </sourceDesc>
-        </fileDesc>
-    </teiHeader>
+<teiHeader>
+    <fileDesc>
+        <titleStmt>
+            <title>input</title>
+            <respStmt>
+                <resp>linguistic annotation by GaLAHaD (https://portal.clarin.ivdnt.org/galahad)</resp>
+                <orgName xml:lang="nl">Instituut voor de Nederlandse Taal</orgName>
+                <orgName xml:lang="en">Dutch Language Institute</orgName>
+            </respStmt>
+            <respStmt>
+                <resp>exported as tei-p5 by GaLAHaD (https://portal.clarin.ivdnt.org/galahad)</resp>
+                <orgName xml:lang="nl">Instituut voor de Nederlandse Taal</orgName>
+                <orgName xml:lang="en">Dutch Language Institute</orgName>
+            </respStmt>
+        </titleStmt>
+        <publicationStmt>
+            <publisher>!Needs to be filled in!</publisher>
+            <idno type="sourceID">input</idno>
+            <idno type="GaLAHaDPersistentIdentifier">__UUID_IGNORED_BY_TEST___tei</idno>
+        </publicationStmt>
+        <notesStmt>
+            <note resp="GaLAHaD" type="corpusName">testCorpus</note>
+            <note resp="GaLAHaD" type="sourceCollection">source name</note>
+            <note resp="GaLAHaD" type="sourceCollectionURL">http://source.url</note>
+        </notesStmt>
+        <sourceDesc>
+            <ab>
+                <idno type="sourceID">input</idno>
+            </ab>
+            <ab type="date">
+                <date from="0" to="0"/>
+            </ab>
+        </sourceDesc>
+    </fileDesc>
+    <encodingDesc>
+        <appInfo resp="GaLAHaD">
+            <application ident="pie-tdn-all" version="1.0.1" xml:id="pie-tdn-all">
+                <label>POS-tagger and lemmatiser</label>
+                <ptr target="https://github.com/INL/galahad-taggers-dockerized/tree/1.0.2/pie/TDN-ALL"/>
+            </application>
+        </appInfo>
+        <editorialDecl resp="GaLAHaD">
+            <interpretation xml:id="A0001">
+                <ab subtype="POS-tagging_lemmatisation" type="linguisticAnnotation">
+                    <interpGrp type="annotationStyle">
+                        <interp>inline</interp>
+                    </interpGrp>
+                    <interpGrp type="Documentation">
+                        <interp/>
+                    </interpGrp>
+                    <interpGrp type="annotationSet">
+                        <interp>TDN-Core</interp>
+                    </interpGrp>
+                    <interpGrp type="annotationDescription">
+                        <interp>The file was automatically annotated within the platform GaLAHaD, which is a central hub for enriching historical Dutch.</interp>
+                    </interpGrp>
+                    <interpGrp type="annotationFormat">
+                        <interp>TEI xml</interp>
+                    </interpGrp>
+                </ab>
+                <ab subtype="POS-tagging_lemmatisationProvenance1" type="linguisticAnnotation">
+                    <interpGrp type="annotationMode">
+                        <interp>automatically annotated</interp>
+                    </interpGrp>
+                    <interpGrp type="processor">
+                        <interp sameAs="#pie-tdn-all"/>
+                    </interpGrp>
+                    <date from="__DATE_IGNORED_BY_TEST__" to="__DATE_IGNORED_BY_TEST__"/>
+                </ab>
+            </interpretation>
+        </editorialDecl>
+    </encodingDesc>
+    <profileDesc>
+        <langUsage>
+            <language ident="nl">
+                Dutch
+                <interpGrp type="dominantLanguage">
+                    <interp>true</interp>
+                </interpGrp>
+            </language>
+        </langUsage>
+    </profileDesc>
+</teiHeader>
     <text>
         <body>
             <div>
diff --git a/server/src/test/resources/all-formats/output/from-Txt-to-TeiP5.tei.xml b/server/src/test/resources/all-formats/output/from-Txt-to-TeiP5.tei.xml
index 3d92b88..9865230 100644
--- a/server/src/test/resources/all-formats/output/from-Txt-to-TeiP5.tei.xml
+++ b/server/src/test/resources/all-formats/output/from-Txt-to-TeiP5.tei.xml
@@ -1,57 +1,88 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <teiHeader>
-        <fileDesc>
-            <titleStmt>
-                <title>input</title>
-            </titleStmt>
-            <publicationStmt>
-                <p>
-                    <date>2024-03-13 13:49:50</date>
-                    <idno type="sourceID">What if source id is undefined?</idno>
-                    <idno type="pid">What if no pid is defined?</idno>
-                </p>
-            </publicationStmt>
-            <sourceDesc>
-                <listBibl xml:id="inlMetadata">
-                    <bibl>
-                        <interpGrp type="questions">
-                            <interp>Welke inl data?</interp>
-                            <interp>wat als er geen is?</interp>
-                        </interpGrp>
-                    </bibl>
-                </listBibl>
-<listBibl xml:id="galahadMetadata">
-    <bibl>
-        <interpGrp type="model">
-            <interp>pie-tdn-all</interp>
-        </interpGrp>
-        <interpGrp type="tagset">
-            <interp>TDN-Core</interp>
-        </interpGrp>
-        <interpGrp type="corpus_name">
-            <interp>testCorpus</interp>
-        </interpGrp>
-        <interpGrp type="corpus_uuid">
-            <interp>dc77cb11-2556-42db-99fd-0d8c23fbaada</interp>
-        </interpGrp>
-        <interpGrp type="date">
-            <interp>2024-03-13 13:49:50</interp>
-        </interpGrp>
-        <interpGrp type="user_id">
-            <interp>testUser</interp>
-        </interpGrp>
-        <interpGrp type="pid">
-            <interp>30a241ed-996b-4324-a106-8af5b291bbfe</interp>
-        </interpGrp>
-        <interpGrp type="title">
-            <interp>input</interp>
-        </interpGrp>
-    </bibl>
-</listBibl>
-            </sourceDesc>
-        </fileDesc>
-    </teiHeader>
+<teiHeader>
+    <fileDesc>
+        <titleStmt>
+            <title>input</title>
+            <respStmt>
+                <resp>linguistic annotation by GaLAHaD (https://portal.clarin.ivdnt.org/galahad)</resp>
+                <orgName xml:lang="nl">Instituut voor de Nederlandse Taal</orgName>
+                <orgName xml:lang="en">Dutch Language Institute</orgName>
+            </respStmt>
+            <respStmt>
+                <resp>exported as tei-p5 by GaLAHaD (https://portal.clarin.ivdnt.org/galahad)</resp>
+                <orgName xml:lang="nl">Instituut voor de Nederlandse Taal</orgName>
+                <orgName xml:lang="en">Dutch Language Institute</orgName>
+            </respStmt>
+        </titleStmt>
+        <publicationStmt>
+            <publisher>!Needs to be filled in!</publisher>
+            <idno type="sourceID">input</idno>
+            <idno type="GaLAHaDPersistentIdentifier">__UUID_IGNORED_BY_TEST___tei</idno>
+        </publicationStmt>
+        <notesStmt>
+            <note resp="GaLAHaD" type="corpusName">testCorpus</note>
+            <note resp="GaLAHaD" type="sourceCollection">source name</note>
+            <note resp="GaLAHaD" type="sourceCollectionURL">http://source.url</note>
+        </notesStmt>
+        <sourceDesc>
+            <ab>
+                <idno type="sourceID">input</idno>
+            </ab>
+            <ab type="date">
+                <date from="0" to="0"/>
+            </ab>
+        </sourceDesc>
+    </fileDesc>
+    <encodingDesc>
+        <appInfo resp="GaLAHaD">
+            <application ident="pie-tdn-all" version="1.0.1" xml:id="pie-tdn-all">
+                <label>POS-tagger and lemmatiser</label>
+                <ptr target="https://github.com/INL/galahad-taggers-dockerized/tree/1.0.2/pie/TDN-ALL"/>
+            </application>
+        </appInfo>
+        <editorialDecl resp="GaLAHaD">
+            <interpretation xml:id="A0001">
+                <ab subtype="POS-tagging_lemmatisation" type="linguisticAnnotation">
+                    <interpGrp type="annotationStyle">
+                        <interp>inline</interp>
+                    </interpGrp>
+                    <interpGrp type="Documentation">
+                        <interp/>
+                    </interpGrp>
+                    <interpGrp type="annotationSet">
+                        <interp>TDN-Core</interp>
+                    </interpGrp>
+                    <interpGrp type="annotationDescription">
+                        <interp>The file was automatically annotated within the platform GaLAHaD, which is a central hub for enriching historical Dutch.</interp>
+                    </interpGrp>
+                    <interpGrp type="annotationFormat">
+                        <interp>TEI xml</interp>
+                    </interpGrp>
+                </ab>
+                <ab subtype="POS-tagging_lemmatisationProvenance1" type="linguisticAnnotation">
+                    <interpGrp type="annotationMode">
+                        <interp>automatically annotated</interp>
+                    </interpGrp>
+                    <interpGrp type="processor">
+                        <interp sameAs="#pie-tdn-all"/>
+                    </interpGrp>
+                    <date from="__DATE_IGNORED_BY_TEST__" to="__DATE_IGNORED_BY_TEST__"/>
+                </ab>
+            </interpretation>
+        </editorialDecl>
+    </encodingDesc>
+    <profileDesc>
+        <langUsage>
+            <language ident="nl">
+                Dutch
+                <interpGrp type="dominantLanguage">
+                    <interp>true</interp>
+                </interpGrp>
+            </language>
+        </langUsage>
+    </profileDesc>
+</teiHeader>
     <text>
         <body>
             <div>
diff --git a/server/src/test/resources/folia/twine/merged-output.folia.xml b/server/src/test/resources/folia/twine/merged-output.folia.xml
index 01e4c85..a95f5ff 100644
--- a/server/src/test/resources/folia/twine/merged-output.folia.xml
+++ b/server/src/test/resources/folia/twine/merged-output.folia.xml
@@ -23,12 +23,12 @@
       <div class="div" xml:id="CLVN-1-1_71c1b8b5-a9c8-4c73-b214-5a926126eab3.text.1.body.1.div.1">
         <p class="p" xml:id="CLVN-1-1_71c1b8b5-a9c8-4c73-b214-5a926126eab3.text.1.body.1.div.1.p.1">
           <!-- Note the "be,<br />that": this should be parsed as "be,that". No space! Why? Because some documents contain words like "be<br/>kijken" -> "bekijken"-->
-          <w><t>To</t><lemma class="te" processor="path" set="path"/><pos class="ADP(type=pre)" head="ADP" processor="path" set="path"/></w> <w><t>ob<t-style class="italic">ey</t-style></t><lemma class="obedië" processor="path" set="path"/><pos class="NOU-C(number=sg)" head="NOU-C" processor="path" set="path"/></w>  <w><t>or</t><lemma class="or" processor="path" set="path"/><pos class="INT" head="INT" processor="path" set="path"/></w> <w><t>n<t-style class="bold">o</t-style>t</t><lemma class="not" processor="path" set="path"/><pos class="NOU-C(number=sg)" head="NOU-C" processor="path" set="path"/></w> <w><t>to</t><lemma class="te" processor="path" set="path"/><pos class="ADP(type=pre)" head="ADP" processor="path" set="path"/></w> <w><t>be</t><lemma class="bedie" processor="path" set="path"/><pos class="NOU-C(number=sg)" head="NOU-C" processor="path" set="path"/></w><w><t>,</t><lemma class="null" processor="path" set="path"/><pos class="LET" head="LET" processor="path" set="path"/></w><br/><w><t>that</t><lemma class="het+hat" processor="path" set="path"/><pos class="PD(type=d-p,subtype=art,position=prenom)+NOU-C(number=sg)" head="PD+NOU-C" processor="path" set="path"/></w> <w><t>is</t><lemma class="zijn" processor="path" set="path"/><pos class="VRB(finiteness=fin,tense=pres)" head="VRB" processor="path" set="path"/></w> <w><t>the</t><lemma class="the" processor="path" set="path"/><pos class="RES(type=for)" head="RES" processor="path" set="path"/></w> <w><t><t-style class="bold">one</t-style></t><lemma class="one" processor="path" set="path"/><pos class="RES(type=for)" head="RES" processor="path" set="path"/></w> <w><t><t-style class="bold"><t-style class="red">question</t-style></t-style></t><lemma class="question" processor="path" set="path"/><pos class="RES(type=for)" head="RES" processor="path" set="path"/></w> <w><t><t-style class="bold">that</t-style></t><lemma class="het+hat" processor="path" set="path"/><pos class="PD(type=d-p,subtype=art,position=prenom)+NOU-C(number=sg)" head="PD+NOU-C" processor="path" set="path"/></w> <w><t><t-style class="bold">y<t-style class="italic">re</t-style>main</t-style>ed</t><lemma class="jermina" processor="path" set="path"/><pos class="NOU-C(number=sg)" head="NOU-C" processor="path" set="path"/></w><w><t>.</t><lemma class="null" processor="path" set="path"/><pos class="LET" head="LET" processor="path" set="path"/></w>
+          <w><t>To</t><lemma class="te" processor="path" set="path"/><pos class="ADP(type=pre)" head="ADP" processor="path" set="path"/></w> <w><t>ob<t-style class="italic">ey</t-style></t><lemma class="obedië" processor="path" set="path"/><pos class="NOU-C(number=sg)" head="NOU-C" processor="path" set="path"/></w> <w><t>or</t><lemma class="or" processor="path" set="path"/><pos class="INT" head="INT" processor="path" set="path"/></w> <w><t>n<t-style class="bold">o</t-style>t</t><lemma class="not" processor="path" set="path"/><pos class="NOU-C(number=sg)" head="NOU-C" processor="path" set="path"/></w> <w><t>to</t><lemma class="te" processor="path" set="path"/><pos class="ADP(type=pre)" head="ADP" processor="path" set="path"/></w> <w><t>be</t><lemma class="bedie" processor="path" set="path"/><pos class="NOU-C(number=sg)" head="NOU-C" processor="path" set="path"/></w><w><t>,</t><lemma class="null" processor="path" set="path"/><pos class="LET" head="LET" processor="path" set="path"/></w><br/><w><t>that</t><lemma class="het+hat" processor="path" set="path"/><pos class="PD(type=d-p,subtype=art,position=prenom)+NOU-C(number=sg)" head="PD+NOU-C" processor="path" set="path"/></w> <w><t>is</t><lemma class="zijn" processor="path" set="path"/><pos class="VRB(finiteness=fin,tense=pres)" head="VRB" processor="path" set="path"/></w> <w><t>the</t><lemma class="the" processor="path" set="path"/><pos class="RES(type=for)" head="RES" processor="path" set="path"/></w><w><t><t-style class="bold">one</t-style></t><lemma class="one" processor="path" set="path"/><pos class="RES(type=for)" head="RES" processor="path" set="path"/></w><w><t><t-style class="bold"><t-style class="red">question</t-style></t-style></t><lemma class="question" processor="path" set="path"/><pos class="RES(type=for)" head="RES" processor="path" set="path"/></w> <w><t><t-style class="bold">that</t-style></t><lemma class="het+hat" processor="path" set="path"/><pos class="PD(type=d-p,subtype=art,position=prenom)+NOU-C(number=sg)" head="PD+NOU-C" processor="path" set="path"/></w> <w><t><t-style class="bold">y<t-style class="italic">re</t-style>main</t-style>ed</t><lemma class="jermina" processor="path" set="path"/><pos class="NOU-C(number=sg)" head="NOU-C" processor="path" set="path"/></w><w><t>.</t><lemma class="null" processor="path" set="path"/><pos class="LET" head="LET" processor="path" set="path"/></w>
           <lang class="nld"/>
         </p>
         <p class="p" xml:id="CLVN-1-1_71c1b8b5-a9c8-4c73-b214-5a926126eab3.text.1.body.1.div.1.p.2">
           <!-- abc def ghijklmno pqrstu xyzabc def-->
-          <w><t>abc</t><lemma class="abchak" processor="path" set="path"/><pos class="NOU-C(number=sg)" head="NOU-C" processor="path" set="path"/></w> <w><t><t-style class="bold">def</t-style></t><lemma class="door" processor="path" set="path"/><pos class="CONJ(type=coor)" head="CONJ" processor="path" set="path"/></w> <w><t><t-style class="bold">ghi<t-style class="italic">jkl</t-style><t-style class="red"><t-style class="sub">mno</t-style></t-style></t-style></t><lemma class="geminnel" processor="path" set="path"/><pos class="NOU-P" head="NOU-P" processor="path" set="path"/></w> <w><t><t-style class="bold"><t-style class="red">pqr</t-style>stu</t-style></t><lemma class="christus" processor="path" set="path"/><pos class="RES(type=for)" head="RES" processor="path" set="path"/></w> <w><t><t-style class="bold">xyz</t-style>abc</t><lemma class="sint-jazoris" processor="path" set="path"/><pos class="NOU-C(number=sg)" head="NOU-C" processor="path" set="path"/></w> <w><t>def</t><lemma class="doen" processor="path" set="path"/><pos class="VRB(finiteness=fin,tense=past)" head="VRB" processor="path" set="path"/></w>
+          <w><t>abc</t><lemma class="abchak" processor="path" set="path"/><pos class="NOU-C(number=sg)" head="NOU-C" processor="path" set="path"/></w><w><t><t-style class="bold">def</t-style></t><lemma class="door" processor="path" set="path"/><pos class="CONJ(type=coor)" head="CONJ" processor="path" set="path"/></w> <w><t><t-style class="bold">ghi<t-style class="italic">jkl</t-style><t-style class="red"><t-style class="sub">mno</t-style></t-style></t-style></t><lemma class="geminnel" processor="path" set="path"/><pos class="NOU-P" head="NOU-P" processor="path" set="path"/></w> <w><t><t-style class="bold"><t-style class="red">pqr</t-style>stu</t-style></t><lemma class="christus" processor="path" set="path"/><pos class="RES(type=for)" head="RES" processor="path" set="path"/></w> <w><t><t-style class="bold">xyz</t-style>abc</t><lemma class="sint-jazoris" processor="path" set="path"/><pos class="NOU-C(number=sg)" head="NOU-C" processor="path" set="path"/></w> <w><t>def</t><lemma class="doen" processor="path" set="path"/><pos class="VRB(finiteness=fin,tense=past)" head="VRB" processor="path" set="path"/></w>
           <lang class="nld"/>
         </p>
       </div>
diff --git a/server/src/test/resources/tei/brieven/merged-output.tei.xml b/server/src/test/resources/tei/brieven/merged-output.tei.xml
index 6769351..7488557 100644
--- a/server/src/test/resources/tei/brieven/merged-output.tei.xml
+++ b/server/src/test/resources/tei/brieven/merged-output.tei.xml
@@ -1,47 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><TEI xmlns="http://www.tei-c.org/ns/1.0"><teiHeader>
     <fileDesc>
       <titleStmt>
-        <title>Addens, Johannes aan Vloten, Katharina van | 1892-07-15</title>
+        <title>Addens, Johannes aan Vloten, Katharina van | __DATE_IGNORED_BY_TEST__</title>
         
-      </titleStmt>
+      <respStmt><resp>linguistic annotation by GaLAHaD (https://portal.clarin.ivdnt.org/galahad)</resp><orgName xml:lang="nl">Instituut voor de Nederlandse Taal</orgName><orgName xml:lang="en">Dutch Language Institute</orgName></respStmt><respStmt><resp>TEI merged by GaLAHaD (https://portal.clarin.ivdnt.org/galahad)</resp><orgName xml:lang="nl">Instituut voor de Nederlandse Taal</orgName><orgName xml:lang="en">Dutch Language Institute</orgName></respStmt></titleStmt>
       <publicationStmt>
         <p>
           <date>1892</date>
           <idno type="sourceID">brieven-correspondenten-1900:0017</idno>
           <idno type="pid">INT___UUID_IGNORED_BY_TEST__</idno>
         </p>
-      </publicationStmt>
+      <publisher>!Needs to be filled in!</publisher><idno type="sourceID">Addens, Johannes aan Vloten, Katharina van | __DATE_IGNORED_BY_TEST__</idno><idno type="GaLAHaDPersistentIdentifier">__UUID_IGNORED_BY_TEST___tei</idno></publicationStmt>
       <notesStmt>
         <note/>
-      </notesStmt>
-      <sourceDesc><listBibl xml:id="galahadMetadata">
-    <bibl>
-        <interpGrp type="model">
-            <interp>pie-tdn-all</interp>
-        </interpGrp>
-        <interpGrp type="tagset">
-            <interp>TDN-Core</interp>
-        </interpGrp>
-        <interpGrp type="corpus_name">
-            <interp>testCorpus</interp>
-        </interpGrp>
-        <interpGrp type="corpus_uuid">
-            <interp>__UUID_IGNORED_BY_TEST__</interp>
-        </interpGrp>
-        <interpGrp type="date">
-            <interp>__DATE_IGNORED_BY_TEST__</interp>
-        </interpGrp>
-        <interpGrp type="user_id">
-            <interp>testUser</interp>
-        </interpGrp>
-        <interpGrp type="pid">
-            <interp>__UUID_IGNORED_BY_TEST__</interp>
-        </interpGrp>
-        <interpGrp type="title">
-            <interp>Addens, Johannes aan Vloten, Katharina van | 1892-07-15</interp>
-        </interpGrp>
-    </bibl>
-</listBibl>
+      <note resp="GaLAHaD" type="corpusName">testCorpus</note><note resp="GaLAHaD" type="sourceCollection">source name</note><note resp="GaLAHaD" type="sourceCollectionURL">http://source.url</note></notesStmt>
+      <sourceDesc>
         <listBibl xml:id="inlMetadata">
           <bibl>
             <interpGrp type="sourceID">
@@ -53,7 +26,7 @@
               
             </interpGrp>
             <interpGrp type="titleLevel1">
-              <interp>Addens, Johannes aan Vloten, Katharina van | 1892-07-15</interp>
+              <interp>Addens, Johannes aan Vloten, Katharina van | __DATE_IGNORED_BY_TEST__</interp>
               
             </interpGrp>
             <interpGrp type="subtitleLevel1">
@@ -311,7 +284,7 @@
               
             </interpGrp>
             <interpGrp type="ingestTime">
-              <interp>2018-05-31T12:07</interp>
+              <interp>__DATE_IGNORED_BY_TEST__T12:07</interp>
               
             </interpGrp>
             <interpGrp type="genreLevel1">
@@ -402,6 +375,6 @@
         </listBibl>
       </sourceDesc>
     </fileDesc>
-  </teiHeader><text>
+  <encodingDesc><appInfo resp="GaLAHaD"><application ident="pie-tdn-all" version="1.0.1" xml:id="pie-tdn-all"><label>POS-tagger and lemmatiser</label><ptr target="https://github.com/INL/galahad-taggers-dockerized/tree/1.0.2/pie/TDN-ALL"/></application></appInfo><editorialDecl resp="GaLAHaD"><interpretation xml:id="A0001"><ab subtype="POS-tagging_lemmatisation" type="linguisticAnnotation"><interpGrp type="annotationStyle"><interp>inline</interp></interpGrp><interpGrp type="Documentation"><interp/></interpGrp><interpGrp type="annotationSet"><interp>TDN-Core</interp></interpGrp><interpGrp type="annotationDescription"><interp>The file was automatically annotated within the platform GaLAHaD, which is a central hub for enriching historical Dutch.</interp></interpGrp><interpGrp type="annotationFormat"><interp>TEI xml</interp></interpGrp></ab><ab subtype="POS-tagging_lemmatisationProvenance1" type="linguisticAnnotation"><interpGrp type="annotationMode"><interp>automatically annotated</interp></interpGrp><interpGrp type="processor"><interp sameAs="#pie-tdn-all"/></interpGrp><date from="__DATE_IGNORED_BY_TEST__" to="__DATE_IGNORED_BY_TEST__"/></ab></interpretation></editorialDecl></encodingDesc><profileDesc><langUsage><language ident="nl">Dutch<interpGrp type="dominantLanguage"><interp>true</interp></interpGrp></language></langUsage></profileDesc></teiHeader><text>
 
-<body><head resp="editor"><w lemma="advies" pos="NOU-P">Addens,</w> <w lemma="johannes" pos="NOU-P">Johannes</w> <w lemma="aan" pos="ADP">aan</w> <w lemma="vloot" pos="NOU-P">Vloten,</w> <w lemma="catharina" pos="NOU-P">Katharina</w> <w lemma="van" pos="ADP">van</w> <w lemma="van der meije" pos="PD">|</w> <w lemma="zestienhonderdvijfen" pos="NUM">1892-07-15</w></head><p> <pb/><w lemma="held worderijs ?" pos="NOU-P">Helsingfors,</w> <w lemma="de" pos="PD">den</w> <w lemma="vijftiende" pos="NUM">15</w> <w lemma="juli" pos="NOU-C">Juli</w> <w lemma="zestienhonderdtweeën" pos="NUM">1892</w></p><p> </p><p> <w lemma="best" pos="ADJ">Beste</w> <w lemma="mevrouw" pos="NOU-C">Mevr.</w> <w lemma="kritijnk" pos="NOU-P">Kitty</w> <w lemma="verwerken" pos="VRB">Verwey-v.</w> <w lemma="vloot" pos="NOU-P">Vloten.</w></p><p> </p><p> <w lemma="het" pos="ADV">'t</w> <w lemma="zijn" pos="VRB">Was</w> <w lemma="zeer" pos="ADV">zeer</w> <w lemma="lief" pos="ADJ">lief</w> <w lemma="van" pos="ADP">van</w> <w lemma="u" pos="PD">U</w> <w lemma="ik" pos="PD">my</w> <w lemma="die" pos="PD">die</w> <w lemma="boek" pos="NOU-C">boeken</w> <w lemma="te" pos="ADP">te</w> <w lemma="sturen" pos="VRB">sturen,</w> <w lemma="zeer" pos="ADV">zeer</w> <w lemma="lief" pos="ADJ">lief.</w> <w lemma="dank" pos="VRB">Dank</w> <w lemma="best" pos="ADJ">beste</w> <w lemma="kitaaltje" pos="NOU-C">Kitty,</w> <w lemma="mevrouw" pos="NOU-C">Mevrouw</w> <w lemma="willen" pos="VRB">wilde</w> <w lemma="ik" pos="PD">ik</w> <w lemma="zeggen" pos="NOU-C">zeggen.</w> <w lemma="krittentie" pos="NOU-P">Kitty</w> <w lemma="vinden" pos="VRB">vind</w> <w lemma="ik" pos="PD">ik</w> <w lemma="moeten" pos="VRB">mooier,</w> <w lemma="mevrouw" pos="NOU-C">Mevrouw</w> <w lemma="zijn" pos="VRB">is</w> <w lemma="te" pos="ADP">te</w> <w lemma="deugdriet" pos="NUM">deftig,</w> <w lemma="beteren" pos="VRB">beteekent:</w> <w lemma="komen" pos="VRB">Kom</w> <w lemma="mee" pos="ADV">me</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="te" pos="ADP">te</w> <w lemma="na" pos="ADV">na.</w> <w lemma="ue." pos="NUM">-</w> <w lemma="met" pos="ADP">Met</w> <w lemma="het" pos="PD">het</w> <w lemma="oordeel" pos="NOU-C">oordeel</w> <w lemma="de" pos="PD">der</w> <w lemma="schelmer" pos="NOU-P">Schiedammer</w> <w lemma="stellen" pos="VRB">stem</w> <w lemma="ik" pos="PD">ik</w> <w lemma="volkomen" pos="ADV">volkomen</w> <w lemma="in" pos="ADP">in.</w> <w lemma="hart" pos="ADJ">'De</w> <w lemma="joden" pos="NOU-C">Joden'</w> <w lemma="zijn" pos="VRB">zijn</w> <w lemma="schoon" pos="CON">schoon,</w> <w lemma="onvreeddelijk" pos="ADV">onovertreffelijk</w> <w lemma="schoon" pos="ADJ">schoon.</w> <w lemma="die" pos="CON">-</w> <w lemma="de" pos="PD">De</w> <w lemma="belracht" pos="NOU-C">beeldenpracht</w> <w lemma="zijn" pos="VRB">is</w> <w lemma="heerlijk" pos="ADV">heerlijk,</w> <w lemma="de" pos="PD">de</w> <w lemma="verhalen" pos="VRB">verhalen</w> <w lemma="zijn" pos="PD">zijn</w> <w lemma="natuurlijk" pos="ADJ">naif-kinderlijk,</w> <w lemma="tinnen" pos="NOU-C">tintelen</w> <w lemma="van" pos="ADP">van</w> <w lemma="gevoel" pos="NOU-C">gevoel.</w> <w lemma="die" pos="VRB">-</w> <w lemma="dat" pos="CON">Dat</w> <w lemma="men" pos="PD">men</w> <w lemma="eraf" pos="ADV">hierby</w> <w lemma="liggen" pos="VRB">lachen</w> <w lemma="kunnen" pos="VRB">kon,</w> <w lemma="zoals" pos="CON">zooals</w> <w lemma="gij" pos="PD">Gij</w> <w lemma="schrijven" pos="VRB">schrijft,</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="de" pos="PD">de</w> <w lemma="schelmer" pos="NOU-P">Schiedammer</w> <w lemma="zeggen" pos="VRB">zegt</w> <w lemma="allerheil" pos="CON">het,</w> <w lemma="zijn" pos="VRB">is</w> <w lemma="ik" pos="PD">mij</w> <w lemma="onbepreken" pos="ADJ">onbegrijpelijk.</w> <w lemma="unresolved" pos="RES">-</w> <w lemma="waarom" pos="ADV">Waarom</w> <w lemma="laten" pos="VRB">lachtte</w> <w lemma="het" pos="PD">'t</w> <w lemma="publiek" pos="NOU-C">publiek</w> <w lemma="doen" pos="VRB">-?-</w> <w lemma="de" pos="PD">De</w> <w lemma="verzet" pos="NOU-C">verzen</w> <w lemma="geven" pos="VRB">geven</w> <w lemma="er" pos="ADV">er</w> <w lemma="toch" pos="ADV">toch</w> <w lemma="geen" pos="PD">geene</w> <w lemma="aanleiding" pos="NOU-C">aanleiding</w> <w lemma="toe" pos="ADV">toe</w> <w lemma="en" pos="CON">en</w> <w lemma="daar" pos="ADV">daar</w> <w lemma="verzeten" pos="VRB">verzen</w> <w lemma="en" pos="CON">en</w> <w lemma="bedende" pos="ADP">beelden</w> <w lemma="zeker" pos="ADJ">zeker</w> <w lemma="elkaar" pos="PD">elkaâr</w> <w lemma="waardig" pos="ADJ">waardig</w> <w lemma="dekenken" pos="NOU-C">dekken</w> <w lemma="zijn" pos="VRB">waren,</w> <w lemma="bestaan" pos="VRB">bestond</w> <w lemma="er" pos="ADV">er</w> <w lemma="geen" pos="PD">geen</w> <w lemma="grond" pos="NOU-C">grond</w> <w lemma="iets" pos="PD">iets</w> <w lemma="belijken" pos="ADJ">belachelyk</w> <w lemma="te" pos="ADP">te</w> <w lemma="vinden" pos="VRB">vinden.</w> <w lemma="ue." pos="RES">-</w> <w lemma="unresolved" pos="ADV">-</w> <w lemma="wat" pos="PD">Wat</w> <w lemma="plaats" pos="NOU-C">Plox</w> <w lemma="over" pos="ADP">over</w> <w lemma="de" pos="PD">de</w> <w lemma="taal" pos="NOU-C">taal</w> <w lemma="zeggen" pos="VRB">zegt,</w> <w lemma="steed" pos="VRB">stem</w> <w lemma="ik" pos="PD">ik</w> <w lemma="het" pos="PD">ten</w> <w lemma="deel" pos="NOU-C">deele</w> <w lemma="toezenden" pos="VRB">toe.</w> <w lemma="ue." pos="PD">-</w> <w lemma="ook" pos="ADV">Ook</w> <w lemma="ik" pos="PD">ik</w> <w lemma="zullen" pos="VRB">zou</w> <w lemma="het" pos="PD">'t</w> <w lemma="beter" pos="ADV">beter</w> <w lemma="achten" pos="VRB">achten,</w> <w lemma="als" pos="CON">als</w> <w lemma="uw" pos="PD">Uw</w> <w lemma="man" pos="NOU-C">man</w> <w lemma="gewoon" pos="VRB">gewoon</w> <w lemma="kussen" pos="VRB">gekuischt</w> <w lemma="hollands" pos="ADJ">Hollands</w> <w lemma="willen" pos="VRB">wou</w> <w lemma="schrijven" pos="VRB">schrijven,</w> <w lemma="zoals" pos="CON">zooals</w> <w lemma="de" pos="PD">de</w> <w lemma="genezent" pos="NOU-C">Genestett</w> <w lemma="en" pos="CON">en</w> <w lemma="ander" pos="PD">anderen,</w> <w lemma="die" pos="PD">die</w> <w lemma="er" pos="ADV">er</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="iets" pos="PD">iets</w> <w lemma="daarvan" pos="ADV">van</w> <w lemma="weten" pos="VRB">wisten,</w> <w lemma="overlijden" pos="VRB">deden.</w> <w lemma="de" pos="PD">De</w> <w lemma="schoolheid" pos="NOU-C">schoonheid</w> <w lemma="zijn" pos="PD">zijner</w> <w lemma="verzetten" pos="NOU-C">verzen</w> <w lemma="behoeven" pos="VRB">behoefde</w> <w lemma="daardoor" pos="ADV">daardoor</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="te" pos="ADP">te</w> <w lemma="lijden" pos="VRB">lyden,</w> <w lemma="en" pos="CON">en</w> <w lemma="hij" pos="PD">hij</w> <w lemma="zullen" pos="VRB">zou</w> <w lemma="meer" pos="PD">meer</w> <w lemma="les" pos="NOU-C">lezers</w> <w lemma="vinden" pos="VRB">vinden.</w> <w lemma="tegen" pos="ADP">Tegen</w> <w lemma="de" pos="PD">de</w> <w lemma="zonderling" pos="ADJ">zonderlinge</w> <w lemma="afbreking" pos="NOU-C">afbreking</w> <w lemma="van" pos="ADP">van</w> <w lemma="woord" pos="NOU-C">woorden</w> <w lemma="getrouwd" pos="ADJ">ge-scepterde</w> <w lemma="familia" pos="NOU-C">farao.</w> <w lemma="et cetera" pos="ADV">etc.</w> <pb/><w lemma="bij" pos="ADP">bij</w> <w lemma="deze" pos="PD">deze</w> <w lemma="soort" pos="NOU-C">soort</w> <w lemma="daarvan" pos="ADV">van</w> <w lemma="verzien" pos="VRB">verzen,</w> <w lemma="hebben" pos="VRB">heb</w> <w lemma="ik" pos="PD">ik</w> <w lemma="geen" pos="PD">geen</w> <w lemma="bezorgen" pos="VRB">bezwaar,</w> <w lemma="enins" pos="PD">evenmin</w> <w lemma="als" pos="CON">als</w> <w lemma="tegen" pos="ADP">tegen</w> <w lemma="de" pos="PD">de</w> <w lemma="wellang" pos="NOU-C">weglating</w> <w lemma="de" pos="PD">der</w> <w lemma="leiden" pos="VRB">lidwoorden:</w></p><p> </p><p> <w lemma="hart" pos="NOU-P">'Binnen</w> <w lemma="in" pos="ADP">in</w> <w lemma="unresolved" pos="NOU-C">zaal</w> <w lemma="van" pos="ADP">van</w> <w lemma="cheid" pos="NOU-C">cederhout.'</w></p><p> </p><p> <w lemma="de" pos="PD">De</w> <w lemma="taal" pos="NOU-C">taal</w> <w lemma="zijn" pos="VRB">is</w> <w lemma="zo" pos="ADV">zoo</w> <w lemma="terusten" pos="VRB">teer,</w> <w lemma="zo" pos="ADV">zoo</w> <w lemma="vinden" pos="VRB">fijn,</w> <w lemma="zo" pos="ADV">zoo</w> <w lemma="evers" pos="ADV">etherisch</w> <w lemma="dat" pos="CON">dat</w> <w lemma="zij" pos="PD">ze</w> <w lemma="toch" pos="ADV">toch</w> <w lemma="nauw" pos="ADV">nauw</w> <w lemma="of" pos="CON">of</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="uitstrekken" pos="VRB">uitgesproken</w> <w lemma="worden" pos="VRB">worden.</w> <w lemma="willen" pos="VRB">Wil</w> <w lemma="men" pos="PD">men</w> <w lemma="zij" pos="PD">ze</w> <w lemma="zien" pos="VRB">zien,</w> <w lemma="dan" pos="ADV">dan</w> <w lemma="zullen" pos="VRB">zou</w> <w lemma="ik" pos="PD">ik</w> <w lemma="schrijven" pos="VRB">schrijven:</w></p><p> </p><p> <w lemma="binnenkomen" pos="ADV">Binnen</w> <w lemma="in" pos="ADP">in</w> <hi rend="superscript"><w lemma="de" pos="PD">de</w></hi> <w lemma="de salt" pos="NOU-C">zaal</w> <w lemma="unresolved" pos="RES">-</w></p><p> <w lemma="dat" pos="CON">dat</w> <hi rend="superscript"><w lemma="de" pos="PD">de</w></hi> <w lemma="wind" pos="NOU-C">wind</w> <w lemma="bewegen" pos="VRB">beweegt.</w> <w lemma="ue." pos="PD">-</w></p><p> </p><p> <w lemma="tegen" pos="ADP">Tegen</w> <w lemma="de" pos="PD">D'</w> <w lemma="joden" pos="NOU-C">Joden</w> <w lemma="hebben" pos="VRB">heb</w> <w lemma="ik" pos="PD">ik</w> <w lemma="niets" pos="PD">niets,</w> <w lemma="het" pos="PD">'t</w> <w lemma="komen" pos="VRB">komt</w> <w lemma="ik" pos="PD">mij</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="honderdaads" pos="ADJ">'onmelodisch'</w> <w lemma="voor" pos="ADP">voor.</w> <w lemma="ue." pos="RES">-</w> <w lemma="zulk" pos="PD">Zulke</w> <w lemma="verbling" pos="NOU-C">verbindingen</w> <w lemma="zijn" pos="VRB">zijn</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="ophouden" pos="VRB">geoorloofd,</w> <w lemma="zeggen" pos="VRB">zegt</w> <w lemma="plaas" pos="NOU-C">Plox.</w> <w lemma="waarom" pos="ADV">Waarom</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="een" pos="CON">-?.</w> <w lemma="zij" pos="PD">Ze</w> <w lemma="komen" pos="VRB">komen</w> <w lemma="in" pos="ADP">in</w> <w lemma="de" pos="PD">de</w> <w lemma="spectimical" pos="NOU-C">spreektaal</w> <w lemma="voorts" pos="ADV">voor,</w> <w lemma="en" pos="CON">en</w> <w lemma="deze" pos="PD">deze</w> <w lemma="zijn" pos="VRB">is</w> <w lemma="toch" pos="ADV">toch</w> <w lemma="de" pos="PD">de</w> <w lemma="weter" pos="NOU-C">wetgever</w> <w lemma="van" pos="ADP">van</w> <w lemma="ons" pos="PD">ons</w> <w lemma="tamak" pos="NOU-C">taal-wetboek,</w> <w lemma="van" pos="ADP">van</w> <w lemma="de" pos="PD">de</w> <w lemma="graafschap" pos="NOU-C">gramatica.</w> <w lemma="unresolved" pos="RES">-</w> <w lemma="ik" pos="PD">Ik</w> <w lemma="maken" pos="VRB">maak</w> <w lemma="jij" pos="PD">je</w> <w lemma="mijn" pos="PD">mijn</w> <w lemma="compliment" pos="NOU-C">compliment</w> <w lemma="over" pos="ADP">over</w> <w lemma="een" pos="PD">een</w> <w lemma="man" pos="NOU-C">man,</w> <w lemma="die" pos="PD">die</w> <w lemma="zulk" pos="PD">zulke</w> <w lemma="verzen" pos="VRB">verzen</w> <w lemma="schrijven" pos="VRB">schrijft.</w></p><p> <w lemma="edele" pos="ADJ">'De</w> <w lemma="joden" pos="NOU-C">Joden'</w> <w lemma="behouden" pos="VRB">behoud</w> <w lemma="eken" pos="INT">ik;</w> <w lemma="mogen" pos="VRB">mag</w> <w lemma="ik" pos="PD">ik</w> <w lemma="die" pos="PD">die</w> <w lemma="schelm" pos="NOU-C">Schiedamsche</w> <w lemma="er" pos="ADV">er</w> <w lemma="daarbij" pos="ADV">bij</w> <w lemma="liggen" pos="VRB">leggen</w> <w lemma="en" pos="CON">en</w> <w lemma="behouden" pos="VRB">behouden?</w> <w lemma="het" pos="CON">'t</w> <w lemma="johannes" pos="NOU-P">Johannes</w> <w lemma="engelse" pos="NOU-P">Evangelie</w> <w lemma="stuur" pos="VRB">stuur</w> <w lemma="ik" pos="PD">ik</w> <w lemma="u" pos="PD">U</w> <w lemma="laat" pos="ADV">later</w> <w lemma="te" pos="VRB">terug,</w> <w lemma="en" pos="CON">en</w> <w lemma="tevens" pos="ADV">tevens</w> <w lemma="geld" pos="NOU-C">geld</w> <w lemma="voor" pos="ADP">voor</w> <w lemma="het" pos="PD">'t</w> <w lemma="eerst" pos="ADJ">eerste.</w> <w lemma="gij" pos="PD">Gij</w> <w lemma="zijn" pos="VRB">zijt</w> <w lemma="huisvrouw" pos="NOU-C">huismoeder,</w> <w lemma="vrouw" pos="NOU-C">vrouw.;</w> <w lemma="te" pos="ADP">te</w> <w lemma="prachtig" pos="NOU-P">praktiesch</w> <w lemma="om" pos="CON">om</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="voor" pos="ADP">voor</w> <w lemma="uw" pos="PD">Uw'</w> <w lemma="huislonding" pos="NOU-C">huishouding</w> <w lemma="te" pos="ADP">te</w> <w lemma="zorgen" pos="VRB">zorgen</w> <w lemma="en" pos="CON">en</w> <w lemma="geven" pos="VRB">geeft</w> <w lemma="mee" pos="ADV">me</w> <w lemma="de" pos="PD">den</w> <w lemma="prijs" pos="NOU-C">prijs</w> <w lemma="opperstuurman" pos="RES">[op?].</w> </p><p> <w lemma="heer" pos="VRB">'K</w> <w lemma="vinden" pos="VRB">vond</w> <w lemma="in" pos="CON">in</w> <w lemma="dat" pos="CON">dat</w> <w lemma="engelse" pos="NOU-C">Evangelie</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="een" pos="PD">een</w> <w lemma="geducht" pos="NOU-C">gedicht</w> <w lemma="van" pos="ADP">van</w> <w lemma="uw" pos="PD">Uw</w> <w lemma="albert" pos="NOU-P">Albert:</w> <w lemma="dat" pos="CON">dat</w> <w lemma="ik" pos="PD">ik</w> <w lemma="mijn" pos="PD">mijner</w> <w lemma="vrouw" pos="NOU-C">vrouw</w> <w lemma="met" pos="ADP">met</w> <w lemma="een" pos="PD">eene</w> <w lemma="huisvrouw" pos="NOU-C">'Uebersetzung</w> <w lemma="in" pos="ADP">in</w> <w lemma="het" pos="PD">het</w> <w lemma="duits" pos="NOU-C">Duitsch,</w> <w lemma="overkomen" pos="VRB">overgebriefd</w> <w lemma="hebben" pos="VRB">heb.</w> </p><p> </p><p> <w lemma="o" pos="INT">O</w> <w lemma="man" pos="NOU-C">Mann</w> <w lemma="van spall" pos="ADP">von</w> <w lemma="schelmen" pos="NOU-P">Schmerzen</w> <w lemma="met" pos="ADP">mit</w> <w lemma="de" pos="PD">der</w> <w lemma="donker van hoek" pos="NOU-P">Dornenkrohn'</w></p><p> <w lemma="o" pos="INT">O</w> <w lemma="blijks" pos="NOU-C">bleiches</w> <w lemma="blijdschap" pos="ADJ">blut'-Gesicht,</w> <w lemma="daags" pos="NOU-C">dass</w> <w lemma="in" pos="ADP">in</w> <w lemma="van der saen" pos="NOU-C">der</w> <w lemma="schout-bij-nacht" pos="NOU-C">Nacht</w></p><p> <w lemma="geven" pos="VRB">Glüht</w> <w lemma="met" pos="ADP">mit</w> <w lemma="een" pos="PD">ein'</w> <w lemma="groetenis" pos="NOU-C">grosser</w> <w lemma="blijder" pos="NOU-C">bleicher</w> <w lemma="flom" pos="NOU-C">flamm',</w> <w lemma="zijn" pos="VRB">wass</w> <w lemma="macht" pos="NOU-C">macht</w></p><p> <w lemma="bij" pos="ADP">Bei</w> <w lemma="engels" pos="NOU-P">endlos'</w> <w lemma="lijden" pos="NOU-P">Leiden</w> <w lemma="doch" pos="CON">doch</w> <w lemma="de" pos="PD">dein</w> <w lemma="bijl" pos="NOU-C">Bild</w> <w lemma="zo" pos="ADV">so</w> <w lemma="schoon" pos="ADJ">schön?</w> </p><p> </p><p> <pb/><w lemma="guavens" pos="ADJ">Glänzende</w> <w lemma="liefste" pos="NOU-P">Liebe</w> <w lemma="in" pos="ADP">in</w> <w lemma="in" pos="PD">ein</w> <w lemma="deurde" pos="NOU-C">Dampf</w> <w lemma="van" pos="ADP">von</w> <w lemma="johan" pos="NOU-P">Hohn,</w></p><p> <w lemma="wie" pos="PD">Wie</w> <w lemma="zijn" pos="VRB">sind</w> <w lemma="de" pos="PD">dein'</w> <w lemma="lijf" pos="VRB">Lippen</w> <w lemma="stil" pos="VRB">still,</w> <w lemma="wie" pos="PD">wie</w> <w lemma="hoeven" pos="VRB">ohne</w> <w lemma="klagen" pos="NOU-P">Klag?</w> </p><p> <w lemma="blijkst" pos="NOU-C">Blickst</w> <w lemma="niemender" pos="PD">nieder</w> <w lemma="de" pos="PD">du</w> <w lemma="voer" pos="NOU-C">vom</w> <w lemma="cornelis" pos="NOU-P">Kreuz,</w> <w lemma="wie" pos="PD">wie</w> <w lemma="lucht" pos="VRB">lächelst</w> <w lemma="de" pos="VRB">du</w> <w lemma="zo" pos="ADV">zo</w> <w lemma="millen" pos="ADJ">mild,</w></p><p> <w lemma="god" pos="NOU-P">Gott</w> <w lemma="van" pos="ADP">von</w> <w lemma="geenszoon" pos="NOU-P">Geheimniss',</w> <w lemma="god" pos="NOU-P">Gottes</w> <w lemma="liebheer" pos="NOU-P">liebster</w> <w lemma="soer" pos="NOU-P">Sohn!</w></p><p> </p><p> <w lemma="o" pos="INT">O</w> <w lemma="flam" pos="INT">flamm'</w> <w lemma="vol" pos="ADJ">voll</w> <w lemma="gulden" pos="NOU-C">Gluth</w> <w lemma="af" pos="ADP">auf</w> <w lemma="deze" pos="PD">dieser</w> <w lemma="klein" pos="VRB">kalten</w> <w lemma="welgemet" pos="VRB">Welt,</w></p><p> <w lemma="schrijven" pos="NOU-C">Schönheit</w> <w lemma="er" pos="ADV">der</w> <w lemma="van" pos="ADP">von</w> <w lemma="schermensen" pos="NOU-P">Schmerzen</w> <w lemma="afdoen" pos="ADP">auf</w> <w lemma="de" pos="PD">der</w> <w lemma="deelte" pos="ADJ">dunklen</w> <w lemma="unresolved" pos="ADJ">Erd'</w></p><p> <w lemma="welder" pos="NOU-P">Wunder</w> <w lemma="de" pos="PD">der</w> <w lemma="liefhebben" pos="ADJ">Liebe,</w> <w lemma="durig" pos="ADJ">durch</w> <w lemma="keizersgracht" pos="NOU-C">kein</w> <w lemma="mens" pos="NOU-C">Mensch</w> <w lemma="erkeren" pos="ADJ">erklärt.</w></p><p> </p><p> <w lemma="weg" pos="PD">Weh</w> <w lemma="mei" pos="NOU-C">mir!</w> <w lemma="ik" pos="PD">ich</w> <w lemma="horen" pos="VRB">hor'</w> <w lemma="allesbehande" pos="ADV">allzeit</w> <w lemma="de" pos="PD">den</w> <w lemma="trauwel" pos="NOU-C">traur'gn</w> <w lemma="vallen" pos="VRB">fall</w></p><p> <w lemma="de" pos="PD">Der</w> <w lemma="trouwen" pos="ADJ">Tropfen</w> <w lemma="blucht" pos="NOU-C">Bluth</w> <w lemma="en" pos="PD">und</w> <w lemma="bijzetten" pos="NOU-C">bis</w> <w lemma="zuidoorts" pos="ADJ">zum</w> <w lemma="morgen" pos="NOU-C">Morgen</w> <w lemma="zien" pos="VRB">sieht</w></p><p> <w lemma="er" pos="ADV">Er</w> <w lemma="micht" pos="ADJ">mich</w> <w lemma="aan" pos="ADP">an</w> <w lemma="met" pos="ADP">mit</w> <w lemma="groene kloker" pos="NOU-P">grosser</w> <w lemma="liefhebben" pos="NOU-P">Liebe</w> <w lemma="en" pos="CON">und</w> <w lemma="engels" pos="ADJ">endlos'</w> <w lemma="leiden" pos="VRB">Leid.</w> </p><p> </p><p> <w lemma="wat" pos="PD">Wat</w> <w lemma="vrijen" pos="NOU-C">vrij,</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="waard" pos="VRB">waar?</w> <w lemma="schelen" pos="VRB">Scheldt</w> <w lemma="gij" pos="PD">Gy</w> <w lemma="verhopen" pos="VRB">-?-</w> <w lemma="zijn" pos="VRB">Waren</w> <w lemma="de" pos="PD">de</w> <w lemma="duits" pos="ADJ">duitsche</w> <w lemma="uitreksenie" pos="NOU-C">uitdrukking</w> <w lemma="voor" pos="ADP">voor</w> <w lemma="mijn" pos="PD"><hi rend="underline"><w lemma="aan" pos="PD">Ai</w> my</hi>!</w> <w lemma="en" pos="RES">-</w> <w lemma="mijn" pos="PD">Mijn</w> <w lemma="hollands" pos="ADJ">Hollandsch</w> <w lemma="beginnen" pos="VRB">begint</w> <w lemma="ik" pos="PD">my</w> <w lemma="te" pos="ADP">te</w> <w lemma="vergeten" pos="VRB">vergeten.</w> <w lemma="unresolved" pos="CON">-</w> <w lemma="ik" pos="PD">Ik</w> <w lemma="maken" pos="VRB">maak</w> <w lemma="somwijs" pos="ADV">soms</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="verzien" pos="VRB">verzen,</w> <w lemma="zoals" pos="CON">zooals</w> <w lemma="gij" pos="PD">Gij</w> <w lemma="weten" pos="VRB">weet.</w> <w lemma="waarom" pos="ADV">Waarom?</w> <w lemma="wijl" pos="CON">Wijl</w> <w lemma="ik" pos="PD">ik</w> <w lemma="er" pos="ADV">er</w> <w lemma="plezier" pos="ADJ">pleizier</w> <w lemma="aan" pos="ADV">aan</w> <w lemma="hebben" pos="VRB">heb.</w> <w lemma="verleden" pos="ADJ">Verleden</w> <w lemma="winter" pos="NOU-C">winter</w> <w lemma="zijn" pos="VRB">ben</w> <w lemma="ik" pos="PD">ik</w> <w lemma="unresolved" pos="RES">[Mr.</w> <w lemma="unresolved" pos="RES">st.?]</w> <w lemma="worden" pos="VRB">geworden</w> <w lemma="bij" pos="ADP">bij</w> <w lemma="ons" pos="PD">onze</w> <w lemma="louw" pos="NOU-C">Loge,</w> <w lemma="en" pos="CON">en</w> <w lemma="hebben" pos="VRB">heb</w> <w lemma="toen" pos="CON">toen</w> <w lemma="iets" pos="PD">iets</w> <w lemma="veroorzaken" pos="VRB">voorgedragen,</w> <w lemma="waarvoor" pos="ADV">waarvoor</w> <w lemma="ik" pos="PD">ik</w> <w lemma="veel" pos="PD">veel</w> <w lemma="lof" pos="NOU-C">lof</w> <w lemma="in" pos="ADP">in</w> <w lemma="oogst" pos="NOU-C">oogste.</w> <w lemma="in" pos="ADP">In</w> <w lemma="de" pos="PD">de</w> <w lemma="eerst" pos="NUM">eerste</w> <w lemma="aflegening" pos="NOU-C">afdeeling</w> <w lemma="vierde" pos="VRB">vierde</w> <w lemma="ik" pos="PD">ik</w> <w lemma="het" pos="PD">het</w> <w lemma="licht" pos="NOU-C">Licht,</w> <w lemma="geven" pos="VRB">gaf</w> <w lemma="ik" pos="PD">ik</w> <w lemma="mijn" pos="PD">mijn</w> <w lemma="begrijpen" pos="NOU-C">begrip</w> <w lemma="van" pos="ADP">van</w> <w lemma="het" pos="PD">'t</w> <w lemma="missterrie" pos="NOU-C">Mysterie,</w> <w lemma="god" pos="NOU-C">(God?),</w> <w lemma="waarin" pos="ADV">waarin</w> <w lemma="wij" pos="PD">wij</w> <w lemma="leven" pos="NOU-C">leven,</w> <w lemma="een" pos="PD">eene</w> <w lemma="eeuwigheid" pos="NOU-C">eenheid</w> <w lemma="van" pos="ADP">van</w> <w lemma="stof" pos="NOU-C">stof</w> <w lemma="en" pos="CON">en</w> <w lemma="kracht" pos="NOU-C">kracht</w> <w lemma="et cetera" pos="NOU-P">etc.;</w> <w lemma="de" pos="PD">de</w> <w lemma="tweede" pos="NUM">tweede</w> <w lemma="zijn" pos="VRB">was</w> <w lemma="voor" pos="ADP">voor</w> <w lemma="de" pos="PD">den</w> <w lemma="voorsteen" pos="NOU-C">Voorzitter;</w> <w lemma="in" pos="ADP">in</w> <w lemma="de" pos="PD">de</w> <w lemma="derde" pos="NUM">derde</w> <w lemma="afkomen" pos="VRB">afd.</w> <w lemma="geven" pos="VRB">gaf</w> <w lemma="ik" pos="PD">ik</w> <w lemma="mijn" pos="PD">mijne</w> <w lemma="openbaring" pos="NOU-C">opvatting</w> <w lemma="de" pos="PD">der</w> <w lemma="haven" pos="NOU-C">'Mauerei';</w> <w lemma="ofschoon" pos="CON">Ofschoon</w> <w lemma="ik" pos="PD">ik</w> <w lemma="verklaren" pos="VRB">verklaarde,</w> <w lemma="dat" pos="CON">dat</w> <w lemma="ik" pos="PD">ik</w> <w lemma="geen" pos="PD">geene</w> <w lemma="waard" pos="ADJ">waarde</w> <w lemma="heet" pos="NOU-C">hechte</w> <w lemma="aan" pos="ADP">aan</w> <w lemma="de" pos="PD">de</w> <w lemma="form" pos="NOU-C">formules</w> <w lemma="dienstwillig" pos="PD">d.</w> <w lemma="mandje" pos="NOU-C">Mauerei,</w> <w lemma="daar" pos="ADV">daar</w> <w lemma="mijn" pos="PD">mijn</w> <w lemma="liggen" pos="VRB">Loge</w> <w lemma="de" pos="PD">de</w> <w lemma="wereld" pos="NOU-C">wereld</w> <w lemma="zijn" pos="VRB">was</w> <w lemma="et cetera" pos="ADV">etc.</w> <w lemma="zijn" pos="VRB">was</w> <w lemma="men" pos="PD">men</w> <w lemma="ervan" pos="ADV">er</w> <w lemma="toch" pos="ADV">toch</w> <w lemma="daarmee" pos="ADV">meê</w> <w lemma="innemen" pos="VRB">ingenomen.</w> <w lemma="al" pos="PD">Alles</w> <w lemma="rok" pos="ADV">rook</w> <w lemma="keters" pos="RES">kettersch.</w> <w lemma="unresolved" pos="RES">-</w> <w lemma="zij" pos="PD">Zij</w> <w lemma="vinden" pos="VRB">vonden</w> <w lemma="het" pos="CON">'t</w> <w lemma="wel" pos="ADV">wel</w> <w lemma="moei" pos="NOU-C">mooi,</w> <w lemma="willen" pos="CON">wijl</w> <w lemma="ik" pos="PD">ik</w> <w lemma="een" pos="PD">een</w> <w lemma="consumblief" pos="NOU-C">consul</w> <w lemma="zijn" pos="VRB">ben.</w> <w lemma="de" pos="PD">De</w> <w lemma="stand" pos="NOU-C">stand</w> <w lemma="en" pos="CON">en</w> <w lemma="materig" pos="ADJ">maatschappelijke</w> <w lemma="postje" pos="NOU-C">positie</w> <w lemma="hebben" pos="VRB">heeft</w> <w lemma="machtig" pos="ADJ">machtig</w> <w lemma="veel" pos="PD">veel</w> <w lemma="inloden" pos="NOU-C">invloed</w> <w lemma="op" pos="ADV">op</w> <w lemma="het" pos="PD">'t</w> <w lemma="oordeel" pos="NOU-C">oordeel</w> <w lemma="de" pos="PD">der</w> <w lemma="mens" pos="NOU-C">menschen,</w> <w lemma="zodra" pos="CON">zooals</w> <w lemma="wij" pos="PD">ons</w> <w lemma="spercheren" pos="VRB">spreekwoord:</w> <w lemma="edele" pos="ADJ">'de</w> <w lemma="rok" pos="NOU-C">rok</w> <w lemma="maken" pos="VRB">maakt</w> <w lemma="de" pos="PD">den</w> <w lemma="mens" pos="NOU-C">mensch'</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="zeggen" pos="VRB">zegt.</w> <w lemma="die" pos="RES">-</w> <w lemma="de" pos="PD">De</w> <w lemma="heer" pos="NOU-C">Heeren</w> <w lemma="zijn" pos="VRB">zijn</w> <w lemma="anders" pos="ADJ">anders</w> <w lemma="erg" pos="ADJ">erg</w> <w lemma="contant" pos="NOU-C">conservatief;</w> <w lemma="zij" pos="PD">ze</w> <w lemma="houden" pos="VRB">houden</w> <w lemma="vast" pos="ADV">vast,</w> <w lemma="wat" pos="PD">wat</w> <w lemma="zij" pos="PD">ze</w> <w lemma="hebben" pos="VRB">hebben,</w> <w lemma="en" pos="CON">en</w> <w lemma="zien" pos="VRB">zien</w> <pb/><w lemma="goed" pos="VRB">goed</w> <w lemma="uitvaren" pos="VRB">uit,</w> <w lemma="hoe" pos="ADV">hoe</w> <w lemma="de" pos="PD">de</w> <w lemma="wind" pos="NOU-C">wind</w> <w lemma="waaien" pos="VRB">waait:</w> <w lemma="praten" pos="VRB">praten</w> <w lemma="bij" pos="ADP">bij</w> <w lemma="een" pos="PD">een</w> <w lemma="goed" pos="ADJ">goed</w> <w lemma="glas" pos="NOU-C">glas</w> <w lemma="wijn" pos="NOU-C">wijn</w> <w lemma="en" pos="CON">en</w> <w lemma="een" pos="PD">eene</w> <w lemma="fijn" pos="ADJ">fijne</w> <w lemma="sint maria a aacte c" pos="ADJ">sigaar</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="wel" pos="ADV">wel</w> <w lemma="eens" pos="ADV">eens</w> <w lemma="over" pos="ADP">over</w> <w lemma="de" pos="PD">de</w> <w lemma="verbeerdening" pos="NOU-C">verbetering</w> <w lemma="van" pos="ADP">van</w> <w lemma="het" pos="PD">'t</w> <w lemma="lotelijk" pos="NOU-C">lot</w> <w lemma="de" pos="PD">der</w> <w lemma="arm" pos="NOU-C">armen,</w> <w lemma="die" pos="PD">die</w> <w lemma="zijn" pos="VRB">zij,</w> <w lemma="als" pos="CON">als</w> <w lemma="deze" pos="PD">deze</w> <w lemma="er" pos="ADV">er</w> <w lemma="zelf" pos="PD">zelf</w> <w lemma="daarover" pos="ADV">over</w> <w lemma="denken" pos="VRB">denken</w> <w lemma="en" pos="CON">en</w> <w lemma="spreken" pos="VRB">spreken</w> <w lemma="kant" pos="NOU-C">canaille</w> <w lemma="noemen" pos="VRB">noemen;</w> <w lemma="te" pos="CON">'t</w> <w lemma="zijn" pos="PD">zijn</w> <w lemma="prachtig" pos="ADJ">prachtige</w> <w lemma="mens" pos="NOU-C">menschen</w> <w lemma="en" pos="CON">en</w> <w lemma="goed" pos="ADJ">goede</w> <w lemma="stark" pos="NOU-C">Staatsburgers,</w> <w lemma="die" pos="PD">die</w> <w lemma="god" pos="NOU-P">God</w> <w lemma="en" pos="CON">en</w> <w lemma="de" pos="PD">den</w> <w lemma="keizer" pos="NOU-C">Keizer</w> <w lemma="geven" pos="VRB">geven,</w> <w lemma="wat" pos="PD">wat</w> <w lemma="zij" pos="PD">ze</w> <w lemma="toekomen" pos="VRB">toekomt</w> <w lemma="en" pos="CON">en</w> <w lemma="daarom" pos="ADV">daarom</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="zeker" pos="ADJ">zeker</w> <w lemma="al" pos="PD">allen</w> <w lemma="in" pos="ADP">in</w> <w lemma="de" pos="PD">den</w> <w lemma="hemel" pos="NOU-C">Hemel</w> <w lemma="komen" pos="VRB">komen,</w> <w lemma="ofschoon" pos="CON">ofschoon</w> <w lemma="zij" pos="PD">ze</w> <w lemma="bij" pos="ADP">bij</w> <w lemma="de" pos="PD">de</w> <w lemma="intreuring" pos="NOU-C">invoering</w> <w lemma="er" pos="ADV">der</w> <w lemma="weten" pos="VRB">Wet</w> <w lemma="op" pos="ADV">op</w> <w lemma="het" pos="PD">'t</w> <w lemma="inkomen" pos="NOU-C">inkomen</w> <w lemma="enkland" pos="NOU-C">eclatant</w> <w lemma="bewijzen" pos="VRB">bewezen</w> <w lemma="hebben" pos="VRB">hebben,</w> <w lemma="dat" pos="PD">dat</w> <w lemma="provision" pos="NOU-C">Proudhon'</w> <w lemma="gelijk" pos="ADV">gelijk</w> <w lemma="hebben" pos="VRB">had,</w> <w lemma="als" pos="CON">als</w> <w lemma="hij" pos="PD">hij</w> <w lemma="eigendom" pos="NOU-C">'eigendom</w> <w lemma="ditstaal" pos="NOU-C">diefstal'</w> <w lemma="noemen" pos="VRB">noemde.</w> <w lemma="unresolved" pos="RES">[60?]</w> <w lemma="missivoor" pos="NOU-C">miljoen</w> <w lemma="brengen" pos="VRB">bracht</w> <w lemma="de" pos="PD">de</w> <w lemma="nieuw" pos="ADJ">nieuwe</w> <w lemma="weten" pos="VRB">wet</w> <w lemma="meer" pos="ADV">meer</w> <w lemma="opstaan" pos="VRB">op,</w> <w lemma="dan" pos="ADV">dan</w> <w lemma="vrouw" pos="ADJ">vroeger,</w> <w lemma="hebben" pos="VRB">hebben</w> <w lemma="die" pos="PD">die</w> <w lemma="heer" pos="NOU-C">Heeren</w> <w lemma="dus" pos="ADV">dus</w> <w lemma="ue." pos="NUM">-</w> <w lemma="huisloven" pos="NOU-C">'gestolen',</w> <w lemma="willen" pos="VRB">wil</w> <w lemma="ik" pos="PD">ik</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="zeggen" pos="VRB">zeggen,</w> <w lemma="die" pos="PD">-</w> <w lemma="te" pos="ADV">te</w> <w lemma="mijn" pos="PD">min</w> <w lemma="betalen" pos="VRB">betaald.</w> <w lemma="ue." pos="RES">-</w> <w lemma="unresolved" pos="RES">.</w> <w lemma="unresolved" pos="PD">-</w> <w lemma="zullen" pos="VRB">Stelen</w> <w lemma="zijn" pos="VRB">is</w> <w lemma="een" pos="PD">een</w> <w lemma="te" pos="ADP">te</w> <w lemma="bark" pos="ADJ">barsch</w> <w lemma="woord" pos="NOU-C">woord</w> <w lemma="voor" pos="ADP">voor</w> <w lemma="deftig" pos="ADJ">deftige</w> <w lemma="verrijk" pos="ADJ">rijke</w> <w lemma="lieden" pos="NOU-C">lui..</w> <w lemma="ue." pos="RES">-</w> <w lemma="genoeg" pos="PD">Genoeg</w> <w lemma="unresolved" pos="RES">-</w> <w lemma="zo" pos="ADV">zoo</w> <w lemma="schijnen" pos="VRB">schijnen</w> <w lemma="zij" pos="PD">ze</w> <w lemma="overal" pos="ADV">overal</w> <w lemma="te" pos="ADP">te</w> <w lemma="zijn" pos="VRB">zijn.</w> <w lemma="ue." pos="VRB">-</w> </p><p> <w lemma="kattenhoeve" pos="NOU-P">Kathi</w> <w lemma="zijn" pos="VRB">is</w> <w lemma="thans" pos="ADV">thans</w> <w lemma="in" pos="ADP">in</w> <w lemma="de" pos="PD">de</w> <w lemma="stad" pos="NOU-C">stad;</w> <w lemma="zijn" pos="PD">zij</w> <w lemma="zoeken" pos="VRB">zoekt</w> <w lemma="winker" pos="NOU-C">werk,</w> <w lemma="een" pos="PD">eene</w> <w lemma="betrekken" pos="NOU-C">betrekking,</w> <w lemma="de" pos="PD">-</w> <w lemma="kunnen" pos="VRB">kan</w> <w lemma="echter" pos="ADV">echter</w> <w lemma="niets" pos="PD">niets</w> <w lemma="vinden" pos="VRB">vinden.</w> <w lemma="waar" pos="ADV">Waar</w> <w lemma="een" pos="PD">een</w> <w lemma="nodig" pos="ADJ">noodig</w> <w lemma="zijn" pos="VRB">is,</w> <w lemma="bidden" pos="VRB">bieden</w> <w lemma="ziekte" pos="NOU-C">zich,</w> <w lemma="vijftig" pos="NUM">vijftig,</w> <w lemma="honderd" pos="NOU-C">honderd,</w> <w lemma="daaraan" pos="ADV">aan.</w> <w lemma="de" pos="RES">-</w> <w lemma="wat" pos="PD">Wat</w> <w lemma="daaruit" pos="ADV">daaruit</w> <w lemma="worden" pos="VRB">worden</w> <w lemma="zullen" pos="VRB">zal,</w> <w lemma="weten" pos="VRB">weet</w> <w lemma="ik" pos="PD">ik</w> <w lemma="niet" pos="ADV">niet.</w> <w lemma="ue." pos="NUM">-</w> </p><p> <w lemma="hoe" pos="ADV">Hoe</w> <w lemma="gaan" pos="VRB">gaat</w> <w lemma="het" pos="PD">het</w> <w lemma="u" pos="PD">U</w> <w lemma="en" pos="CON">en</w> <w lemma="uw" pos="PD">Uwe</w> <w lemma="kind" pos="NOU-C">kinderen.</w> <w lemma="toch" pos="ADV">Toch</w> <w lemma="wel" pos="ADV">wel</w> <w lemma="uiteinde" pos="VRB">-?-</w> <w lemma="liggen" pos="VRB">Leg</w> <w lemma="zij" pos="PD">ze</w> <w lemma="nog" pos="ADV">nog</w> <w lemma="maar" pos="ADV">maar</w> <w lemma="weer" pos="ADV">weer</w> <w lemma="eens" pos="ADV">eens</w> <w lemma="op" pos="ADP">op</w> <w lemma="hun" pos="PD">hun</w> <w lemma="rugaard" pos="NOU-C">rug,</w> <w lemma="om" pos="CON">om</w> <w lemma="enig" pos="PD">eenige</w> <w lemma="letter" pos="NOU-C">letteren</w> <w lemma="te" pos="ADP">te</w> <w lemma="schrijven" pos="VRB">schrijven.</w> <w lemma="ue." pos="PD">-</w> <w lemma="nog" pos="ADV">Nog</w> <w lemma="iets" pos="PD">iets.</w> <w lemma="ue." pos="PD">-</w> <w lemma="stuur" pos="NOU-C">Stuur</w> <w lemma="mee" pos="ADV">me</w> <w lemma="toch" pos="ADV">toch</w> <w lemma="een" pos="PD">eene</w> <w lemma="facotie" pos="NOU-C">fotografie</w> <w lemma="van" pos="ADP">van</w> <w lemma="jij" pos="PD">je</w> <w lemma="man" pos="NOU-C">man.</w> <w lemma="ik" pos="PD">Ik</w> <w lemma="mogen" pos="VRB">mocht</w> <w lemma="hij" pos="PD">hem</w> <w lemma="hebben" pos="VRB">hebben,</w> <w lemma="voor" pos="ADP">voor</w> <w lemma="de" pos="PD">de</w> <w lemma="heel" pos="ADJ">heele</w> <w lemma="wereld" pos="NOU-C">wereld</w> <w lemma="hij" pos="PD">hem</w> <w lemma="hebben" pos="VRB">heeft.</w> <w lemma="u" pos="PD">U</w> <w lemma="vinden" pos="VRB">vindt</w> <w lemma="dit" pos="PD">dit</w> <w lemma="verlangen" pos="NOU-C">verlangen</w> <w lemma="toch" pos="ADV">toch</w> <w lemma="natuurlijk" pos="ADJ">natuurlijk</w> <w lemma="en" pos="CON">en</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="onbescheiden" pos="ADJ">onbescheiden,</w> <w lemma="hopen" pos="VRB">hoop</w> <w lemma="ik" pos="PD">ik.</w> <w lemma="voegen" pos="VRB">Voeg</w> <w lemma="jij" pos="PD">je</w> <w lemma="zelf" pos="PD">zelf</w> <w lemma="er" pos="ADV">er</w> <w lemma="dan" pos="ADV">dan</w> <w lemma="maar" pos="ADV">maar</w> <w lemma="bij" pos="ADP">bij.</w> <w lemma="mijn" pos="PD">Mijn</w> <w lemma="vrouw" pos="NOU-C">vrouw</w> <w lemma="zullen" pos="VRB">zal</w> <w lemma="er" pos="ADV">er</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="erg" pos="ADJ">erg</w> <w lemma="blij" pos="ADJ">blij</w> <w lemma="over" pos="ADV">over</w> <w lemma="zijn" pos="VRB">zijn,</w> <w lemma="als" pos="CON">als</w> <w lemma="ik" pos="PD">ik</w> <w lemma="met" pos="ADP">met</w> <w lemma="uw" pos="PD">Uw</w> <w lemma="beide" pos="PD">beiden</w> <w lemma="aankomen" pos="VRB">aankom.</w></p><p> </p><p> <w lemma="hartelijk" pos="ADV">Hartelijke</w> <w lemma="groeten" pos="VRB">groeten,</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="aan" pos="ADP">aan</w> <w lemma="uw" pos="PD">Uw</w> <w lemma="man" pos="NOU-C">man</w></p><p> <w lemma="het" pos="ADP">TT.</w></p><p> <w lemma="johannes" pos="NOU-P">Johs.</w> <w lemma="advies" pos="NOU-P">Addens</w></p><p> </p><p> <w lemma="bij" pos="ADP">Bij</w> <w lemma="mijn" pos="PD">mijn</w> <w lemma="adamino" pos="NOU-C">adr.</w> <w lemma="behoeven" pos="VRB">behoef</w> <w lemma="jij" pos="PD">je</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="schrijven" pos="VRB">Skilnaden</w> <w lemma="of" pos="CON">of</w> <w lemma="bruijnberg" pos="NOU-C">Brunsparken</w> <w lemma="te" pos="ADP">te</w> <w lemma="zetten" pos="VRB">zetten;</w> <w lemma="de" pos="PD">-</w> <w lemma="een" pos="PD">een</w> <w lemma="handeraak" pos="NOU-C">handelszaak</w> <w lemma="hebben" pos="VRB">heb</w> <w lemma="ik" pos="PD">ik</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="meer" pos="ADV">meer,</w> <w lemma="te" pos="ADP">te</w> <w lemma="schrijven" pos="VRB">Skilnaden</w> <w lemma="staan" pos="VRB">staat</w> <w lemma="nu" pos="ADV">nu</w> <w lemma="een" pos="PD">een</w> <w lemma="millesorant" pos="ADJ">millioenenhuis.</w></p><p> </p><p> <w lemma="ik" pos="PD">Ik</w> <w lemma="lezen" pos="VRB">lees</w> <w lemma="een" pos="PD">eene</w> <w lemma="krock" pos="NOU-C">Kritiek</w> <w lemma="de" pos="PD">der</w> <w lemma="moeder" pos="NOU-C">moderne</w> <w lemma="teergeliefde" pos="NOU-C">Theosophie</w> <w lemma="van" pos="ADP">van</w> <w lemma="gerritseling" pos="NOU-P">G.</w> <w lemma="af" pos="ADP">af</w> <w lemma="gerasma" pos="ADJ">Geiersam:</w> <w lemma="moeder" pos="NOU-C">Modern</w> <w lemma="unresolved" pos="NOU-P">[xxxxxxxxxxx]'</w></p><p> </p><p> <w lemma="zijn" pos="VRB">Is</w> <w lemma="uw" pos="PD">Uw</w> <w lemma="man" pos="NOU-C">man</w> <w lemma="geen" pos="PD">geen</w> <w lemma="hand" pos="NOU-C">Hagenaar;</w> <w lemma="daar" pos="ADV">daar</w> <w lemma="wonen" pos="VRB">woonde</w> <w lemma="vroeger" pos="ADV">vroeger</w> <w lemma="een" pos="PD">een</w> <w lemma="domineer" pos="NOU-C">Dr.</w> <w lemma="verwijl" pos="ADJ">Verwey.</w></p><p> <pb/></p><p> <pb/> </p></body></text></TEI>
\ No newline at end of file
+<body><head resp="editor"><w lemma="advies" pos="NOU-P">Addens,</w> <w lemma="johannes" pos="NOU-P">Johannes</w> <w lemma="aan" pos="ADP">aan</w> <w lemma="vloot" pos="NOU-P">Vloten,</w> <w lemma="catharina" pos="NOU-P">Katharina</w> <w lemma="van" pos="ADP">van</w> <w lemma="van der meije" pos="PD">|</w> <w lemma="zestienhonderdvijfen" pos="NUM">__DATE_IGNORED_BY_TEST__</w></head><p> <pb/><w lemma="held worderijs ?" pos="NOU-P">Helsingfors,</w> <w lemma="de" pos="PD">den</w> <w lemma="vijftiende" pos="NUM">15</w> <w lemma="juli" pos="NOU-C">Juli</w> <w lemma="zestienhonderdtweeën" pos="NUM">1892</w></p><p> </p><p> <w lemma="best" pos="ADJ">Beste</w> <w lemma="mevrouw" pos="NOU-C">Mevr.</w> <w lemma="kritijnk" pos="NOU-P">Kitty</w> <w lemma="verwerken" pos="VRB">Verwey-v.</w> <w lemma="vloot" pos="NOU-P">Vloten.</w></p><p> </p><p> <w lemma="het" pos="ADV">'t</w> <w lemma="zijn" pos="VRB">Was</w> <w lemma="zeer" pos="ADV">zeer</w> <w lemma="lief" pos="ADJ">lief</w> <w lemma="van" pos="ADP">van</w> <w lemma="u" pos="PD">U</w> <w lemma="ik" pos="PD">my</w> <w lemma="die" pos="PD">die</w> <w lemma="boek" pos="NOU-C">boeken</w> <w lemma="te" pos="ADP">te</w> <w lemma="sturen" pos="VRB">sturen,</w> <w lemma="zeer" pos="ADV">zeer</w> <w lemma="lief" pos="ADJ">lief.</w> <w lemma="dank" pos="VRB">Dank</w> <w lemma="best" pos="ADJ">beste</w> <w lemma="kitaaltje" pos="NOU-C">Kitty,</w> <w lemma="mevrouw" pos="NOU-C">Mevrouw</w> <w lemma="willen" pos="VRB">wilde</w> <w lemma="ik" pos="PD">ik</w> <w lemma="zeggen" pos="NOU-C">zeggen.</w> <w lemma="krittentie" pos="NOU-P">Kitty</w> <w lemma="vinden" pos="VRB">vind</w> <w lemma="ik" pos="PD">ik</w> <w lemma="moeten" pos="VRB">mooier,</w> <w lemma="mevrouw" pos="NOU-C">Mevrouw</w> <w lemma="zijn" pos="VRB">is</w> <w lemma="te" pos="ADP">te</w> <w lemma="deugdriet" pos="NUM">deftig,</w> <w lemma="beteren" pos="VRB">beteekent:</w> <w lemma="komen" pos="VRB">Kom</w> <w lemma="mee" pos="ADV">me</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="te" pos="ADP">te</w> <w lemma="na" pos="ADV">na.</w> <w lemma="ue." pos="NUM">-</w> <w lemma="met" pos="ADP">Met</w> <w lemma="het" pos="PD">het</w> <w lemma="oordeel" pos="NOU-C">oordeel</w> <w lemma="de" pos="PD">der</w> <w lemma="schelmer" pos="NOU-P">Schiedammer</w> <w lemma="stellen" pos="VRB">stem</w> <w lemma="ik" pos="PD">ik</w> <w lemma="volkomen" pos="ADV">volkomen</w> <w lemma="in" pos="ADP">in.</w> <w lemma="hart" pos="ADJ">'De</w> <w lemma="joden" pos="NOU-C">Joden'</w> <w lemma="zijn" pos="VRB">zijn</w> <w lemma="schoon" pos="CON">schoon,</w> <w lemma="onvreeddelijk" pos="ADV">onovertreffelijk</w> <w lemma="schoon" pos="ADJ">schoon.</w> <w lemma="die" pos="CON">-</w> <w lemma="de" pos="PD">De</w> <w lemma="belracht" pos="NOU-C">beeldenpracht</w> <w lemma="zijn" pos="VRB">is</w> <w lemma="heerlijk" pos="ADV">heerlijk,</w> <w lemma="de" pos="PD">de</w> <w lemma="verhalen" pos="VRB">verhalen</w> <w lemma="zijn" pos="PD">zijn</w> <w lemma="natuurlijk" pos="ADJ">naif-kinderlijk,</w> <w lemma="tinnen" pos="NOU-C">tintelen</w> <w lemma="van" pos="ADP">van</w> <w lemma="gevoel" pos="NOU-C">gevoel.</w> <w lemma="die" pos="VRB">-</w> <w lemma="dat" pos="CON">Dat</w> <w lemma="men" pos="PD">men</w> <w lemma="eraf" pos="ADV">hierby</w> <w lemma="liggen" pos="VRB">lachen</w> <w lemma="kunnen" pos="VRB">kon,</w> <w lemma="zoals" pos="CON">zooals</w> <w lemma="gij" pos="PD">Gij</w> <w lemma="schrijven" pos="VRB">schrijft,</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="de" pos="PD">de</w> <w lemma="schelmer" pos="NOU-P">Schiedammer</w> <w lemma="zeggen" pos="VRB">zegt</w> <w lemma="allerheil" pos="CON">het,</w> <w lemma="zijn" pos="VRB">is</w> <w lemma="ik" pos="PD">mij</w> <w lemma="onbepreken" pos="ADJ">onbegrijpelijk.</w> <w lemma="unresolved" pos="RES">-</w> <w lemma="waarom" pos="ADV">Waarom</w> <w lemma="laten" pos="VRB">lachtte</w> <w lemma="het" pos="PD">'t</w> <w lemma="publiek" pos="NOU-C">publiek</w> <w lemma="doen" pos="VRB">-?-</w> <w lemma="de" pos="PD">De</w> <w lemma="verzet" pos="NOU-C">verzen</w> <w lemma="geven" pos="VRB">geven</w> <w lemma="er" pos="ADV">er</w> <w lemma="toch" pos="ADV">toch</w> <w lemma="geen" pos="PD">geene</w> <w lemma="aanleiding" pos="NOU-C">aanleiding</w> <w lemma="toe" pos="ADV">toe</w> <w lemma="en" pos="CON">en</w> <w lemma="daar" pos="ADV">daar</w> <w lemma="verzeten" pos="VRB">verzen</w> <w lemma="en" pos="CON">en</w> <w lemma="bedende" pos="ADP">beelden</w> <w lemma="zeker" pos="ADJ">zeker</w> <w lemma="elkaar" pos="PD">elkaâr</w> <w lemma="waardig" pos="ADJ">waardig</w> <w lemma="dekenken" pos="NOU-C">dekken</w> <w lemma="zijn" pos="VRB">waren,</w> <w lemma="bestaan" pos="VRB">bestond</w> <w lemma="er" pos="ADV">er</w> <w lemma="geen" pos="PD">geen</w> <w lemma="grond" pos="NOU-C">grond</w> <w lemma="iets" pos="PD">iets</w> <w lemma="belijken" pos="ADJ">belachelyk</w> <w lemma="te" pos="ADP">te</w> <w lemma="vinden" pos="VRB">vinden.</w> <w lemma="ue." pos="RES">-</w> <w lemma="unresolved" pos="ADV">-</w> <w lemma="wat" pos="PD">Wat</w> <w lemma="plaats" pos="NOU-C">Plox</w> <w lemma="over" pos="ADP">over</w> <w lemma="de" pos="PD">de</w> <w lemma="taal" pos="NOU-C">taal</w> <w lemma="zeggen" pos="VRB">zegt,</w> <w lemma="steed" pos="VRB">stem</w> <w lemma="ik" pos="PD">ik</w> <w lemma="het" pos="PD">ten</w> <w lemma="deel" pos="NOU-C">deele</w> <w lemma="toezenden" pos="VRB">toe.</w> <w lemma="ue." pos="PD">-</w> <w lemma="ook" pos="ADV">Ook</w> <w lemma="ik" pos="PD">ik</w> <w lemma="zullen" pos="VRB">zou</w> <w lemma="het" pos="PD">'t</w> <w lemma="beter" pos="ADV">beter</w> <w lemma="achten" pos="VRB">achten,</w> <w lemma="als" pos="CON">als</w> <w lemma="uw" pos="PD">Uw</w> <w lemma="man" pos="NOU-C">man</w> <w lemma="gewoon" pos="VRB">gewoon</w> <w lemma="kussen" pos="VRB">gekuischt</w> <w lemma="hollands" pos="ADJ">Hollands</w> <w lemma="willen" pos="VRB">wou</w> <w lemma="schrijven" pos="VRB">schrijven,</w> <w lemma="zoals" pos="CON">zooals</w> <w lemma="de" pos="PD">de</w> <w lemma="genezent" pos="NOU-C">Genestett</w> <w lemma="en" pos="CON">en</w> <w lemma="ander" pos="PD">anderen,</w> <w lemma="die" pos="PD">die</w> <w lemma="er" pos="ADV">er</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="iets" pos="PD">iets</w> <w lemma="daarvan" pos="ADV">van</w> <w lemma="weten" pos="VRB">wisten,</w> <w lemma="overlijden" pos="VRB">deden.</w> <w lemma="de" pos="PD">De</w> <w lemma="schoolheid" pos="NOU-C">schoonheid</w> <w lemma="zijn" pos="PD">zijner</w> <w lemma="verzetten" pos="NOU-C">verzen</w> <w lemma="behoeven" pos="VRB">behoefde</w> <w lemma="daardoor" pos="ADV">daardoor</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="te" pos="ADP">te</w> <w lemma="lijden" pos="VRB">lyden,</w> <w lemma="en" pos="CON">en</w> <w lemma="hij" pos="PD">hij</w> <w lemma="zullen" pos="VRB">zou</w> <w lemma="meer" pos="PD">meer</w> <w lemma="les" pos="NOU-C">lezers</w> <w lemma="vinden" pos="VRB">vinden.</w> <w lemma="tegen" pos="ADP">Tegen</w> <w lemma="de" pos="PD">de</w> <w lemma="zonderling" pos="ADJ">zonderlinge</w> <w lemma="afbreking" pos="NOU-C">afbreking</w> <w lemma="van" pos="ADP">van</w> <w lemma="woord" pos="NOU-C">woorden</w> <w lemma="getrouwd" pos="ADJ">ge-scepterde</w> <w lemma="familia" pos="NOU-C">farao.</w> <w lemma="et cetera" pos="ADV">etc.</w><pb/><w lemma="bij" pos="ADP">bij</w> <w lemma="deze" pos="PD">deze</w> <w lemma="soort" pos="NOU-C">soort</w> <w lemma="daarvan" pos="ADV">van</w> <w lemma="verzien" pos="VRB">verzen,</w> <w lemma="hebben" pos="VRB">heb</w> <w lemma="ik" pos="PD">ik</w> <w lemma="geen" pos="PD">geen</w> <w lemma="bezorgen" pos="VRB">bezwaar,</w> <w lemma="enins" pos="PD">evenmin</w> <w lemma="als" pos="CON">als</w> <w lemma="tegen" pos="ADP">tegen</w> <w lemma="de" pos="PD">de</w> <w lemma="wellang" pos="NOU-C">weglating</w> <w lemma="de" pos="PD">der</w> <w lemma="leiden" pos="VRB">lidwoorden:</w></p><p> </p><p> <w lemma="hart" pos="NOU-P">'Binnen</w> <w lemma="in" pos="ADP">in</w> <w lemma="unresolved" pos="NOU-C">zaal</w> <w lemma="van" pos="ADP">van</w> <w lemma="cheid" pos="NOU-C">cederhout.'</w></p><p> </p><p> <w lemma="de" pos="PD">De</w> <w lemma="taal" pos="NOU-C">taal</w> <w lemma="zijn" pos="VRB">is</w> <w lemma="zo" pos="ADV">zoo</w> <w lemma="terusten" pos="VRB">teer,</w> <w lemma="zo" pos="ADV">zoo</w> <w lemma="vinden" pos="VRB">fijn,</w> <w lemma="zo" pos="ADV">zoo</w> <w lemma="evers" pos="ADV">etherisch</w> <w lemma="dat" pos="CON">dat</w> <w lemma="zij" pos="PD">ze</w> <w lemma="toch" pos="ADV">toch</w> <w lemma="nauw" pos="ADV">nauw</w> <w lemma="of" pos="CON">of</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="uitstrekken" pos="VRB">uitgesproken</w> <w lemma="worden" pos="VRB">worden.</w> <w lemma="willen" pos="VRB">Wil</w> <w lemma="men" pos="PD">men</w> <w lemma="zij" pos="PD">ze</w> <w lemma="zien" pos="VRB">zien,</w> <w lemma="dan" pos="ADV">dan</w> <w lemma="zullen" pos="VRB">zou</w> <w lemma="ik" pos="PD">ik</w> <w lemma="schrijven" pos="VRB">schrijven:</w></p><p> </p><p> <w lemma="binnenkomen" pos="ADV">Binnen</w> <w lemma="in" pos="ADP">in</w><hi rend="superscript"><w lemma="de" pos="PD">de</w></hi> <w lemma="de salt" pos="NOU-C">zaal</w> <w lemma="unresolved" pos="RES">-</w></p><p> <w lemma="dat" pos="CON">dat</w><hi rend="superscript"><w lemma="de" pos="PD">de</w></hi> <w lemma="wind" pos="NOU-C">wind</w> <w lemma="bewegen" pos="VRB">beweegt.</w> <w lemma="ue." pos="PD">-</w></p><p> </p><p> <w lemma="tegen" pos="ADP">Tegen</w> <w lemma="de" pos="PD">D'</w> <w lemma="joden" pos="NOU-C">Joden</w> <w lemma="hebben" pos="VRB">heb</w> <w lemma="ik" pos="PD">ik</w> <w lemma="niets" pos="PD">niets,</w> <w lemma="het" pos="PD">'t</w> <w lemma="komen" pos="VRB">komt</w> <w lemma="ik" pos="PD">mij</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="honderdaads" pos="ADJ">'onmelodisch'</w> <w lemma="voor" pos="ADP">voor.</w> <w lemma="ue." pos="RES">-</w> <w lemma="zulk" pos="PD">Zulke</w> <w lemma="verbling" pos="NOU-C">verbindingen</w> <w lemma="zijn" pos="VRB">zijn</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="ophouden" pos="VRB">geoorloofd,</w> <w lemma="zeggen" pos="VRB">zegt</w> <w lemma="plaas" pos="NOU-C">Plox.</w> <w lemma="waarom" pos="ADV">Waarom</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="een" pos="CON">-?.</w> <w lemma="zij" pos="PD">Ze</w> <w lemma="komen" pos="VRB">komen</w> <w lemma="in" pos="ADP">in</w> <w lemma="de" pos="PD">de</w> <w lemma="spectimical" pos="NOU-C">spreektaal</w> <w lemma="voorts" pos="ADV">voor,</w> <w lemma="en" pos="CON">en</w> <w lemma="deze" pos="PD">deze</w> <w lemma="zijn" pos="VRB">is</w> <w lemma="toch" pos="ADV">toch</w> <w lemma="de" pos="PD">de</w> <w lemma="weter" pos="NOU-C">wetgever</w> <w lemma="van" pos="ADP">van</w> <w lemma="ons" pos="PD">ons</w> <w lemma="tamak" pos="NOU-C">taal-wetboek,</w> <w lemma="van" pos="ADP">van</w> <w lemma="de" pos="PD">de</w> <w lemma="graafschap" pos="NOU-C">gramatica.</w> <w lemma="unresolved" pos="RES">-</w> <w lemma="ik" pos="PD">Ik</w> <w lemma="maken" pos="VRB">maak</w> <w lemma="jij" pos="PD">je</w> <w lemma="mijn" pos="PD">mijn</w> <w lemma="compliment" pos="NOU-C">compliment</w> <w lemma="over" pos="ADP">over</w> <w lemma="een" pos="PD">een</w> <w lemma="man" pos="NOU-C">man,</w> <w lemma="die" pos="PD">die</w> <w lemma="zulk" pos="PD">zulke</w> <w lemma="verzen" pos="VRB">verzen</w> <w lemma="schrijven" pos="VRB">schrijft.</w></p><p> <w lemma="edele" pos="ADJ">'De</w> <w lemma="joden" pos="NOU-C">Joden'</w> <w lemma="behouden" pos="VRB">behoud</w> <w lemma="eken" pos="INT">ik;</w> <w lemma="mogen" pos="VRB">mag</w> <w lemma="ik" pos="PD">ik</w> <w lemma="die" pos="PD">die</w> <w lemma="schelm" pos="NOU-C">Schiedamsche</w> <w lemma="er" pos="ADV">er</w> <w lemma="daarbij" pos="ADV">bij</w> <w lemma="liggen" pos="VRB">leggen</w> <w lemma="en" pos="CON">en</w> <w lemma="behouden" pos="VRB">behouden?</w> <w lemma="het" pos="CON">'t</w> <w lemma="johannes" pos="NOU-P">Johannes</w> <w lemma="engelse" pos="NOU-P">Evangelie</w> <w lemma="stuur" pos="VRB">stuur</w> <w lemma="ik" pos="PD">ik</w> <w lemma="u" pos="PD">U</w> <w lemma="laat" pos="ADV">later</w> <w lemma="te" pos="VRB">terug,</w> <w lemma="en" pos="CON">en</w> <w lemma="tevens" pos="ADV">tevens</w> <w lemma="geld" pos="NOU-C">geld</w> <w lemma="voor" pos="ADP">voor</w> <w lemma="het" pos="PD">'t</w> <w lemma="eerst" pos="ADJ">eerste.</w> <w lemma="gij" pos="PD">Gij</w> <w lemma="zijn" pos="VRB">zijt</w> <w lemma="huisvrouw" pos="NOU-C">huismoeder,</w> <w lemma="vrouw" pos="NOU-C">vrouw.;</w> <w lemma="te" pos="ADP">te</w> <w lemma="prachtig" pos="NOU-P">praktiesch</w> <w lemma="om" pos="CON">om</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="voor" pos="ADP">voor</w> <w lemma="uw" pos="PD">Uw'</w> <w lemma="huislonding" pos="NOU-C">huishouding</w> <w lemma="te" pos="ADP">te</w> <w lemma="zorgen" pos="VRB">zorgen</w> <w lemma="en" pos="CON">en</w> <w lemma="geven" pos="VRB">geeft</w> <w lemma="mee" pos="ADV">me</w> <w lemma="de" pos="PD">den</w> <w lemma="prijs" pos="NOU-C">prijs</w> <w lemma="opperstuurman" pos="RES">[op?].</w></p><p> <w lemma="heer" pos="VRB">'K</w> <w lemma="vinden" pos="VRB">vond</w> <w lemma="in" pos="CON">in</w> <w lemma="dat" pos="CON">dat</w> <w lemma="engelse" pos="NOU-C">Evangelie</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="een" pos="PD">een</w> <w lemma="geducht" pos="NOU-C">gedicht</w> <w lemma="van" pos="ADP">van</w> <w lemma="uw" pos="PD">Uw</w> <w lemma="albert" pos="NOU-P">Albert:</w> <w lemma="dat" pos="CON">dat</w> <w lemma="ik" pos="PD">ik</w> <w lemma="mijn" pos="PD">mijner</w> <w lemma="vrouw" pos="NOU-C">vrouw</w> <w lemma="met" pos="ADP">met</w> <w lemma="een" pos="PD">eene</w> <w lemma="huisvrouw" pos="NOU-C">'Uebersetzung</w> <w lemma="in" pos="ADP">in</w> <w lemma="het" pos="PD">het</w> <w lemma="duits" pos="NOU-C">Duitsch,</w> <w lemma="overkomen" pos="VRB">overgebriefd</w> <w lemma="hebben" pos="VRB">heb.</w></p><p> </p><p> <w lemma="o" pos="INT">O</w> <w lemma="man" pos="NOU-C">Mann</w> <w lemma="van spall" pos="ADP">von</w> <w lemma="schelmen" pos="NOU-P">Schmerzen</w> <w lemma="met" pos="ADP">mit</w> <w lemma="de" pos="PD">der</w> <w lemma="donker van hoek" pos="NOU-P">Dornenkrohn'</w></p><p> <w lemma="o" pos="INT">O</w> <w lemma="blijks" pos="NOU-C">bleiches</w> <w lemma="blijdschap" pos="ADJ">blut'-Gesicht,</w> <w lemma="daags" pos="NOU-C">dass</w> <w lemma="in" pos="ADP">in</w> <w lemma="van der saen" pos="NOU-C">der</w> <w lemma="schout-bij-nacht" pos="NOU-C">Nacht</w></p><p> <w lemma="geven" pos="VRB">Glüht</w> <w lemma="met" pos="ADP">mit</w> <w lemma="een" pos="PD">ein'</w> <w lemma="groetenis" pos="NOU-C">grosser</w> <w lemma="blijder" pos="NOU-C">bleicher</w> <w lemma="flom" pos="NOU-C">flamm',</w> <w lemma="zijn" pos="VRB">wass</w> <w lemma="macht" pos="NOU-C">macht</w></p><p> <w lemma="bij" pos="ADP">Bei</w> <w lemma="engels" pos="NOU-P">endlos'</w> <w lemma="lijden" pos="NOU-P">Leiden</w> <w lemma="doch" pos="CON">doch</w> <w lemma="de" pos="PD">dein</w> <w lemma="bijl" pos="NOU-C">Bild</w> <w lemma="zo" pos="ADV">so</w> <w lemma="schoon" pos="ADJ">schön?</w></p><p> </p><p> <pb/><w lemma="guavens" pos="ADJ">Glänzende</w> <w lemma="liefste" pos="NOU-P">Liebe</w> <w lemma="in" pos="ADP">in</w> <w lemma="in" pos="PD">ein</w> <w lemma="deurde" pos="NOU-C">Dampf</w> <w lemma="van" pos="ADP">von</w> <w lemma="johan" pos="NOU-P">Hohn,</w></p><p> <w lemma="wie" pos="PD">Wie</w> <w lemma="zijn" pos="VRB">sind</w> <w lemma="de" pos="PD">dein'</w> <w lemma="lijf" pos="VRB">Lippen</w> <w lemma="stil" pos="VRB">still,</w> <w lemma="wie" pos="PD">wie</w> <w lemma="hoeven" pos="VRB">ohne</w> <w lemma="klagen" pos="NOU-P">Klag?</w></p><p> <w lemma="blijkst" pos="NOU-C">Blickst</w> <w lemma="niemender" pos="PD">nieder</w> <w lemma="de" pos="PD">du</w> <w lemma="voer" pos="NOU-C">vom</w> <w lemma="cornelis" pos="NOU-P">Kreuz,</w> <w lemma="wie" pos="PD">wie</w> <w lemma="lucht" pos="VRB">lächelst</w> <w lemma="de" pos="VRB">du</w> <w lemma="zo" pos="ADV">zo</w> <w lemma="millen" pos="ADJ">mild,</w></p><p> <w lemma="god" pos="NOU-P">Gott</w> <w lemma="van" pos="ADP">von</w> <w lemma="geenszoon" pos="NOU-P">Geheimniss',</w> <w lemma="god" pos="NOU-P">Gottes</w> <w lemma="liebheer" pos="NOU-P">liebster</w> <w lemma="soer" pos="NOU-P">Sohn!</w></p><p> </p><p> <w lemma="o" pos="INT">O</w> <w lemma="flam" pos="INT">flamm'</w> <w lemma="vol" pos="ADJ">voll</w> <w lemma="gulden" pos="NOU-C">Gluth</w> <w lemma="af" pos="ADP">auf</w> <w lemma="deze" pos="PD">dieser</w> <w lemma="klein" pos="VRB">kalten</w> <w lemma="welgemet" pos="VRB">Welt,</w></p><p> <w lemma="schrijven" pos="NOU-C">Schönheit</w> <w lemma="er" pos="ADV">der</w> <w lemma="van" pos="ADP">von</w> <w lemma="schermensen" pos="NOU-P">Schmerzen</w> <w lemma="afdoen" pos="ADP">auf</w> <w lemma="de" pos="PD">der</w> <w lemma="deelte" pos="ADJ">dunklen</w> <w lemma="unresolved" pos="ADJ">Erd'</w></p><p> <w lemma="welder" pos="NOU-P">Wunder</w> <w lemma="de" pos="PD">der</w> <w lemma="liefhebben" pos="ADJ">Liebe,</w> <w lemma="durig" pos="ADJ">durch</w> <w lemma="keizersgracht" pos="NOU-C">kein</w> <w lemma="mens" pos="NOU-C">Mensch</w> <w lemma="erkeren" pos="ADJ">erklärt.</w></p><p> </p><p> <w lemma="weg" pos="PD">Weh</w> <w lemma="mei" pos="NOU-C">mir!</w> <w lemma="ik" pos="PD">ich</w> <w lemma="horen" pos="VRB">hor'</w> <w lemma="allesbehande" pos="ADV">allzeit</w> <w lemma="de" pos="PD">den</w> <w lemma="trauwel" pos="NOU-C">traur'gn</w> <w lemma="vallen" pos="VRB">fall</w></p><p> <w lemma="de" pos="PD">Der</w> <w lemma="trouwen" pos="ADJ">Tropfen</w> <w lemma="blucht" pos="NOU-C">Bluth</w> <w lemma="en" pos="PD">und</w> <w lemma="bijzetten" pos="NOU-C">bis</w> <w lemma="zuidoorts" pos="ADJ">zum</w> <w lemma="morgen" pos="NOU-C">Morgen</w> <w lemma="zien" pos="VRB">sieht</w></p><p> <w lemma="er" pos="ADV">Er</w> <w lemma="micht" pos="ADJ">mich</w> <w lemma="aan" pos="ADP">an</w> <w lemma="met" pos="ADP">mit</w> <w lemma="groene kloker" pos="NOU-P">grosser</w> <w lemma="liefhebben" pos="NOU-P">Liebe</w> <w lemma="en" pos="CON">und</w> <w lemma="engels" pos="ADJ">endlos'</w> <w lemma="leiden" pos="VRB">Leid.</w></p><p> </p><p> <w lemma="wat" pos="PD">Wat</w> <w lemma="vrijen" pos="NOU-C">vrij,</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="waard" pos="VRB">waar?</w> <w lemma="schelen" pos="VRB">Scheldt</w> <w lemma="gij" pos="PD">Gy</w> <w lemma="verhopen" pos="VRB">-?-</w> <w lemma="zijn" pos="VRB">Waren</w> <w lemma="de" pos="PD">de</w> <w lemma="duits" pos="ADJ">duitsche</w> <w lemma="uitreksenie" pos="NOU-C">uitdrukking</w> <w lemma="voor" pos="ADP">voor</w><hi rend="underline"><w lemma="aan" pos="PD">Ai</w> </hi><w lemma="mijn" pos="PD"><hi rend="underline">my</hi>!</w> <w lemma="en" pos="RES">-</w> <w lemma="mijn" pos="PD">Mijn</w> <w lemma="hollands" pos="ADJ">Hollandsch</w> <w lemma="beginnen" pos="VRB">begint</w> <w lemma="ik" pos="PD">my</w> <w lemma="te" pos="ADP">te</w> <w lemma="vergeten" pos="VRB">vergeten.</w> <w lemma="unresolved" pos="CON">-</w> <w lemma="ik" pos="PD">Ik</w> <w lemma="maken" pos="VRB">maak</w> <w lemma="somwijs" pos="ADV">soms</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="verzien" pos="VRB">verzen,</w> <w lemma="zoals" pos="CON">zooals</w> <w lemma="gij" pos="PD">Gij</w> <w lemma="weten" pos="VRB">weet.</w> <w lemma="waarom" pos="ADV">Waarom?</w> <w lemma="wijl" pos="CON">Wijl</w> <w lemma="ik" pos="PD">ik</w> <w lemma="er" pos="ADV">er</w> <w lemma="plezier" pos="ADJ">pleizier</w> <w lemma="aan" pos="ADV">aan</w> <w lemma="hebben" pos="VRB">heb.</w> <w lemma="verleden" pos="ADJ">Verleden</w> <w lemma="winter" pos="NOU-C">winter</w> <w lemma="zijn" pos="VRB">ben</w> <w lemma="ik" pos="PD">ik</w> <w lemma="unresolved" pos="RES">[Mr.</w> <w lemma="unresolved" pos="RES">st.?]</w> <w lemma="worden" pos="VRB">geworden</w> <w lemma="bij" pos="ADP">bij</w> <w lemma="ons" pos="PD">onze</w> <w lemma="louw" pos="NOU-C">Loge,</w> <w lemma="en" pos="CON">en</w> <w lemma="hebben" pos="VRB">heb</w> <w lemma="toen" pos="CON">toen</w> <w lemma="iets" pos="PD">iets</w> <w lemma="veroorzaken" pos="VRB">voorgedragen,</w> <w lemma="waarvoor" pos="ADV">waarvoor</w> <w lemma="ik" pos="PD">ik</w> <w lemma="veel" pos="PD">veel</w> <w lemma="lof" pos="NOU-C">lof</w> <w lemma="in" pos="ADP">in</w> <w lemma="oogst" pos="NOU-C">oogste.</w> <w lemma="in" pos="ADP">In</w> <w lemma="de" pos="PD">de</w> <w lemma="eerst" pos="NUM">eerste</w> <w lemma="aflegening" pos="NOU-C">afdeeling</w> <w lemma="vierde" pos="VRB">vierde</w> <w lemma="ik" pos="PD">ik</w> <w lemma="het" pos="PD">het</w> <w lemma="licht" pos="NOU-C">Licht,</w> <w lemma="geven" pos="VRB">gaf</w> <w lemma="ik" pos="PD">ik</w> <w lemma="mijn" pos="PD">mijn</w> <w lemma="begrijpen" pos="NOU-C">begrip</w> <w lemma="van" pos="ADP">van</w> <w lemma="het" pos="PD">'t</w> <w lemma="missterrie" pos="NOU-C">Mysterie,</w> <w lemma="god" pos="NOU-C">(God?),</w> <w lemma="waarin" pos="ADV">waarin</w> <w lemma="wij" pos="PD">wij</w> <w lemma="leven" pos="NOU-C">leven,</w> <w lemma="een" pos="PD">eene</w> <w lemma="eeuwigheid" pos="NOU-C">eenheid</w> <w lemma="van" pos="ADP">van</w> <w lemma="stof" pos="NOU-C">stof</w> <w lemma="en" pos="CON">en</w> <w lemma="kracht" pos="NOU-C">kracht</w> <w lemma="et cetera" pos="NOU-P">etc.;</w> <w lemma="de" pos="PD">de</w> <w lemma="tweede" pos="NUM">tweede</w> <w lemma="zijn" pos="VRB">was</w> <w lemma="voor" pos="ADP">voor</w> <w lemma="de" pos="PD">den</w> <w lemma="voorsteen" pos="NOU-C">Voorzitter;</w> <w lemma="in" pos="ADP">in</w> <w lemma="de" pos="PD">de</w> <w lemma="derde" pos="NUM">derde</w> <w lemma="afkomen" pos="VRB">afd.</w> <w lemma="geven" pos="VRB">gaf</w> <w lemma="ik" pos="PD">ik</w> <w lemma="mijn" pos="PD">mijne</w> <w lemma="openbaring" pos="NOU-C">opvatting</w> <w lemma="de" pos="PD">der</w> <w lemma="haven" pos="NOU-C">'Mauerei';</w> <w lemma="ofschoon" pos="CON">Ofschoon</w> <w lemma="ik" pos="PD">ik</w> <w lemma="verklaren" pos="VRB">verklaarde,</w> <w lemma="dat" pos="CON">dat</w> <w lemma="ik" pos="PD">ik</w> <w lemma="geen" pos="PD">geene</w> <w lemma="waard" pos="ADJ">waarde</w> <w lemma="heet" pos="NOU-C">hechte</w> <w lemma="aan" pos="ADP">aan</w> <w lemma="de" pos="PD">de</w> <w lemma="form" pos="NOU-C">formules</w> <w lemma="dienstwillig" pos="PD">d.</w> <w lemma="mandje" pos="NOU-C">Mauerei,</w> <w lemma="daar" pos="ADV">daar</w> <w lemma="mijn" pos="PD">mijn</w> <w lemma="liggen" pos="VRB">Loge</w> <w lemma="de" pos="PD">de</w> <w lemma="wereld" pos="NOU-C">wereld</w> <w lemma="zijn" pos="VRB">was</w> <w lemma="et cetera" pos="ADV">etc.</w> <w lemma="zijn" pos="VRB">was</w> <w lemma="men" pos="PD">men</w> <w lemma="ervan" pos="ADV">er</w> <w lemma="toch" pos="ADV">toch</w> <w lemma="daarmee" pos="ADV">meê</w> <w lemma="innemen" pos="VRB">ingenomen.</w> <w lemma="al" pos="PD">Alles</w> <w lemma="rok" pos="ADV">rook</w> <w lemma="keters" pos="RES">kettersch.</w> <w lemma="unresolved" pos="RES">-</w> <w lemma="zij" pos="PD">Zij</w> <w lemma="vinden" pos="VRB">vonden</w> <w lemma="het" pos="CON">'t</w> <w lemma="wel" pos="ADV">wel</w> <w lemma="moei" pos="NOU-C">mooi,</w> <w lemma="willen" pos="CON">wijl</w> <w lemma="ik" pos="PD">ik</w> <w lemma="een" pos="PD">een</w> <w lemma="consumblief" pos="NOU-C">consul</w> <w lemma="zijn" pos="VRB">ben.</w> <w lemma="de" pos="PD">De</w> <w lemma="stand" pos="NOU-C">stand</w> <w lemma="en" pos="CON">en</w> <w lemma="materig" pos="ADJ">maatschappelijke</w> <w lemma="postje" pos="NOU-C">positie</w> <w lemma="hebben" pos="VRB">heeft</w> <w lemma="machtig" pos="ADJ">machtig</w> <w lemma="veel" pos="PD">veel</w> <w lemma="inloden" pos="NOU-C">invloed</w> <w lemma="op" pos="ADV">op</w> <w lemma="het" pos="PD">'t</w> <w lemma="oordeel" pos="NOU-C">oordeel</w> <w lemma="de" pos="PD">der</w> <w lemma="mens" pos="NOU-C">menschen,</w> <w lemma="zodra" pos="CON">zooals</w> <w lemma="wij" pos="PD">ons</w> <w lemma="spercheren" pos="VRB">spreekwoord:</w> <w lemma="edele" pos="ADJ">'de</w> <w lemma="rok" pos="NOU-C">rok</w> <w lemma="maken" pos="VRB">maakt</w> <w lemma="de" pos="PD">den</w> <w lemma="mens" pos="NOU-C">mensch'</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="zeggen" pos="VRB">zegt.</w> <w lemma="die" pos="RES">-</w> <w lemma="de" pos="PD">De</w> <w lemma="heer" pos="NOU-C">Heeren</w> <w lemma="zijn" pos="VRB">zijn</w> <w lemma="anders" pos="ADJ">anders</w> <w lemma="erg" pos="ADJ">erg</w> <w lemma="contant" pos="NOU-C">conservatief;</w> <w lemma="zij" pos="PD">ze</w> <w lemma="houden" pos="VRB">houden</w> <w lemma="vast" pos="ADV">vast,</w> <w lemma="wat" pos="PD">wat</w> <w lemma="zij" pos="PD">ze</w> <w lemma="hebben" pos="VRB">hebben,</w> <w lemma="en" pos="CON">en</w> <w lemma="zien" pos="VRB">zien</w><pb/><w lemma="goed" pos="VRB">goed</w> <w lemma="uitvaren" pos="VRB">uit,</w> <w lemma="hoe" pos="ADV">hoe</w> <w lemma="de" pos="PD">de</w> <w lemma="wind" pos="NOU-C">wind</w> <w lemma="waaien" pos="VRB">waait:</w> <w lemma="praten" pos="VRB">praten</w> <w lemma="bij" pos="ADP">bij</w> <w lemma="een" pos="PD">een</w> <w lemma="goed" pos="ADJ">goed</w> <w lemma="glas" pos="NOU-C">glas</w> <w lemma="wijn" pos="NOU-C">wijn</w> <w lemma="en" pos="CON">en</w> <w lemma="een" pos="PD">eene</w> <w lemma="fijn" pos="ADJ">fijne</w> <w lemma="sint maria a aacte c" pos="ADJ">sigaar</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="wel" pos="ADV">wel</w> <w lemma="eens" pos="ADV">eens</w> <w lemma="over" pos="ADP">over</w> <w lemma="de" pos="PD">de</w> <w lemma="verbeerdening" pos="NOU-C">verbetering</w> <w lemma="van" pos="ADP">van</w> <w lemma="het" pos="PD">'t</w> <w lemma="lotelijk" pos="NOU-C">lot</w> <w lemma="de" pos="PD">der</w> <w lemma="arm" pos="NOU-C">armen,</w> <w lemma="die" pos="PD">die</w> <w lemma="zijn" pos="VRB">zij,</w> <w lemma="als" pos="CON">als</w> <w lemma="deze" pos="PD">deze</w> <w lemma="er" pos="ADV">er</w> <w lemma="zelf" pos="PD">zelf</w> <w lemma="daarover" pos="ADV">over</w> <w lemma="denken" pos="VRB">denken</w> <w lemma="en" pos="CON">en</w> <w lemma="spreken" pos="VRB">spreken</w> <w lemma="kant" pos="NOU-C">canaille</w> <w lemma="noemen" pos="VRB">noemen;</w> <w lemma="te" pos="CON">'t</w> <w lemma="zijn" pos="PD">zijn</w> <w lemma="prachtig" pos="ADJ">prachtige</w> <w lemma="mens" pos="NOU-C">menschen</w> <w lemma="en" pos="CON">en</w> <w lemma="goed" pos="ADJ">goede</w> <w lemma="stark" pos="NOU-C">Staatsburgers,</w> <w lemma="die" pos="PD">die</w> <w lemma="god" pos="NOU-P">God</w> <w lemma="en" pos="CON">en</w> <w lemma="de" pos="PD">den</w> <w lemma="keizer" pos="NOU-C">Keizer</w> <w lemma="geven" pos="VRB">geven,</w> <w lemma="wat" pos="PD">wat</w> <w lemma="zij" pos="PD">ze</w> <w lemma="toekomen" pos="VRB">toekomt</w> <w lemma="en" pos="CON">en</w> <w lemma="daarom" pos="ADV">daarom</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="zeker" pos="ADJ">zeker</w> <w lemma="al" pos="PD">allen</w> <w lemma="in" pos="ADP">in</w> <w lemma="de" pos="PD">den</w> <w lemma="hemel" pos="NOU-C">Hemel</w> <w lemma="komen" pos="VRB">komen,</w> <w lemma="ofschoon" pos="CON">ofschoon</w> <w lemma="zij" pos="PD">ze</w> <w lemma="bij" pos="ADP">bij</w> <w lemma="de" pos="PD">de</w> <w lemma="intreuring" pos="NOU-C">invoering</w> <w lemma="er" pos="ADV">der</w> <w lemma="weten" pos="VRB">Wet</w> <w lemma="op" pos="ADV">op</w> <w lemma="het" pos="PD">'t</w> <w lemma="inkomen" pos="NOU-C">inkomen</w> <w lemma="enkland" pos="NOU-C">eclatant</w> <w lemma="bewijzen" pos="VRB">bewezen</w> <w lemma="hebben" pos="VRB">hebben,</w> <w lemma="dat" pos="PD">dat</w> <w lemma="provision" pos="NOU-C">Proudhon'</w> <w lemma="gelijk" pos="ADV">gelijk</w> <w lemma="hebben" pos="VRB">had,</w> <w lemma="als" pos="CON">als</w> <w lemma="hij" pos="PD">hij</w> <w lemma="eigendom" pos="NOU-C">'eigendom</w> <w lemma="ditstaal" pos="NOU-C">diefstal'</w> <w lemma="noemen" pos="VRB">noemde.</w> <w lemma="unresolved" pos="RES">[60?]</w> <w lemma="missivoor" pos="NOU-C">miljoen</w> <w lemma="brengen" pos="VRB">bracht</w> <w lemma="de" pos="PD">de</w> <w lemma="nieuw" pos="ADJ">nieuwe</w> <w lemma="weten" pos="VRB">wet</w> <w lemma="meer" pos="ADV">meer</w> <w lemma="opstaan" pos="VRB">op,</w> <w lemma="dan" pos="ADV">dan</w> <w lemma="vrouw" pos="ADJ">vroeger,</w> <w lemma="hebben" pos="VRB">hebben</w> <w lemma="die" pos="PD">die</w> <w lemma="heer" pos="NOU-C">Heeren</w> <w lemma="dus" pos="ADV">dus</w> <w lemma="ue." pos="NUM">-</w> <w lemma="huisloven" pos="NOU-C">'gestolen',</w> <w lemma="willen" pos="VRB">wil</w> <w lemma="ik" pos="PD">ik</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="zeggen" pos="VRB">zeggen,</w> <w lemma="die" pos="PD">-</w> <w lemma="te" pos="ADV">te</w> <w lemma="mijn" pos="PD">min</w> <w lemma="betalen" pos="VRB">betaald.</w> <w lemma="ue." pos="RES">-</w> <w lemma="unresolved" pos="RES">.</w> <w lemma="unresolved" pos="PD">-</w> <w lemma="zullen" pos="VRB">Stelen</w> <w lemma="zijn" pos="VRB">is</w> <w lemma="een" pos="PD">een</w> <w lemma="te" pos="ADP">te</w> <w lemma="bark" pos="ADJ">barsch</w> <w lemma="woord" pos="NOU-C">woord</w> <w lemma="voor" pos="ADP">voor</w> <w lemma="deftig" pos="ADJ">deftige</w> <w lemma="verrijk" pos="ADJ">rijke</w> <w lemma="lieden" pos="NOU-C">lui..</w> <w lemma="ue." pos="RES">-</w> <w lemma="genoeg" pos="PD">Genoeg</w> <w lemma="unresolved" pos="RES">-</w> <w lemma="zo" pos="ADV">zoo</w> <w lemma="schijnen" pos="VRB">schijnen</w> <w lemma="zij" pos="PD">ze</w> <w lemma="overal" pos="ADV">overal</w> <w lemma="te" pos="ADP">te</w> <w lemma="zijn" pos="VRB">zijn.</w> <w lemma="ue." pos="VRB">-</w></p><p> <w lemma="kattenhoeve" pos="NOU-P">Kathi</w> <w lemma="zijn" pos="VRB">is</w> <w lemma="thans" pos="ADV">thans</w> <w lemma="in" pos="ADP">in</w> <w lemma="de" pos="PD">de</w> <w lemma="stad" pos="NOU-C">stad;</w> <w lemma="zijn" pos="PD">zij</w> <w lemma="zoeken" pos="VRB">zoekt</w> <w lemma="winker" pos="NOU-C">werk,</w> <w lemma="een" pos="PD">eene</w> <w lemma="betrekken" pos="NOU-C">betrekking,</w> <w lemma="de" pos="PD">-</w> <w lemma="kunnen" pos="VRB">kan</w> <w lemma="echter" pos="ADV">echter</w> <w lemma="niets" pos="PD">niets</w> <w lemma="vinden" pos="VRB">vinden.</w> <w lemma="waar" pos="ADV">Waar</w> <w lemma="een" pos="PD">een</w> <w lemma="nodig" pos="ADJ">noodig</w> <w lemma="zijn" pos="VRB">is,</w> <w lemma="bidden" pos="VRB">bieden</w> <w lemma="ziekte" pos="NOU-C">zich,</w> <w lemma="vijftig" pos="NUM">vijftig,</w> <w lemma="honderd" pos="NOU-C">honderd,</w> <w lemma="daaraan" pos="ADV">aan.</w> <w lemma="de" pos="RES">-</w> <w lemma="wat" pos="PD">Wat</w> <w lemma="daaruit" pos="ADV">daaruit</w> <w lemma="worden" pos="VRB">worden</w> <w lemma="zullen" pos="VRB">zal,</w> <w lemma="weten" pos="VRB">weet</w> <w lemma="ik" pos="PD">ik</w> <w lemma="niet" pos="ADV">niet.</w> <w lemma="ue." pos="NUM">-</w></p><p> <w lemma="hoe" pos="ADV">Hoe</w> <w lemma="gaan" pos="VRB">gaat</w> <w lemma="het" pos="PD">het</w> <w lemma="u" pos="PD">U</w> <w lemma="en" pos="CON">en</w> <w lemma="uw" pos="PD">Uwe</w> <w lemma="kind" pos="NOU-C">kinderen.</w> <w lemma="toch" pos="ADV">Toch</w> <w lemma="wel" pos="ADV">wel</w> <w lemma="uiteinde" pos="VRB">-?-</w> <w lemma="liggen" pos="VRB">Leg</w> <w lemma="zij" pos="PD">ze</w> <w lemma="nog" pos="ADV">nog</w> <w lemma="maar" pos="ADV">maar</w> <w lemma="weer" pos="ADV">weer</w> <w lemma="eens" pos="ADV">eens</w> <w lemma="op" pos="ADP">op</w> <w lemma="hun" pos="PD">hun</w> <w lemma="rugaard" pos="NOU-C">rug,</w> <w lemma="om" pos="CON">om</w> <w lemma="enig" pos="PD">eenige</w> <w lemma="letter" pos="NOU-C">letteren</w> <w lemma="te" pos="ADP">te</w> <w lemma="schrijven" pos="VRB">schrijven.</w> <w lemma="ue." pos="PD">-</w> <w lemma="nog" pos="ADV">Nog</w> <w lemma="iets" pos="PD">iets.</w> <w lemma="ue." pos="PD">-</w> <w lemma="stuur" pos="NOU-C">Stuur</w> <w lemma="mee" pos="ADV">me</w> <w lemma="toch" pos="ADV">toch</w> <w lemma="een" pos="PD">eene</w> <w lemma="facotie" pos="NOU-C">fotografie</w> <w lemma="van" pos="ADP">van</w> <w lemma="jij" pos="PD">je</w> <w lemma="man" pos="NOU-C">man.</w> <w lemma="ik" pos="PD">Ik</w> <w lemma="mogen" pos="VRB">mocht</w> <w lemma="hij" pos="PD">hem</w> <w lemma="hebben" pos="VRB">hebben,</w> <w lemma="voor" pos="ADP">voor</w> <w lemma="de" pos="PD">de</w> <w lemma="heel" pos="ADJ">heele</w> <w lemma="wereld" pos="NOU-C">wereld</w> <w lemma="hij" pos="PD">hem</w> <w lemma="hebben" pos="VRB">heeft.</w> <w lemma="u" pos="PD">U</w> <w lemma="vinden" pos="VRB">vindt</w> <w lemma="dit" pos="PD">dit</w> <w lemma="verlangen" pos="NOU-C">verlangen</w> <w lemma="toch" pos="ADV">toch</w> <w lemma="natuurlijk" pos="ADJ">natuurlijk</w> <w lemma="en" pos="CON">en</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="onbescheiden" pos="ADJ">onbescheiden,</w> <w lemma="hopen" pos="VRB">hoop</w> <w lemma="ik" pos="PD">ik.</w> <w lemma="voegen" pos="VRB">Voeg</w> <w lemma="jij" pos="PD">je</w> <w lemma="zelf" pos="PD">zelf</w> <w lemma="er" pos="ADV">er</w> <w lemma="dan" pos="ADV">dan</w> <w lemma="maar" pos="ADV">maar</w> <w lemma="bij" pos="ADP">bij.</w> <w lemma="mijn" pos="PD">Mijn</w> <w lemma="vrouw" pos="NOU-C">vrouw</w> <w lemma="zullen" pos="VRB">zal</w> <w lemma="er" pos="ADV">er</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="erg" pos="ADJ">erg</w> <w lemma="blij" pos="ADJ">blij</w> <w lemma="over" pos="ADV">over</w> <w lemma="zijn" pos="VRB">zijn,</w> <w lemma="als" pos="CON">als</w> <w lemma="ik" pos="PD">ik</w> <w lemma="met" pos="ADP">met</w> <w lemma="uw" pos="PD">Uw</w> <w lemma="beide" pos="PD">beiden</w> <w lemma="aankomen" pos="VRB">aankom.</w></p><p> </p><p> <w lemma="hartelijk" pos="ADV">Hartelijke</w> <w lemma="groeten" pos="VRB">groeten,</w> <w lemma="ook" pos="ADV">ook</w> <w lemma="aan" pos="ADP">aan</w> <w lemma="uw" pos="PD">Uw</w> <w lemma="man" pos="NOU-C">man</w></p><p> <w lemma="het" pos="ADP">TT.</w></p><p> <w lemma="johannes" pos="NOU-P">Johs.</w> <w lemma="advies" pos="NOU-P">Addens</w></p><p> </p><p> <w lemma="bij" pos="ADP">Bij</w> <w lemma="mijn" pos="PD">mijn</w> <w lemma="adamino" pos="NOU-C">adr.</w> <w lemma="behoeven" pos="VRB">behoef</w> <w lemma="jij" pos="PD">je</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="schrijven" pos="VRB">Skilnaden</w> <w lemma="of" pos="CON">of</w> <w lemma="bruijnberg" pos="NOU-C">Brunsparken</w> <w lemma="te" pos="ADP">te</w> <w lemma="zetten" pos="VRB">zetten;</w> <w lemma="de" pos="PD">-</w> <w lemma="een" pos="PD">een</w> <w lemma="handeraak" pos="NOU-C">handelszaak</w> <w lemma="hebben" pos="VRB">heb</w> <w lemma="ik" pos="PD">ik</w> <w lemma="niet" pos="ADV">niet</w> <w lemma="meer" pos="ADV">meer,</w> <w lemma="te" pos="ADP">te</w> <w lemma="schrijven" pos="VRB">Skilnaden</w> <w lemma="staan" pos="VRB">staat</w> <w lemma="nu" pos="ADV">nu</w> <w lemma="een" pos="PD">een</w> <w lemma="millesorant" pos="ADJ">millioenenhuis.</w></p><p> </p><p> <w lemma="ik" pos="PD">Ik</w> <w lemma="lezen" pos="VRB">lees</w> <w lemma="een" pos="PD">eene</w> <w lemma="krock" pos="NOU-C">Kritiek</w> <w lemma="de" pos="PD">der</w> <w lemma="moeder" pos="NOU-C">moderne</w> <w lemma="teergeliefde" pos="NOU-C">Theosophie</w> <w lemma="van" pos="ADP">van</w> <w lemma="gerritseling" pos="NOU-P">G.</w> <w lemma="af" pos="ADP">af</w> <w lemma="gerasma" pos="ADJ">Geiersam:</w> <w lemma="moeder" pos="NOU-C">Modern</w> <w lemma="unresolved" pos="NOU-P">[xxxxxxxxxxx]'</w></p><p> </p><p> <w lemma="zijn" pos="VRB">Is</w> <w lemma="uw" pos="PD">Uw</w> <w lemma="man" pos="NOU-C">man</w> <w lemma="geen" pos="PD">geen</w> <w lemma="hand" pos="NOU-C">Hagenaar;</w> <w lemma="daar" pos="ADV">daar</w> <w lemma="wonen" pos="VRB">woonde</w> <w lemma="vroeger" pos="ADV">vroeger</w> <w lemma="een" pos="PD">een</w> <w lemma="domineer" pos="NOU-C">Dr.</w> <w lemma="verwijl" pos="ADJ">Verwey.</w></p><p> <pb/></p><p> <pb/> </p></body></text></TEI>
\ No newline at end of file
diff --git a/server/src/test/resources/tei/export/mock-TDN-with-punctuation-result.xml b/server/src/test/resources/tei/export/mock-TDN-with-punctuation-result.xml
index 24969e1..d362c70 100644
--- a/server/src/test/resources/tei/export/mock-TDN-with-punctuation-result.xml
+++ b/server/src/test/resources/tei/export/mock-TDN-with-punctuation-result.xml
@@ -4,61 +4,92 @@
         <fileDesc>
             <titleStmt>
                 <title>mocktei</title>
+                <respStmt>
+                    <resp>linguistic annotation by GaLAHaD (https://portal.clarin.ivdnt.org/galahad)</resp>
+                    <orgName xml:lang="nl">Instituut voor de Nederlandse Taal</orgName>
+                    <orgName xml:lang="en">Dutch Language Institute</orgName>
+                </respStmt>
+                <respStmt>
+                    <resp>exported as tei-p5 by GaLAHaD (https://portal.clarin.ivdnt.org/galahad)</resp>
+                    <orgName xml:lang="nl">Instituut voor de Nederlandse Taal</orgName>
+                    <orgName xml:lang="en">Dutch Language Institute</orgName>
+                </respStmt>
             </titleStmt>
             <publicationStmt>
-                <p>
-                    <date>__DATE_IGNORED_BY_TEST__</date>
-                    <idno type="sourceID">What if source id is undefined?</idno>
-                    <idno type="pid">What if no pid is defined?</idno>
-                </p>
+                <publisher>!Needs to be filled in!</publisher>
+                <idno type="sourceID">mocktei</idno>
+                <idno type="GaLAHaDPersistentIdentifier">81e4fd37-e921-410b-aef5-48b26baf4af2_tei</idno>
             </publicationStmt>
+            <notesStmt>
+                <note resp="GaLAHaD" type="corpusName">testCorpus</note>
+                <note resp="GaLAHaD" type="sourceCollection">sourcename</note>
+                <note resp="GaLAHaD" type="sourceCollectionURL">http://source.url</note>
+            </notesStmt>
             <sourceDesc>
-                <listBibl xml:id="inlMetadata">
-                    <bibl>
-                        <interpGrp type="questions">
-                            <interp>Welke inl data?</interp>
-                            <interp>wat als er geen is?</interp>
-                        </interpGrp>
-                    </bibl>
-                </listBibl>
-<listBibl xml:id="galahadMetadata">
-    <bibl>
-        <interpGrp type="model">
-            <interp>pie-tdn-all</interp>
-        </interpGrp>
-        <interpGrp type="tagset">
-            <interp>TDN-Core</interp>
-        </interpGrp>
-        <interpGrp type="corpus_name">
-            <interp>testCorpus</interp>
-        </interpGrp>
-        <interpGrp type="corpus_uuid">
-            <interp>__UUID_IGNORED_BY_TEST__</interp>
-        </interpGrp>
-        <interpGrp type="date">
-            <interp>__DATE_IGNORED_BY_TEST__</interp>
-        </interpGrp>
-        <interpGrp type="user_id">
-            <interp>testUser</interp>
-        </interpGrp>
-        <interpGrp type="pid">
-            <interp>__UUID_IGNORED_BY_TEST__</interp>
-        </interpGrp>
-        <interpGrp type="title">
-            <interp>mocktei</interp>
-        </interpGrp>
-    </bibl>
-</listBibl>
+                <ab>
+                    <idno type="sourceID">mocktei</idno>
+                </ab>
+                <ab type="date">
+                    <date from="0" to="0"/>
+                </ab>
             </sourceDesc>
         </fileDesc>
+        <encodingDesc>
+            <appInfo resp="GaLAHaD">
+                <application ident="pie-tdn-all" version="1.0.1" xml:id="pie-tdn-all">
+                    <label>POS-tagger and lemmatiser</label>
+                    <ptr target="https://github.com/INL/galahad-taggers-dockerized/tree/1.0.2/pie/TDN-ALL"/>
+                </application>
+            </appInfo>
+            <editorialDecl resp="GaLAHaD">
+                <interpretation xml:id="A0001">
+                    <ab subtype="POS-tagging_lemmatisation" type="linguisticAnnotation">
+                        <interpGrp type="annotationStyle">
+                            <interp>inline</interp>
+                        </interpGrp>
+                        <interpGrp type="Documentation">
+                            <interp/>
+                        </interpGrp>
+                        <interpGrp type="annotationSet">
+                            <interp>TDN-Core</interp>
+                        </interpGrp>
+                        <interpGrp type="annotationDescription">
+                            <interp>The file was automatically annotated within the platform GaLAHaD, which is a central hub for enriching historical Dutch.</interp>
+                        </interpGrp>
+                        <interpGrp type="annotationFormat">
+                            <interp>TEI xml</interp>
+                        </interpGrp>
+                    </ab>
+                    <ab subtype="POS-tagging_lemmatisationProvenance1" type="linguisticAnnotation">
+                        <interpGrp type="annotationMode">
+                            <interp>automatically annotated</interp>
+                        </interpGrp>
+                        <interpGrp type="processor">
+                            <interp sameAs="#pie-tdn-all"/>
+                        </interpGrp>
+                        <date from="2024-06-19" to="2024-06-19"/>
+                    </ab>
+                </interpretation>
+            </editorialDecl>
+        </encodingDesc>
+        <profileDesc>
+            <langUsage>
+                <language ident="nl"> Dutch <interpGrp type="dominantLanguage">
+                        <interp>true</interp>
+                    </interpGrp>
+                </language>
+            </langUsage>
+        </profileDesc>
     </teiHeader>
     <text>
         <body>
             <div>
                 <p>
-
-
-<w lemma="dit" pos="PD" xml:id="w0">Dit</w> <w lemma="zijn" pos="VRB" xml:id="w1">is</w> <w lemma="wat" pos="PD" xml:id="w2">wat</w> <w lemma="oeftig" pos="ADJ" xml:id="w3">oefentekst</w><pc xml:id="w4">.</pc>
+                    <w lemma="dit" pos="PD" xml:id="w0">Dit</w>
+                    <w lemma="zijn" pos="VRB" xml:id="w1">is</w>
+                    <w lemma="wat" pos="PD" xml:id="w2">wat</w>
+                    <w lemma="oeftig" pos="ADJ" xml:id="w3">oefentekst</w>
+                    <pc xml:id="w4">.</pc>
                 </p>
             </div>
         </body>
diff --git a/server/src/test/resources/tei/export/punctuation-mixed-tags-merge-export-result.xml b/server/src/test/resources/tei/export/punctuation-mixed-tags-merge-export-result.xml
index 1b12172..e150bdf 100644
--- a/server/src/test/resources/tei/export/punctuation-mixed-tags-merge-export-result.xml
+++ b/server/src/test/resources/tei/export/punctuation-mixed-tags-merge-export-result.xml
@@ -1,30 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><TEI xmlns="http://www.tei-c.org/ns/1.0"><teiHeader><fileDesc><sourceDesc><listBibl xml:id="galahadMetadata">
-    <bibl>
-        <interpGrp type="model">
-            <interp>pie-tdn-all</interp>
-        </interpGrp>
-        <interpGrp type="tagset">
-            <interp>TDN-Core</interp>
-        </interpGrp>
-        <interpGrp type="corpus_name">
-            <interp>testCorpus</interp>
-        </interpGrp>
-        <interpGrp type="corpus_uuid">
-            <interp>__UUID_IGNORED_BY_TEST__</interp>
-        </interpGrp>
-        <interpGrp type="date">
-            <interp>__DATE_IGNORED_BY_TEST__</interp>
-        </interpGrp>
-        <interpGrp type="user_id">
-            <interp>testUser</interp>
-        </interpGrp>
-        <interpGrp type="pid">
-            <interp>__UUID_IGNORED_BY_TEST__</interp>
-        </interpGrp>
-        <interpGrp type="title">
-            <interp>punctutation-mixed-tags</interp>
-        </interpGrp>
-    </bibl>
-</listBibl></sourceDesc></fileDesc></teiHeader>
-    <text><p><w lemma="punctuatie" pos="DUM">Punctuatie</w><pc pos="PC">,</pc> <w lemma="zin" pos="DUM">zin</w> <w lemma="zonder" pos="DUM">zonder</w> <w lemma="tags" pos="DUM">tags</w><pc pos="PC">.</pc> <w lemma="zin" pos="DUM">Zin</w> <w lemma="met" pos="DUM">met</w> <w lemma="tags" pos="DUM">tags</w><pc pos="PC">.</pc></p></text>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><TEI xmlns="http://www.tei-c.org/ns/1.0"><teiHeader><fileDesc><titleStmt><title>punctutation-mixed-tags</title><respStmt><resp>linguistic annotation by GaLAHaD (https://portal.clarin.ivdnt.org/galahad)</resp><orgName xml:lang="nl">Instituut voor de Nederlandse Taal</orgName><orgName xml:lang="en">Dutch Language Institute</orgName></respStmt><respStmt><resp>TEI merged by GaLAHaD (https://portal.clarin.ivdnt.org/galahad)</resp><orgName xml:lang="nl">Instituut voor de Nederlandse Taal</orgName><orgName xml:lang="en">Dutch Language Institute</orgName></respStmt></titleStmt><publicationStmt><publisher>!Needs to be filled in!</publisher><idno type="sourceID">punctutation-mixed-tags</idno><idno type="GaLAHaDPersistentIdentifier">__UUID_IGNORED_BY_TEST___tei</idno></publicationStmt><notesStmt><note resp="GaLAHaD" type="corpusName">testCorpus</note><note resp="GaLAHaD" type="sourceCollection">source name</note><note resp="GaLAHaD" type="sourceCollectionURL">http://source.url</note></notesStmt><sourceDesc><ab><idno type="sourceID">punctutation-mixed-tags</idno></ab><ab type="date"><date from="0" to="0"/></ab></sourceDesc></fileDesc><encodingDesc><appInfo resp="GaLAHaD"><application ident="pie-tdn-all" version="1.0.1" xml:id="pie-tdn-all"><label>POS-tagger and lemmatiser</label><ptr target="https://github.com/INL/galahad-taggers-dockerized/tree/1.0.2/pie/TDN-ALL"/></application></appInfo><editorialDecl resp="GaLAHaD"><interpretation xml:id="A0001"><ab subtype="POS-tagging_lemmatisation" type="linguisticAnnotation"><interpGrp type="annotationStyle"><interp>inline</interp></interpGrp><interpGrp type="Documentation"><interp/></interpGrp><interpGrp type="annotationSet"><interp>TDN-Core</interp></interpGrp><interpGrp type="annotationDescription"><interp>The file was automatically annotated within the platform GaLAHaD, which is a central hub for enriching historical Dutch.</interp></interpGrp><interpGrp type="annotationFormat"><interp>TEI xml</interp></interpGrp></ab><ab subtype="POS-tagging_lemmatisationProvenance1" type="linguisticAnnotation"><interpGrp type="annotationMode"><interp>automatically annotated</interp></interpGrp><interpGrp type="processor"><interp sameAs="#pie-tdn-all"/></interpGrp><date from="2024-06-19" to="2024-06-19"/></ab></interpretation></editorialDecl></encodingDesc><profileDesc><langUsage><language ident="nl">Dutch<interpGrp type="dominantLanguage"><interp>true</interp></interpGrp></language></langUsage></profileDesc></teiHeader>
+    <text><p><w lemma="punctuatie" pos="DUM">Punctuatie</w><pc pos="PC">,</pc> <w lemma="zin" pos="DUM">zin</w> <w lemma="zonder" pos="DUM">zonder</w> <w lemma="tags" pos="DUM">tags</w><pc pos="PC">.</pc><w lemma="zin" pos="DUM">Zin</w> <w lemma="met" pos="DUM">met</w> <w lemma="tags" pos="DUM">tags</w><pc pos="PC">.</pc></p></text>
 </TEI>
\ No newline at end of file
diff --git a/server/src/test/resources/tei/twine/sourcelayer.json b/server/src/test/resources/tei/twine/sourcelayer.json
index 022b676..07608f8 100644
--- a/server/src/test/resources/tei/twine/sourcelayer.json
+++ b/server/src/test/resources/tei/twine/sourcelayer.json
@@ -1 +1 @@
-{"name":"sourceLayer","tagset":{"identifier":"UNKNOWN","longName":"Unknown Tagset","punctuationTags":[],"shortName":"UNK"},"terms":[{"lemma":"onzin","pos":null,"targets":[{"id":"no-id","length":1,"literal":".","offset":59}]},{"lemma":null,"pos":"onzin","targets":[{"id":"no-id","length":1,"literal":".","offset":61}]},{"lemma":null,"pos":null,"targets":[{"id":"no-id","length":1,"literal":".","offset":63}]},{"lemma":"onzin","pos":null,"targets":[{"id":"no-id","length":7,"literal":"scholen","offset":65}]},{"lemma":null,"pos":"onzin","targets":[{"id":"no-id","length":7,"literal":"scholen","offset":73}]},{"lemma":null,"pos":null,"targets":[{"id":"no-id","length":7,"literal":"scholen","offset":81}]},{"lemma":null,"pos":null,"targets":[{"id":"no-id","length":7,"literal":"scholen","offset":89}]},{"lemma":null,"pos":null,"targets":[{"id":"no-id","length":7,"literal":"scholen","offset":97}]},{"lemma":"de","pos":"PD(type=d-p,subtype=art,position=prenom)","targets":[{"id":"enge022vand01_01.TEI.2.text.body.div.lg.7633.s.1.w.11","length":3,"literal":"die","offset":497}]},{"lemma":"droogheid","pos":"NOU-C(number=sg)","targets":[{"id":"enge022vand01_01.TEI.2.text.body.div.lg.7633.s.1.w.12","length":9,"literal":"droecheit","offset":501}]},{"lemma":"rebel","pos":"NOU-C(number=pl)","targets":[{"id":"w.185","length":8,"literal":"rebellen","offset":511}]},{"lemma":"e.","pos":"LET","targets":[{"id":"pc.000005","length":1,"literal":".","offset":519}]}],"wordForms":[{"id":"no-id","length":1,"literal":".","offset":59},{"id":"no-id","length":1,"literal":".","offset":61},{"id":"no-id","length":1,"literal":".","offset":63},{"id":"no-id","length":7,"literal":"scholen","offset":65},{"id":"no-id","length":7,"literal":"scholen","offset":73},{"id":"no-id","length":7,"literal":"scholen","offset":81},{"id":"no-id","length":7,"literal":"scholen","offset":89},{"id":"no-id","length":7,"literal":"scholen","offset":97},{"id":"enge022vand01_01.TEI.2.text.body.div.lg.7633.s.1.w.11","length":3,"literal":"die","offset":497},{"id":"enge022vand01_01.TEI.2.text.body.div.lg.7633.s.1.w.12","length":9,"literal":"droecheit","offset":501},{"id":"w.185","length":8,"literal":"rebellen","offset":511},{"id":"pc.000005","length":1,"literal":".","offset":519}],"preview":{"terms":[{"lemma":"onzin","pos":null,"targets":[{"id":"no-id","length":1,"literal":".","offset":59}]},{"lemma":null,"pos":"onzin","targets":[{"id":"no-id","length":1,"literal":".","offset":61}]},{"lemma":null,"pos":null,"targets":[{"id":"no-id","length":1,"literal":".","offset":63}]},{"lemma":"onzin","pos":null,"targets":[{"id":"no-id","length":7,"literal":"scholen","offset":65}]},{"lemma":null,"pos":"onzin","targets":[{"id":"no-id","length":7,"literal":"scholen","offset":73}]},{"lemma":null,"pos":null,"targets":[{"id":"no-id","length":7,"literal":"scholen","offset":81}]},{"lemma":null,"pos":null,"targets":[{"id":"no-id","length":7,"literal":"scholen","offset":89}]},{"lemma":null,"pos":null,"targets":[{"id":"no-id","length":7,"literal":"scholen","offset":97}]}],"wordforms":[{"id":"no-id","length":1,"literal":".","offset":59},{"id":"no-id","length":1,"literal":".","offset":61},{"id":"no-id","length":1,"literal":".","offset":63},{"id":"no-id","length":7,"literal":"scholen","offset":65},{"id":"no-id","length":7,"literal":"scholen","offset":73},{"id":"no-id","length":7,"literal":"scholen","offset":81},{"id":"no-id","length":7,"literal":"scholen","offset":89},{"id":"no-id","length":7,"literal":"scholen","offset":97}]},"summary":{"numLemma":6,"numPOS":6,"numTerms":12,"numWordForms":12}}
\ No newline at end of file
+{"name":"sourceLayer","tagset":{"identifier":"UNKNOWN","longName":"Unknown Tagset","punctuationTags":[],"shortName":"UNK"},"terms":[{"lemma":"onzin","pos":null,"targets":[{"id":"no-id","length":1,"literal":".","offset":59}]},{"lemma":null,"pos":"onzin","targets":[{"id":"no-id","length":1,"literal":".","offset":61}]},{"lemma":null,"pos":null,"targets":[{"id":"no-id","length":1,"literal":".","offset":63}]},{"lemma":"onzin","pos":null,"targets":[{"id":"no-id","length":7,"literal":"scholen","offset":65}]},{"lemma":null,"pos":"onzin","targets":[{"id":"no-id","length":7,"literal":"scholen","offset":73}]},{"lemma":null,"pos":null,"targets":[{"id":"no-id","length":7,"literal":"scholen","offset":81}]},{"lemma":null,"pos":null,"targets":[{"id":"no-id","length":7,"literal":"scholen","offset":89}]},{"lemma":null,"pos":null,"targets":[{"id":"no-id","length":7,"literal":"scholen","offset":97}]},{"lemma":"de","pos":"PD(type=d-p,subtype=art,position=prenom)","targets":[{"id":"enge022vand01_01.TEI.2.text.body.div.lg.7633.s.1.w.11","length":3,"literal":"die","offset":577}]},{"lemma":"droogheid","pos":"NOU-C(number=sg)","targets":[{"id":"enge022vand01_01.TEI.2.text.body.div.lg.7633.s.1.w.12","length":9,"literal":"droecheit","offset":581}]},{"lemma":"rebel","pos":"NOU-C(number=pl)","targets":[{"id":"w.185","length":8,"literal":"rebellen","offset":591}]},{"lemma":"e.","pos":"LET","targets":[{"id":"pc.000005","length":1,"literal":".","offset":599}]}],"wordForms":[{"id":"no-id","length":1,"literal":".","offset":59},{"id":"no-id","length":1,"literal":".","offset":61},{"id":"no-id","length":1,"literal":".","offset":63},{"id":"no-id","length":7,"literal":"scholen","offset":65},{"id":"no-id","length":7,"literal":"scholen","offset":73},{"id":"no-id","length":7,"literal":"scholen","offset":81},{"id":"no-id","length":7,"literal":"scholen","offset":89},{"id":"no-id","length":7,"literal":"scholen","offset":97},{"id":"enge022vand01_01.TEI.2.text.body.div.lg.7633.s.1.w.11","length":3,"literal":"die","offset":577},{"id":"enge022vand01_01.TEI.2.text.body.div.lg.7633.s.1.w.12","length":9,"literal":"droecheit","offset":581},{"id":"w.185","length":8,"literal":"rebellen","offset":591},{"id":"pc.000005","length":1,"literal":".","offset":599}],"preview":{"terms":[{"lemma":"onzin","pos":null,"targets":[{"id":"no-id","length":1,"literal":".","offset":59}]},{"lemma":null,"pos":"onzin","targets":[{"id":"no-id","length":1,"literal":".","offset":61}]},{"lemma":null,"pos":null,"targets":[{"id":"no-id","length":1,"literal":".","offset":63}]},{"lemma":"onzin","pos":null,"targets":[{"id":"no-id","length":7,"literal":"scholen","offset":65}]},{"lemma":null,"pos":"onzin","targets":[{"id":"no-id","length":7,"literal":"scholen","offset":73}]},{"lemma":null,"pos":null,"targets":[{"id":"no-id","length":7,"literal":"scholen","offset":81}]},{"lemma":null,"pos":null,"targets":[{"id":"no-id","length":7,"literal":"scholen","offset":89}]},{"lemma":null,"pos":null,"targets":[{"id":"no-id","length":7,"literal":"scholen","offset":97}]}],"wordforms":[{"id":"no-id","length":1,"literal":".","offset":59},{"id":"no-id","length":1,"literal":".","offset":61},{"id":"no-id","length":1,"literal":".","offset":63},{"id":"no-id","length":7,"literal":"scholen","offset":65},{"id":"no-id","length":7,"literal":"scholen","offset":73},{"id":"no-id","length":7,"literal":"scholen","offset":81},{"id":"no-id","length":7,"literal":"scholen","offset":89},{"id":"no-id","length":7,"literal":"scholen","offset":97}]},"summary":{"numLemma":6,"numPOS":6,"numTerms":12,"numWordForms":12}}
\ No newline at end of file

From ef83671b646d2a94dbee8b715e35dce4c38cb77b Mon Sep 17 00:00:00 2001
From: Vincent Prins <vincent.prins@ivdnt.org>
Date: Wed, 19 Jun 2024 15:17:57 +0200
Subject: [PATCH 14/15] Simplified FileBackedValueTest

Unfortunately, the previous test was non-deterministic. In the end, at the very least this tests reading and writing.
---
 .../test/kotlin/org/ivdnt/galahad/FileBackedValueTest.kt  | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/server/src/test/kotlin/org/ivdnt/galahad/FileBackedValueTest.kt b/server/src/test/kotlin/org/ivdnt/galahad/FileBackedValueTest.kt
index 6b5b260..2619897 100644
--- a/server/src/test/kotlin/org/ivdnt/galahad/FileBackedValueTest.kt
+++ b/server/src/test/kotlin/org/ivdnt/galahad/FileBackedValueTest.kt
@@ -16,13 +16,5 @@ internal class FileBackedValueTest {
         assertEquals("a string", fbv.read<String>())
         fbv.modify<String> { "some characters" }
         assertEquals("some characters", fbv.read<String>())
-
-        // Try to force some concurrent modifications
-        GlobalScope.launch { for (i in 0..100) fbv.modify<String> { "some characters" } }
-        for (i in 0..10) {
-            fbv.modify<String> { "some characters" }
-            fbv.read<String>()
-        }
-        assertEquals("some characters", fbv.read<String>())
     }
 }
\ No newline at end of file

From 285eac0840a5fc3dfeba660ae2a2d698d8800a14 Mon Sep 17 00:00:00 2001
From: Vincent Prins <vincent.prins@ivdnt.org>
Date: Wed, 19 Jun 2024 15:46:16 +0200
Subject: [PATCH 15/15] MISC POS is now handled by the backend

---
 client/src/stores/evaluation/confusion.ts     | 179 +++++--------
 .../evaluate/subviews/ConfusionView.vue       |   3 +-
 .../evaluation/comparison/TermFilter.kt       |  74 +++---
 .../galahad/evaluation/confusion/Confusion.kt | 237 +++++++++---------
 4 files changed, 220 insertions(+), 273 deletions(-)

diff --git a/client/src/stores/evaluation/confusion.ts b/client/src/stores/evaluation/confusion.ts
index 41ed7e1..3898208 100644
--- a/client/src/stores/evaluation/confusion.ts
+++ b/client/src/stores/evaluation/confusion.ts
@@ -1,118 +1,63 @@
-// Libraries & stores
-import { ref } from 'vue'
-import { defineStore } from 'pinia'
-import stores from '@/stores'
-// API & types
-import { UUID } from '@/types/corpora'
-import { ConfusionWrapper } from '@/types/evaluation'
-import * as API from '@/api/evaluation'
-import * as Utils from '@/stores/evaluation/utils'
-
-// Allows for Object.keys(confusion.table), which dislikes null.
-const defaultConfusion = () => ({ table: {} } as ConfusionWrapper)
-
-export const MISC = "OTHER"
-const MISC_REGEX = /^[^A-Z]/
-
-/**
- * Stores and fetches the confusion matrix.
- */
-const confusion = defineStore('confusion', () => {
-    // Fields
-    const loading = ref(false)
-    const confusion = ref(defaultConfusion())
-
-    // Methods
-    /**
-     * Reset it when e.g. the hypothesis or reference is changed.
-     */
-    function reset() {
-        confusion.value = defaultConfusion()
-    }
-
-    /**
-     * Reloads the confusion matrix for the given corpus, hypothesis and reference.
-     * @param corpus The UUID of the corpus.
-     * @param hypothesis Tagger job name as hypothesis layer.
-     * @param reference Tagger job name as reference layer.
-     */
-    function reloadForUUIDHypothesisReference(corpus: UUID, hypothesis: string, reference: string) {
-        Utils.reloadEval(
-            API.getConfusion,
-            reset,
-            "fetch confusion",
-            loading,
-            confusion,
-            stores,
-            corpus,
-            hypothesis,
-            reference
-        ).then(() => {
-            if (Object.keys(confusion?.value?.table).length == 0) {
-                return
-            }
-            combineMisc()
-        })
-    }
-
-    /**
-     * Combine any pos that start with [^A-Z] into a misc category.
-     */
-    function combineMisc() {
-        // The confusion matrix has the structure:
-        // { AA: { AA: {...}, ADP: {...} } } 
-        // So we need to merge on two levels, starting with the inner level
-
-        // Inner level
-        for (const pos in confusion.value.table) {
-            for (const pos2 in confusion.value.table[pos]) {
-                if (MISC_REGEX.test(pos2)) {
-                    // Create MISC if not yet present: e.g. ADP: { MISC: {...} }
-                    if (!confusion.value.table[pos][MISC]) {
-                        confusion.value.table[pos][MISC] = { "count": 0, "samples": [] }
-                    }
-                    // Merge
-                    const pos_to_pos = confusion.value.table[pos][pos2]
-                    confusion.value.table[pos][MISC].count += pos_to_pos.count
-                    confusion.value.table[pos][MISC].samples.push(...pos_to_pos.samples)
-                    delete confusion.value.table[pos][pos2]
-                }
-            }
-        }
-
-
-        // Outer level
-        const misc: Record<string, any> = { }
-
-        for (const pos in confusion.value.table) {
-            if (MISC_REGEX.test(pos)) {
-                for (const pos2 in confusion.value.table[pos]) {
-                    // create misc[pos2] if not yet present
-                    if (!misc[pos2]) {
-                        misc[pos2] = { "count": 0, "samples": [] }
-                    }
-                    // Merge
-                    const pos_to_pos = confusion.value.table[pos][pos2]
-                    misc[pos2].count += pos_to_pos.count
-                    misc[pos2].samples.push(...pos_to_pos.samples)
-                }
-                delete confusion.value.table[pos]
-            }
-        }
-
-        // Commit the matches if there were any
-        if (Object.keys(misc).length > 0) {
-            confusion.value.table[MISC] = misc
-        }
-    }
-
-    // Exports
-    return {
-        // Fields
-        confusion, loading,
-        // Methods
-        reloadForUUIDHypothesisReference, reset,
-    }
-})
-
+// Libraries & stores
+import { ref } from 'vue'
+import { defineStore } from 'pinia'
+import stores from '@/stores'
+// API & types
+import { UUID } from '@/types/corpora'
+import { ConfusionWrapper } from '@/types/evaluation'
+import * as API from '@/api/evaluation'
+import * as Utils from '@/stores/evaluation/utils'
+
+// Allows for Object.keys(confusion.table), which dislikes null.
+const defaultConfusion = () => ({ table: {} } as ConfusionWrapper)
+
+/**
+ * Stores and fetches the confusion matrix.
+ */
+const confusion = defineStore('confusion', () => {
+    // Fields
+    const loading = ref(false)
+    const confusion = ref(defaultConfusion())
+
+    // Methods
+    /**
+     * Reset it when e.g. the hypothesis or reference is changed.
+     */
+    function reset() {
+        confusion.value = defaultConfusion()
+    }
+
+    /**
+     * Reloads the confusion matrix for the given corpus, hypothesis and reference.
+     * @param corpus The UUID of the corpus.
+     * @param hypothesis Tagger job name as hypothesis layer.
+     * @param reference Tagger job name as reference layer.
+     */
+    function reloadForUUIDHypothesisReference(corpus: UUID, hypothesis: string, reference: string) {
+        Utils.reloadEval(
+            API.getConfusion,
+            reset,
+            "fetch confusion",
+            loading,
+            confusion,
+            stores,
+            corpus,
+            hypothesis,
+            reference
+        ).then(() => {
+            if (Object.keys(confusion?.value?.table).length == 0) {
+                return
+            }
+        })
+    }
+
+    // Exports
+    return {
+        // Fields
+        confusion, loading,
+        // Methods
+        reloadForUUIDHypothesisReference, reset,
+    }
+})
+
 export default confusion
\ No newline at end of file
diff --git a/client/src/views/annotate/subviews/evaluate/subviews/ConfusionView.vue b/client/src/views/annotate/subviews/evaluate/subviews/ConfusionView.vue
index 679b361..30c5268 100644
--- a/client/src/views/annotate/subviews/evaluate/subviews/ConfusionView.vue
+++ b/client/src/views/annotate/subviews/evaluate/subviews/ConfusionView.vue
@@ -62,7 +62,6 @@ import { storeToRefs } from 'pinia'
 // API & types
 import { Field } from '@/types/table'
 import { TermComparison, EvaluationEntry } from "@/types/evaluation"
-import { MISC } from '@/stores/evaluation/confusion'
 import * as API from '@/api/evaluation'
 import * as Utils from "@/api/utils"
 // Components
@@ -156,7 +155,7 @@ function strEqual(a: string, b: string) {
  * returns whether this pos should be sorted to the bottom.
  */
 function posToBottom(pos: string) {
-    const posses = ["NO_POS", "Missing match", MISC, "LET", "PUNCT", "PC", "MULTIPLE"]
+    const posses = ["NO_POS", "Missing match", "OTHER", "LET", "PUNCT", "PC", "MULTIPLE"]
     return posses.includes(pos)
 }
 
diff --git a/server/src/main/kotlin/org/ivdnt/galahad/evaluation/comparison/TermFilter.kt b/server/src/main/kotlin/org/ivdnt/galahad/evaluation/comparison/TermFilter.kt
index 8476907..c0b729e 100644
--- a/server/src/main/kotlin/org/ivdnt/galahad/evaluation/comparison/TermFilter.kt
+++ b/server/src/main/kotlin/org/ivdnt/galahad/evaluation/comparison/TermFilter.kt
@@ -1,36 +1,38 @@
-package org.ivdnt.galahad.evaluation.comparison
-
-import org.ivdnt.galahad.data.layer.Term
-
-interface TermFilter {
-    fun filter(term: Term): Boolean
-}
-
-class PosLemmaTermFilter (
-    val posHeadGroup: String? = null,
-    val lemma: String? = null,
-) : TermFilter {
-    val multiplePosFilter: (Term) -> Boolean = { t: Term -> t.isMultiPos }
-    val singlePosFilter: (Term) -> Boolean = { t: Term -> t.posHeadGroupOrDefault == posHeadGroup }
-    val posFilter: (Term) -> Boolean
-    val lemmaFilter: (Term) -> Boolean
-
-    init {
-        posFilter = if (posHeadGroup == null) {
-            { _:Term -> true}
-        } else if (posHeadGroup.lowercase() == "multiple") {
-            multiplePosFilter
-        } else {
-            singlePosFilter
-        }
-
-        lemmaFilter = if (lemma==null) {
-            { _:Term -> true}
-        } else {
-            { t:Term -> t.lemmaOrDefault == lemma}
-        }
-    }
-
-    override fun filter(term: Term): Boolean = posFilter(term) && lemmaFilter(term)
-}
-
+package org.ivdnt.galahad.evaluation.comparison
+
+import org.ivdnt.galahad.data.layer.Term
+import org.ivdnt.galahad.evaluation.confusion.MULTIPLE_POS
+import org.ivdnt.galahad.evaluation.confusion.OTHER_POS
+import org.ivdnt.galahad.evaluation.confusion.OTHER_POS_REGEX
+
+interface TermFilter {
+    fun filter(term: Term): Boolean
+}
+
+class PosLemmaTermFilter (
+    val posHeadGroup: String? = null,
+    val lemma: String? = null,
+) : TermFilter {
+    val multiplePosFilter: (Term) -> Boolean = { t: Term -> t.isMultiPos }
+    val otherPosFilter: (Term) -> Boolean = { t: Term -> t.pos?.matches(OTHER_POS_REGEX.toRegex()) ?: false}
+    val singlePosFilter: (Term) -> Boolean = { t: Term -> t.posHeadGroupOrDefault == posHeadGroup }
+    val posFilter: (Term) -> Boolean
+    val lemmaFilter: (Term) -> Boolean
+
+    init {
+        posFilter = when {
+            (posHeadGroup == null) -> { _:Term -> true}
+            (posHeadGroup.uppercase() == MULTIPLE_POS) -> multiplePosFilter
+            (posHeadGroup.uppercase() == OTHER_POS) -> otherPosFilter
+            else -> singlePosFilter
+        }
+
+        lemmaFilter = when {
+            (lemma==null) ->  { _:Term -> true}
+            else -> { t:Term -> t.lemmaOrDefault == lemma}
+        }
+    }
+
+    override fun filter(term: Term): Boolean = posFilter(term) && lemmaFilter(term)
+}
+
diff --git a/server/src/main/kotlin/org/ivdnt/galahad/evaluation/confusion/Confusion.kt b/server/src/main/kotlin/org/ivdnt/galahad/evaluation/confusion/Confusion.kt
index 8da3326..256c353 100644
--- a/server/src/main/kotlin/org/ivdnt/galahad/evaluation/confusion/Confusion.kt
+++ b/server/src/main/kotlin/org/ivdnt/galahad/evaluation/confusion/Confusion.kt
@@ -1,119 +1,120 @@
-package org.ivdnt.galahad.evaluation.confusion
-
-import com.fasterxml.jackson.annotation.JsonIgnore
-import org.ivdnt.galahad.data.layer.Term
-import org.ivdnt.galahad.evaluation.CsvSampleExporter
-import org.ivdnt.galahad.evaluation.EvaluationEntry
-import org.ivdnt.galahad.evaluation.comparison.TermComparison
-import org.ivdnt.galahad.port.csv.CSVFile
-
-const val MULTIPLE_POS = "MULTIPLE"
-
-/**
- * Generic class for the part of speech confusion of a corpus or document.
- * The idea is to sum up the confusions as we go through the terms one by one using [add].
- */
-open class Confusion(private val truncate: Boolean = true): CsvSampleExporter {
-
-    /**
-     * null-key if there is no match
-     */
-    @JsonIgnore
-    val matrix: MutableMap<Pair<String, String>, EvaluationEntry> = HashMap()
-
-    /**
-     * Confusions as a table, created from [matrix].
-     * The first dimension represents the rows (hypothesis layer), the second dimension the columns (reference layer).
-     */
-    val table: Map<String, Map<String, EvaluationEntry>>
-        get() {
-            val ret = HashMap<String, Map<String, EvaluationEntry>>()
-            matrix.forEach { (pair, evaluationEntry) ->
-                ret.merge(
-                    pair.second, mapOf(Pair(pair.first, evaluationEntry))
-                ) { map1, map2 ->
-                    (map1.asSequence() + map2.asSequence()).distinct()
-                        .groupBy({ it.key }, { it.value })
-                        .mapValues { (_, values) -> values.reduce { a, b -> EvaluationEntry.add(a, b) } }
-                }
-            }
-            return ret
-        }
-
-    private fun getHeaderPossen(): List<String> {
-        val sorted: MutableList<String> = table.values.flatMap { it.keys }.distinct().sorted().toMutableList()
-        // Move MISSING_MATCH to last.
-        if (sorted.remove(TermComparison.MISSING_MATCH)) { // returns true if element was present
-            sorted.add(TermComparison.MISSING_MATCH)
-        }
-        return sorted
-    }
-
-    private fun getSortedTableEntries(): List<Map.Entry<String, Map<String, EvaluationEntry>>> {
-        val sorted = table.entries.sortedBy { it.key }.toMutableList()
-        // Move MISSING_MATCH to last.
-        val missing = sorted.firstOrNull { it.key == TermComparison.MISSING_MATCH }
-        if (missing != null) {
-            sorted.remove(missing)
-            sorted.add(missing)
-        }
-        return sorted
-    }
-
-    fun countsToCSV(): String {
-        if (table.values.isEmpty()) return ""
-        var ret = CSVFile.toCSVHeader(mutableListOf("Reference (down), hypothesis (across)") + getHeaderPossen())
-        getSortedTableEntries().map {
-            CSVFile.toCSVRecord(mutableListOf(it.key) + getHeaderPossen().map { h ->
-                it.value[h]?.count ?: 0
-            }.map { it.toString() })
-        }.forEach { ret += it }
-        return ret
-    }
-
-    /**
-     * CSV representation of all samples where the hypothesis pos and reference pos are [hypoPos] and [refPos].
-     */
-    override fun samplesToCSV(): String {
-        return samplesToCSV(matrix.values.firstOrNull()?.samples)
-    }
-
-    // Cumulative addition functions
-
-    fun add(termComp: TermComparison) {
-        add(
-            termComp.hypoTerm.posHeadGroup ?: Term.NO_POS,
-            termComp.refTerm.posHeadGroup ?: Term.NO_POS,
-            termComp
-        )
-    }
-
-    fun add(other: Confusion) {
-        other.matrix.forEach { (pair, evaluationEntry) ->
-            add(pair.first, pair.second, evaluationEntry)
-        }
-    }
-
-    fun add(hypoPos: String, refPos: String, sample: TermComparison) {
-        add(hypoPos, refPos, 1, listOf(sample))
-    }
-
-    private fun add(pos1: String, pos2: String, count: Int, samples: List<TermComparison>) {
-        add(pos1, pos2, EvaluationEntry(count, samples.toMutableList()))
-    }
-
-    // Base addition function called by the others
-    private fun add(pos1: String, pos2: String, evaluationEntry: EvaluationEntry) {
-        // Complex pos are mapped to a single category
-        if (pos1.contains('+')) {
-            add(MULTIPLE_POS, pos2, evaluationEntry)
-            return
-        }
-        if (pos2.contains('+')) {
-            add(pos1, MULTIPLE_POS, evaluationEntry)
-            return
-        }
-
-        matrix.merge(Pair(pos1, pos2), evaluationEntry) { a, b -> EvaluationEntry.add(a, b, truncate) }
-    }
+package org.ivdnt.galahad.evaluation.confusion
+
+import com.fasterxml.jackson.annotation.JsonIgnore
+import org.ivdnt.galahad.data.layer.Term
+import org.ivdnt.galahad.evaluation.CsvSampleExporter
+import org.ivdnt.galahad.evaluation.EvaluationEntry
+import org.ivdnt.galahad.evaluation.comparison.TermComparison
+import org.ivdnt.galahad.port.csv.CSVFile
+
+const val MULTIPLE_POS = "MULTIPLE"
+const val OTHER_POS = "OTHER"
+const val OTHER_POS_REGEX = """^[^A-Z]"""
+
+/**
+ * Generic class for the part of speech confusion of a corpus or document.
+ * The idea is to sum up the confusions as we go through the terms one by one using [add].
+ */
+open class Confusion(private val truncate: Boolean = true): CsvSampleExporter {
+
+    /**
+     * null-key if there is no match
+     */
+    @JsonIgnore
+    val matrix: MutableMap<Pair<String, String>, EvaluationEntry> = HashMap()
+
+    /**
+     * Confusions as a table, created from [matrix].
+     * The first dimension represents the rows (hypothesis layer), the second dimension the columns (reference layer).
+     */
+    val table: Map<String, Map<String, EvaluationEntry>>
+        get() {
+            val ret = HashMap<String, Map<String, EvaluationEntry>>()
+            matrix.forEach { (pair, evaluationEntry) ->
+                ret.merge(
+                    pair.second, mapOf(Pair(pair.first, evaluationEntry))
+                ) { map1, map2 ->
+                    (map1.asSequence() + map2.asSequence()).distinct()
+                        .groupBy({ it.key }, { it.value })
+                        .mapValues { (_, values) -> values.reduce { a, b -> EvaluationEntry.add(a, b) } }
+                }
+            }
+            return ret
+        }
+
+    private fun getHeaderPossen(): List<String> {
+        val sorted: MutableList<String> = table.values.flatMap { it.keys }.distinct().sorted().toMutableList()
+        // Move MISSING_MATCH to last.
+        if (sorted.remove(TermComparison.MISSING_MATCH)) { // returns true if element was present
+            sorted.add(TermComparison.MISSING_MATCH)
+        }
+        return sorted
+    }
+
+    private fun getSortedTableEntries(): List<Map.Entry<String, Map<String, EvaluationEntry>>> {
+        val sorted = table.entries.sortedBy { it.key }.toMutableList()
+        // Move MISSING_MATCH to last.
+        val missing = sorted.firstOrNull { it.key == TermComparison.MISSING_MATCH }
+        if (missing != null) {
+            sorted.remove(missing)
+            sorted.add(missing)
+        }
+        return sorted
+    }
+
+    fun countsToCSV(): String {
+        if (table.values.isEmpty()) return ""
+        var ret = CSVFile.toCSVHeader(mutableListOf("Reference (down), hypothesis (across)") + getHeaderPossen())
+        getSortedTableEntries().map {
+            CSVFile.toCSVRecord(mutableListOf(it.key) + getHeaderPossen().map { h ->
+                it.value[h]?.count ?: 0
+            }.map { it.toString() })
+        }.forEach { ret += it }
+        return ret
+    }
+
+    /**
+     * CSV representation of all samples where the hypothesis pos and reference pos are [hypoPos] and [refPos].
+     */
+    override fun samplesToCSV(): String {
+        return samplesToCSV(matrix.values.firstOrNull()?.samples)
+    }
+
+    // Cumulative addition functions
+
+    fun add(termComp: TermComparison) {
+        add(
+            termComp.hypoTerm.posHeadGroup ?: Term.NO_POS,
+            termComp.refTerm.posHeadGroup ?: Term.NO_POS,
+            termComp
+        )
+    }
+
+    fun add(other: Confusion) {
+        other.matrix.forEach { (pair, evaluationEntry) ->
+            add(pair.first, pair.second, evaluationEntry)
+        }
+    }
+
+    fun add(hypoPos: String, refPos: String, sample: TermComparison) {
+        add(hypoPos, refPos, 1, listOf(sample))
+    }
+
+    private fun add(pos1: String, pos2: String, count: Int, samples: List<TermComparison>) {
+        add(pos1, pos2, EvaluationEntry(count, samples.toMutableList()))
+    }
+
+    // Base addition function called by the others
+    private fun add(pos1: String, pos2: String, evaluationEntry: EvaluationEntry) {
+        when {
+            // Complex pos are mapped to a single category
+            pos1.contains('+') -> add(MULTIPLE_POS, pos2, evaluationEntry)
+            pos2.contains('+') -> add(pos1, MULTIPLE_POS, evaluationEntry)
+            // Non-alphabetical pos are mapped to a single category "other"
+            pos1.matches(OTHER_POS_REGEX.toRegex()) -> add(OTHER_POS, pos2, evaluationEntry)
+            pos2.matches(OTHER_POS_REGEX.toRegex()) -> add(pos1, OTHER_POS, evaluationEntry)
+            // Otherwise a simple merge
+            else -> matrix.merge(Pair(pos1, pos2), evaluationEntry) { a, b -> EvaluationEntry.add(a, b, truncate) }
+        }
+    }
 }
\ No newline at end of file