EMMR-111 Correct transcription marginalia auto-numbering

unb-libraries · Nov 30, 2023 · 869dada · 869dada
1 parent 03ffb86
commit 869dada
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/custom/modules/emmr_core/emmr_core.module b/custom/modules/emmr_core/emmr_core.module
@@ -235,14 +235,14 @@ function emmr_core_node_presave($node) {
     // Find marginalia item matches.
     preg_match_all('/<trxnmar>(.*?)<\/trxnmar>/', $trans, $matches);
     // Iterate.
-    foreach ($matches as $key => $marginalia) {
+    foreach ($matches[0] as $key => $marginalia) {
+      $i = $key + 1;
       // Get full expression match
-      $original = $marginalia[0] ?? NULL;
+      $original = $marginalia ?? NULL;
       if ($original) {
-        // Get number segment.
+        // Get numbexr segment.
         preg_match_all('/<span class="trxn-number">(.*?)<\/span>/', $original, $number);
         // Build sequential number segment.
-        $i = $key + 1;
         $new = "<span class='trxn-number'>$i</span>";
         // Replace original number segment in original match.
         $replacement = str_replace($number[0], $new, $original, $count);
@@ -253,7 +253,7 @@ function emmr_core_node_presave($node) {
           'value' => $trans,
           'format' => 'unb_libraries',
         ]);
-      }    
+      }
     }
   }
 }

diff --git a/custom/modules/emmr_transcribe/js/build/transMargin.js b/custom/modules/emmr_transcribe/js/build/transMargin.js
diff --git a/.../modules/emmr_transcribe/js/ckeditor5_plugins/transMargin/src/inserttransmargincommand.js b/.../modules/emmr_transcribe/js/ckeditor5_plugins/transMargin/src/inserttransmargincommand.js
@@ -40,7 +40,7 @@ function createTransMargin(writer) {
   // transmarginediting.js.
   const transMargin = writer.createElement('transMargin');
   const transMarginNumber = writer.createElement('transMarginNumber');
-  writer.appendText('X', {}, transMarginNumber);
+  writer.appendText('#', {}, transMarginNumber);
   const transMarginText = writer.createElement('transMarginText');
   let marginaliaText = prompt("Enter transcription marginalia text");
   writer.appendText(marginaliaText, {}, transMarginText);