Merge branch 'sillsdev:main' into feature/test-parse-config-rebase/679

Author: AslanRules738

convert/convertBooks.ts

@@ -190,6 +190,10 @@ function isImageMissing(imageSource: string): boolean {
     return !fs.existsSync(path.join('data', 'illustrations', imageSource));
 }
 
+function addParagraphMarkersAroundTableRows(text: string): string {
+    return text.replace(/((?:\\tr [^\n]*\n)+)/g, '\n\\p\n$1\\p\n');
+}
+
 type FilterFunction = (text: string, bcId: string, bookId: string) => string;
 
 const usfmFilterFunctions: FilterFunction[] = [
@@ -199,7 +203,8 @@ const usfmFilterFunctions: FilterFunction[] = [
     convertMarkdownsToMilestones,
     handleNoCaptionFigures,
     removeMissingFigures,
-    trimTrailingWhitespace
+    trimTrailingWhitespace,
+    addParagraphMarkersAroundTableRows
 ];
 
 const htmlFilterFunctions: FilterFunction[] = [updateImgTags, trimTrailingWhitespace];

convert/convertConfig.ts

@@ -523,8 +523,10 @@ export function parseBookCollections(document: Document, verbose: number) {
                 const audioTag = page.getElementsByTagName('audio')[0];
                 if (!audioTag) continue;
                 const fTag = audioTag.getElementsByTagName('f')[0];
-                if (verbose >= 2)
-                    console.log(`... audioTag: ${audioTag.outerHTML}, fTag:${fTag.outerHTML}`);
+                if (verbose >= 2) {
+                    console.log(`... audioTag: ${audioTag.outerHTML}, fTag:${fTag?.outerHTML}`);
+                }
+                if (!fTag) continue;
                 audio.push({
                     num: parseInt(page.attributes.getNamedItem('num')!.value),
                     filename: fTag.innerHTML,

src/lib/components/ScriptureViewSofria.svelte

@@ -277,21 +277,12 @@ LOGGING:
             if (workspace.textType.includes('usfm') && workspace.usfmWrapperType === 'xt') {
                 const references = text.split('; ');
                 for (let i = 0; i < references.length; i++) {
-                    const links = references[i].split('|');
-                    const displayText = links[0];
-                    const referenceText = links.length > 1 ? links[1] : links[0];
-                    const spanElement = document.createElement('span');
-                    spanElement.classList.add('reflink');
-
-                    // TODO: Figure out what really needs to be added to go to references
-                    // For now, just make it look consistent
-                    const aElement = document.createElement('a');
-                    aElement.setAttribute('href', referenceText);
-                    const refText = document.createTextNode(displayText);
-                    aElement.appendChild(refText);
-                    spanElement.appendChild(aElement);
-
-                    workspace.tableCellElement.appendChild(spanElement);
+                    var spanV = document.createElement('span');
+                    spanV.classList.add('reflink');
+                    const refText = generateHTML(text, 'header-ref');
+                    spanV.innerHTML = refText;
+                    spanV.addEventListener('click', onClick, false);
+                    workspace.tableCellElement.appendChild(spanV);
                     if (i < references.length - 1) {
                         const textNode = document.createTextNode('; ');
                         workspace.tableCellElement.appendChild(textNode);
@@ -1272,8 +1263,8 @@ LOGGING:
     }
     function preprocessAction(action: string, workspace: any) {
         // Table ends if row ended and anything other than start row follows it
-        if (!workspace.inRow && workspace.inTable && !(action === 'startRow')) {
-            workspace.inTable = false;
+        if (!workspace.inRow && workspace.insideTable && !(action === 'startRow')) {
+            workspace.insideTable = false;
             workspace.root.appendChild(workspace.tableElement);
         }
     }
@@ -1399,7 +1390,7 @@ LOGGING:
                             workspace.lastPhraseTerminated = false;
                             workspace.currentVideoIndex = 0;
                             workspace.chapterNumText = '';
-                            workspace.inTable = false;
+                            workspace.insideTable = false;
                             workspace.inRow = false;
                             workspace.tableElement = null;
                             workspace.tableRowElement = null;
@@ -2369,10 +2360,10 @@ LOGGING:
                                 console.log('Start Row %o', context.sequences[0].element);
                             }
                             preprocessAction('startRow', workspace);
-                            if (!workspace.inTable) {
+                            if (!workspace.insideTable) {
                                 workspace.tableElement = document.createElement('table');
                                 workspace.tableElement.setAttribute('cellpadding', '5');
-                                workspace.inTable = true;
+                                workspace.insideTable = true;
                             }
                             workspace.inRow = true;
                             workspace.tableRowElement = document.createElement('tr');

src/lib/video/index.ts

@@ -63,7 +63,7 @@ function getYouTubeVideoId(url: string): string {
 export function getEmbeddedVideoUrl(
     videoUrl: string,
     autoplay: boolean,
-    features: { [key: string]: string }
+    features: { [key: string]: any }
 ) {
     let returnUrl = videoUrl;
     const type = getVideoType(videoUrl);
@@ -140,7 +140,7 @@ export function getEmbeddedVideoUrl(
 export function createVideoBlockFromUrl(
     document: Document,
     videoUrl: string,
-    features: { [key: string]: string }
+    features: { [key: string]: any }
 ): HTMLElement {
     const url = getEmbeddedVideoUrl(videoUrl, false, features);
 

src/routes/contents/[id]/+page.svelte

@@ -91,13 +91,12 @@
     }
 
     function getReference(item) {
-        let docSet;
-        let collection;
+        let docSet = $refs.docSet;
+        let collection = docSet.split('_')[1];
         let book;
         let chapter;
         let verse;
         const reference = item.linkTarget.split('.');
-
         if (item.layoutMode && item.layoutCollection?.length > 0) {
             /* 
             Note: have not handled layout modes