Merge remote-tracking branch 'origin/master' into add-date-to-fragment

ElectronicBabylonianLiterature · Sep 7, 2023 · ba52efd · ba52efd
2 parents 03fc524 + ec76f0e
commit ba52efd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/src/fragmentarium/domain/annotation-token.ts b/src/fragmentarium/domain/annotation-token.ts
@@ -66,6 +66,7 @@ export class AnnotationToken {
       | AnnotationTokenType.HasSign
       | AnnotationTokenType.Number
       | AnnotationTokenType.PartiallyBroken
+      | AnnotationTokenType.Damaged
       | AnnotationTokenType.CompoundGrapheme
       | AnnotationTokenType.SurfaceAtLine
       | AnnotationTokenType.RulingDollarLine

diff --git a/src/fragmentarium/domain/annotation.ts b/src/fragmentarium/domain/annotation.ts
@@ -21,6 +21,7 @@ export enum AnnotationTokenType {
   Blank = 'Blank',
   Disabled = 'Disabled',
   PartiallyBroken = 'PartiallyBroken',
+  Damaged = 'Damaged',
   CompletelyBroken = 'CompletelyBroken',
   Predicted = 'Predicted',
   Struct = 'Struct',

diff --git a/src/fragmentarium/ui/image-annotation/annotation-tool/mapTokensToAnnotationTokens.ts b/src/fragmentarium/ui/image-annotation/annotation-tool/mapTokensToAnnotationTokens.ts
@@ -25,25 +25,28 @@ function namedSignTokenToAnnotationToken(
   token: NamedSign,
   path: readonly number[]
 ): AnnotationToken {
+  let tokenType: AnnotationTokenType
   if (effectiveEnclosure(token).includes('BROKEN_AWAY')) {
     return AnnotationToken.initDeactive(
       '',
       AnnotationTokenType.CompletelyBroken,
       path
     )
+  } else if (token.flags.includes('#')) {
+    tokenType = AnnotationTokenType.Damaged
+  } else if (isStrictlyPartiallyEnclosed(token, 'BROKEN_AWAY')) {
+    tokenType = AnnotationTokenType.PartiallyBroken
   } else {
-    const type = isStrictlyPartiallyEnclosed(token, 'BROKEN_AWAY')
-      ? AnnotationTokenType.PartiallyBroken
-      : typeToAnnotationTokenType(token.type)
-    return AnnotationToken.initActive(
-      token.cleanValue,
-      type,
-      token.value,
-      path,
-      token.name,
-      token.subIndex
-    )
+    tokenType = typeToAnnotationTokenType(token.type)
   }
+  return AnnotationToken.initActive(
+    token.cleanValue,
+    tokenType,
+    token.value,
+    path,
+    token.name,
+    token.subIndex
+  )
 }
 
 function compoundGraphemeToAnnotationToken(