FIX: Glosses not rendering properly

src/utilities/createGlossLine.js

@@ -0,0 +1,32 @@
+import addEmphasis    from '../utilities/addEmphasis.js'
+import replaceHyphens from '../utilities/replaceHyphens.js'
+
+const glossRegExp  = /(?<gloss>[1-4]|[A-Z]+)/gv
+const numberRegExp = /\b(?<number>sg|du|pl)\b/gv
+
+export default function createGlossLine(
+  data,
+  analysisLang,
+  cssClass,
+  { abbreviations, glosses: glossesOption },
+) {
+
+  const lang = analysisLang ? `lang='${ analysisLang }'` : ``
+
+  const wrapGloss = gloss => {
+    const title = abbreviations[gloss] ? `title='${ abbreviations[gloss] }'` : ``
+    return `<abbr ${ title }>${ gloss }</abbr>`
+  }
+
+  if (glossesOption === true) {
+    data = data
+    .replaceAll(glossRegExp, wrapGloss)
+    .replaceAll(numberRegExp, wrapGloss)
+  }
+
+  data = replaceHyphens(data)
+  data = addEmphasis(data)
+
+  return `<span class='${ cssClass }' ${ lang }>${ data }</span>`
+
+}

src/words/glosses.js

@@ -1,43 +1,20 @@
-import addEmphasis    from '../utilities/addEmphasis.js'
-import replaceHyphens from '../utilities/replaceHyphens.js'
+import createGlossLine from '../utilities/createGlossLine.js'
 
-const glossRegExp  = /(?<gloss>[1-4]|[A-Z]+)/gv
-const numberRegExp = /\b(?<number>sg|du|pl)\b/gv
-
-function createGlossLine(glosses, analysisLang, { abbreviations, glosses: glossesOption }) {
-
-  const lang = analysisLang ? `lang='${ analysisLang }'` : ``
-
-  const wrapGloss = gloss => {
-    const title = abbreviations[gloss] ? `title='${ abbreviations[gloss] }'` : ``
-    return `<abbr ${ title }>${ gloss }</abbr>`
-  }
-
-  if (glossesOption === true) {
-    glosses = glosses
-    .replaceAll(glossRegExp, wrapGloss)
-    .replaceAll(numberRegExp, wrapGloss)
-  }
-
-  glosses = replaceHyphens(glosses)
-  glosses = addEmphasis(glosses)
-
-  return `<span class=glosses ${ lang }>${ glosses }</span>`
-
-}
+const cssClass = `glosses`
 
 export default function createGlosses(data, options) {
 
+
   if (!data) return ``
 
   if (typeof data === `string`) {
-    return createGlossLine(data, options.analysisLang, options)
+    return createGlossLine(data, options.analysisLang, cssClass, options)
   }
 
   let html = ``
 
   for (const lang in data) {
-    html += createGlossLine(data[lang], lang, options)
+    html += createGlossLine(data[lang], lang, cssClass, options)
   }
 
   return html

src/words/literal.js

@@ -1,19 +1,19 @@
-import addEmphasis from '../utilities/addEmphasis.js'
+import createGlossLine from '../utilities/createGlossLine.js'
 
-export default function createLiteral(data, { analysisLang }) {
+const cssClass = `wlt`
+
+export default function createLiteral(data, options) {
 
   if (!data) return ``
 
   if (typeof data === `string`) {
-    const lang = analysisLang ? `lang='${ analysisLang }'` : ``
-    return `<span class=wlt ${ lang }>${ addEmphasis(data) }</span>`
+    return createGlossLine(data, cssClass, options.analysisLang, options)
   }
 
   let html = ``
 
   for (const lang in data) {
-    const tln = data[lang]
-    html += `<span class=wlt lang='${ lang }'>${ addEmphasis(tln) }</span>`
+    html += createGlossLine(data[lang], cssClass, lang, options)
   }
 
   return html