From 890d2146a75fc001240f0c076a5b16711a223d8c Mon Sep 17 00:00:00 2001 From: Robert Hunt Date: Fri, 30 Apr 2021 11:00:46 +1200 Subject: [PATCH 01/15] Increase priority of warnings about TSV row IDs --- noticeList.txt | 342 ++++++++++++------------- src/core/disabled-notices.js | 4 +- src/core/notes-tsv7-table-check.js | 4 +- src/core/questions-tsv7-table-check.js | 4 +- src/core/tn-tsv9-table-check.js | 4 +- src/core/twl-tsv6-table-check.js | 4 +- yarn.lock | 6 +- 7 files changed, 185 insertions(+), 183 deletions(-) diff --git a/noticeList.txt b/noticeList.txt index a0328236..05266a29 100644 --- a/noticeList.txt +++ b/noticeList.txt @@ -1,4 +1,4 @@ -Last updated 2021-04-13 11:25:07.378365 by makeNoticeList.py +Last updated 2021-04-27 15:11:28.054884 by makeNoticeList.py Got 490 notices: checkRepoResult.noticeList.push( 997, "Repository doesn’t exist", details, username, repoCode, repoName, location: givenLocation, extra: repoCode from checkRepo.js line 267 languageCode === 'en' || languageCode === 'fr' ? 490 : 190, "Expected header field to contain a mixed-case string", fieldName: `\\$marker`, excerpt: rest, C, V, location: lineLocation from usfm-text-check.js line 947 @@ -27,7 +27,7 @@ Got 490 notices: 992, "Unresolved GIT conflict", characterIndex, excerpt, location: ourLocation from plain-text-check.js line 145 991, "Unresolved GIT conflict", characterIndex, excerpt, location: ourLocation from field-text-check.js line 134 991, "Unresolved GIT conflict", characterIndex, excerpt, location: ourLocation from plain-text-check.js line 149 - 990, "Unable to load file", details: `username=$username`, repoName, filename ], elapsedSeconds: 0 ; from FileCheck.js line 64 + 990, "Unable to load file", details: `username=$username`, repoName, filename ], elapsedSeconds: 0 ; from FileCheck.js line 68 989, "Unable to find/load repository", location: ourLocation from checkRepo.js line 196 988, "Bad TSV header", details: `expected '$EXPECTED_TN_HEADING_LINE'`, excerpt: lines[0], lineNumber: 1, location: ourLocation from tn-tsv9-table-check.js line 125 988, "Bad TSV header", details: `expected '$EXPECTED_TWL_HEADING_LINE'`, excerpt: lines[0], lineNumber: 1, location: ourLocation from twl-tsv6-table-check.js line 117 @@ -37,31 +37,31 @@ Got 490 notices: 986, "Repository doesn’t seem to exist", details: `username=$username`, location: givenLocation, extra: repoName from checkRepo.js line 176 985, `Field does not match schema $errorObject.keyword`, details: errorObject.message, fieldName: errorObject.dataPath, location: ourLocation from manifest-text-check.js line 709 984, `Found wrong number of TSV fields (expected $NUM_EXPECTED_TWL_TSV_FIELDS)`, details: `Found $fields.length field$fields.length === 1 ? '' : 's'`, rowID, location: ourRowLocation from twl-tsv6-row-check.js line 429 - 984, `Found wrong number of TSV fields (expected $NUM_EXPECTED_TN_TSV_FIELDS)`, details: `Found $fields.length field$fields.length === 1 ? '' : 's'`, rowID, location: ourRowLocation from tn-tsv9-row-check.js line 570 + 984, `Found wrong number of TSV fields (expected $NUM_EXPECTED_TN_TSV_FIELDS)`, details: `Found $fields.length field$fields.length === 1 ? '' : 's'`, rowID, location: ourRowLocation from tn-tsv9-row-check.js line 506 984, `Found wrong number of TSV fields (expected $NUM_EXPECTED_QUESTIONS_TSV_FIELDS)`, details: `Found $fields.length field$fields.length === 1 ? '' : 's'`, rowID, location: ourRowLocation from questions-tsv7-row-check.js line 509 984, `Found wrong number of TSV fields (expected $NUM_EXPECTED_NOTES_TSV_FIELDS)`, details: `Found $fields.length field$fields.length === 1 ? '' : 's'`, rowID, location: ourRowLocation from notes-tsv7-row-check.js line 554 - 983, `Wrong number of tabbed fields (expected $NUM_EXPECTED_TN_TSV_FIELDS)`, excerpt: `Found $fields.length field$fields.length === 1 ? '' : 's'`, C, V, rowID, lineNumber: n + 1, location: ourLocation from tn-tsv9-table-check.js line 251 - 983, `Wrong number of tabbed fields (expected $NUM_EXPECTED_TWL_TSV_FIELDS)`, excerpt: `Found $fields.length field$fields.length === 1 ? '' : 's'`, C, V, rowID, lineNumber: n + 1, location: ourLocation from twl-tsv6-table-check.js line 240 - 983, `Wrong number of tabbed fields (expected $NUM_EXPECTED_NOTES_TSV_FIELDS)`, excerpt: `Found $fields.length field$fields.length === 1 ? '' : 's'`, C, V, rowID, lineNumber: n + 1, location: ourLocation from notes-tsv7-table-check.js line 240 - 983, `Wrong number of tabbed fields (expected $NUM_EXPECTED_QUESTIONS_TSV_FIELDS)`, excerpt: `Found $fields.length field$fields.length === 1 ? '' : 's'`, C, V, rowID, lineNumber: n + 1, location: ourLocation from questions-tsv7-table-check.js line 240 + 983, `Wrong number of tabbed fields (expected $NUM_EXPECTED_TN_TSV_FIELDS)`, excerpt: `Found $fields.length field$fields.length === 1 ? '' : 's'`, C, V, rowID, lineNumber: n + 1, location: ourLocation from tn-tsv9-table-check.js line 252 + 983, `Wrong number of tabbed fields (expected $NUM_EXPECTED_TWL_TSV_FIELDS)`, excerpt: `Found $fields.length field$fields.length === 1 ? '' : 's'`, C, V, rowID, lineNumber: n + 1, location: ourLocation from twl-tsv6-table-check.js line 241 + 983, `Wrong number of tabbed fields (expected $NUM_EXPECTED_NOTES_TSV_FIELDS)`, excerpt: `Found $fields.length field$fields.length === 1 ? '' : 's'`, C, V, rowID, lineNumber: n + 1, location: ourLocation from notes-tsv7-table-check.js line 241 + 983, `Wrong number of tabbed fields (expected $NUM_EXPECTED_QUESTIONS_TSV_FIELDS)`, excerpt: `Found $fields.length field$fields.length === 1 ? '' : 's'`, C, V, rowID, lineNumber: n + 1, location: ourLocation from questions-tsv7-table-check.js line 241 979, "Invalid book identifier passed to checkTWL_TSV6DataRow", location: ` '$bookID' in first parameter: $tlcNCerror` from twl-tsv6-row-check.js line 257 - 979, "Invalid book identifier passed to checkTN_TSV9DataRow", location: ` '$bookID' in first parameter: $tlcNCerror` from tn-tsv9-row-check.js line 359 + 979, "Invalid book identifier passed to checkTN_TSV9DataRow", location: ` '$bookID' in first parameter: $tlcNCerror` from tn-tsv9-row-check.js line 298 979, "Invalid book identifier passed to checkQuestionsTSV7DataRow", location: ` '$bookID' in first parameter: $tlcNCerror` from questions-tsv7-row-check.js line 312 979, "Invalid book identifier passed to checkNotesTSV7DataRow", location: ` '$bookID' in first parameter: $tlcNCerror` from notes-tsv7-row-check.js line 345 - 978, "Wrong book identifier", details: `expected '$bookID'`, fieldName: 'Book', rowID, excerpt: B, location: ourRowLocation from tn-tsv9-row-check.js line 374 - 977, "Missing book identifier", characterIndex: 0, rowID, location: ourRowLocation from tn-tsv9-row-check.js line 377 + 978, "Wrong book identifier", details: `expected '$bookID'`, fieldName: 'Book', rowID, excerpt: B, location: ourRowLocation from tn-tsv9-row-check.js line 310 + 977, "Missing book identifier", characterIndex: 0, rowID, location: ourRowLocation from tn-tsv9-row-check.js line 313 976, "Wrong chapter number", details: `expected '$givenC'`, fieldName: 'Reference', rowID, excerpt: C, location: ourRowLocation from twl-tsv6-row-check.js line 275 - 976, "Wrong chapter number", details: `expected '$givenC'`, fieldName: 'Chapter', rowID, excerpt: C, location: ourRowLocation from tn-tsv9-row-check.js line 382 + 976, "Wrong chapter number", details: `expected '$givenC'`, fieldName: 'Chapter', rowID, excerpt: C, location: ourRowLocation from tn-tsv9-row-check.js line 318 976, "Wrong chapter number", details: `expected '$givenC'`, fieldName: 'Reference', rowID, excerpt: C, location: ourRowLocation from questions-tsv7-row-check.js line 330 976, "Wrong chapter number", details: `expected '$givenC'`, fieldName: 'Reference', rowID, excerpt: C, location: ourRowLocation from notes-tsv7-row-check.js line 363 975, "Wrong verse number", details: `expected '$givenV'`, rowID, fieldName: 'Reference', excerpt: V, location: ourRowLocation from twl-tsv6-row-check.js line 311 - 975, "Wrong verse number", details: `expected '$givenV'`, rowID, fieldName: 'Verse', excerpt: V, location: ourRowLocation from tn-tsv9-row-check.js line 414 + 975, "Wrong verse number", details: `expected '$givenV'`, rowID, fieldName: 'Verse', excerpt: V, location: ourRowLocation from tn-tsv9-row-check.js line 350 975, "Wrong verse number", details: `expected '$givenV'`, rowID, fieldName: 'Reference', excerpt: V, location: ourRowLocation from questions-tsv7-row-check.js line 366 975, "Wrong verse number", details: `expected '$givenV'`, rowID, fieldName: 'Reference', excerpt: V, location: ourRowLocation from notes-tsv7-row-check.js line 399 956, "Got empty manifest file", repoName, filename: STANDARD_MANIFEST_FILENAME, location: manifestLocation, extra: `$repoCode MANIFEST` from checkBookPackage.js line 212 956, "Got empty markdown file", repoName, filename, location: markdownLocation, extra: repoCode from checkBookPackage.js line 286 - 950, "tC cannot yet process '*' language code", characterIndex, excerpt, location: ourLocation from notes-links-check.js line 345 - 950, "tC cannot yet process '*' language code", characterIndex, excerpt, location: ourLocation from notes-links-check.js line 514 + 950, "tC cannot yet process '*' language code", characterIndex, excerpt, location: ourLocation from notes-links-check.js line 343 + 950, "tC cannot yet process '*' language code", characterIndex, excerpt, location: ourLocation from notes-links-check.js line 512 947, "Missing manifest.yaml", location: ourLocation, extra: `$repoName MANIFEST` from checkRepo.js line 296 946, "Missing LICENSE.md", location: ourLocation, extra: `$repoName LICENSE` from checkRepo.js line 294 944, `USFM3 Grammar Check ($strictnessString mode) doesn’t pass`, filename, location: ourLocation from BCS-usfm-grammar-check.js line 176 @@ -75,25 +75,25 @@ Got 490 notices: 928, "'dublin_core' key is missing", location: ourLocation from manifest-text-check.js line 672 920, yamlError.message, location: ourLocation ) from yaml-text-check.js line 175 919, "Missing Quote field", fieldName: 'Quote', rowID, location: ourRowLocation from twl-tsv6-row-check.js line 368 - 919, "Missing Quote field", fieldName: 'OrigQuote', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 488 + 919, "Missing Quote field", fieldName: 'OrigQuote', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 424 919, "Missing Quote field", fieldName: 'Quote', rowID, location: ourRowLocation from questions-tsv7-row-check.js line 424 919, "Missing Quote field", fieldName: 'Quote', rowID, location: ourRowLocation from notes-tsv7-row-check.js line 485 - 917, "Unable to find duplicate original language quote in verse text", details: `occurrence=$occurrenceString, passage ►$verseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 340 - 916, "Unable to find original language quote in verse text", details: "quote which starts with a space" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 382 - 916, "Unable to find original language quote in verse text", details: "quote which ends with a space" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 385 - 916, "Unable to find original language quote in verse text", details: "quote which starts with 'word joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 388 - 916, "Unable to find original language quote in verse text", details: "quote which ends with 'word joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 391 - 916, "Unable to find original language quote in verse text", details: "quote which starts with 'zero-width space'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 394 - 916, "Unable to find original language quote in verse text", details: "quote which ends with 'zero-width space'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 397 - 916, "Unable to find original language quote in verse text", details: "quote which starts with 'zero-width joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 400 - 916, "Unable to find original language quote in verse text", details: "quote which ends with 'zero-width joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 403 - 916, "Unable to find original language quote in verse text", details: noBreakSpaceText ? noBreakSpaceText : `passage ►$verseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 406 - 915, "Unable to find original language quote portion in verse text", details: `passage ►$verseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 327 - 914, "Unable to find original language quote portion in the right place in the verse text", details: `passage ►$verseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 324 + 917, "Unable to find duplicate original language quote in verse text", details: `occurrence=$occurrenceString but $actualOccurrencesText occurrence$actualNumOccurrences === 1 ? '' : 's' found, passage ►$verseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 345 + 916, "Unable to find original language quote in verse text", details: "quote which starts with a space" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 386 + 916, "Unable to find original language quote in verse text", details: "quote which ends with a space" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 389 + 916, "Unable to find original language quote in verse text", details: "quote which starts with 'word joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 392 + 916, "Unable to find original language quote in verse text", details: "quote which ends with 'word joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 395 + 916, "Unable to find original language quote in verse text", details: "quote which starts with 'zero-width space'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 398 + 916, "Unable to find original language quote in verse text", details: "quote which ends with 'zero-width space'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 401 + 916, "Unable to find original language quote in verse text", details: "quote which starts with 'zero-width joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 404 + 916, "Unable to find original language quote in verse text", details: "quote which ends with 'zero-width joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 407 + 916, "Unable to find original language quote in verse text", details: noBreakSpaceText ? noBreakSpaceText : `passage ►$verseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 410 + 915, "Unable to find original language quote portion in verse text", details: `passage ►$verseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 329 + 914, "Unable to find original language quote portion in the right place in the verse text", details: `passage ►$verseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 326 912, 'Missing | character in \\w line', lineNumber, C, V, characterIndex, excerpt, location: lineLocation from usfm-text-check.js line 678 911, 'Missing | character in \\w field', details, lineNumber, C, V, characterIndex, excerpt, location: lineLocation from usfm-text-check.js line 734 - 909, "Seems original language quote might not start at the beginning of a word", details: `passage ►$verseText◄`, characterIndex: 0, excerpt, location: ourLocation from orig-quote-check.js line 362 - 908, "Seems original language quote might not finish at the end of a word", details: `passage ►$verseText◄`, characterIndex: fieldText.length, excerpt, location: ourLocation from orig-quote-check.js line 371 + 909, "Seems original language quote might not start at the beginning of a word", details: `passage ►$verseText◄`, characterIndex: 0, excerpt, location: ourLocation from orig-quote-check.js line 366 + 908, "Seems original language quote might not finish at the end of a word", details: `passage ►$verseText◄`, characterIndex: fieldText.length, excerpt, location: ourLocation from orig-quote-check.js line 375 903, "Bad function call: should be given a valid book abbreviation", excerpt: bookID, location: ourLocation from usfm-text-check.js line 1,041 902, "Bad function call: should be given a valid book abbreviation", excerpt: bookID, location: ` (not '$bookID')$generalLocation` ); return checkBookPackageResult; from checkBookPackage.js line 317 900, "Bad parameter: should be given a valid book abbreviation", excerpt: bookIDList, location: ` (not '$bookIDList')` from checkBookPackages.js line 76 @@ -101,24 +101,24 @@ Got 490 notices: 889, `Unable to find/load TA article`, details: `linked from TN $fieldName`, excerpt: fieldText, location: `$ourLocation $filepath` from ta-reference-check.js line 109 888, `Error loading TA article`, details: `linked from TN $fieldName`, excerpt: fieldText, location: `$ourLocation $filepath: $trcGCerror` from ta-reference-check.js line 114 887, `TA article seems empty`, details: `linked from TN $fieldName`, excerpt: fieldText, location: `$ourLocation $filepath` from ta-reference-check.js line 111 - 886, `Unable to find/load TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 367 - 886, `Unable to find/load TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 423 - 886, `Unable to find/load TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 473 - 886, `Unable to find/load TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 536 - 885, `Error loading TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 362 - 885, `Error loading TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 418 - 885, `Error loading TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 468 - 885, `Error loading TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 531 - 884, `TA article seems empty`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 369 - 884, `TA article seems empty`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 425 - 884, `TA article seems empty`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 475 - 884, `TA article seems empty`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 538 - 883, `Unable to find/load TW article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 302 - 883, `Unable to find/load TW article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 587 - 882, `Error loading TW article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 299 - 882, `Error loading TW article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 584 - 881, `TW article seems empty`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 305 - 881, `TW article seems empty`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 590 + 886, `Unable to find/load TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 365 + 886, `Unable to find/load TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 421 + 886, `Unable to find/load TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 471 + 886, `Unable to find/load TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 534 + 885, `Error loading TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 360 + 885, `Error loading TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 416 + 885, `Error loading TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 466 + 885, `Error loading TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 529 + 884, `TA article seems empty`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 367 + 884, `TA article seems empty`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 423 + 884, `TA article seems empty`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 473 + 884, `TA article seems empty`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 536 + 883, `Unable to find/load TW article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 300 + 883, `Unable to find/load TW article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 585 + 882, `Error loading TW article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 297 + 882, `Error loading TW article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 582 + 881, `TW article seems empty`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 303 + 881, `TW article seems empty`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 588 879, `Badly formatted Resource Container link`, excerpt: fieldText, location: `$ourLocation $filepath` from ta-reference-check.js line 96 875, "Unexpected USFM field", details, lineNumber, C, V, excerpt, location: lineLocation from usfm-text-check.js line 781 873, `Mismatched $opener$closer fields`, excerpt: `(left=$lCount.toLocaleString(), right=$rCount.toLocaleString())`, location: fileLocation from usfm-text-check.js line 572 @@ -134,14 +134,14 @@ Got 490 notices: 854, "Unexpected sixth original \\w attribute", details: "expected third 'x-tw'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 841 853, "Unexpected extra original \\w attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 843 852, "Unexpected original \\w x-morph language prefix", details: "Expected 'He,' 'Ar,' or 'Gr,'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 847 - 851, bookID === 'OBS' ? "Unable to load OBS story text" : "Unable to load original language verse text", location: ourLocation from orig-quote-check.js line 296 + 851, bookID === 'OBS' ? "Unable to load OBS story text" : "Unable to load original language verse text", location: ourLocation from orig-quote-check.js line 298 849, `Unexpected '$badCharCombination' character combination`, characterIndex, excerpt, location: ourLocation from field-text-check.js line 373 848, "Unexpected first translation \\w attribute", details: "expected 'x-occurrence'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 853 847, "Unexpected second translation \\w attribute", details: "expected 'x-occurrences'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 856 846, "Unexpected extra translation \\w attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 858 - 845, `Mismatched [[ ]] link characters`, details: `left=$leftCount.toLocaleString(), right=$rightCount.toLocaleString()`, location: ourLocation from notes-links-check.js line 1,210 - 844, `Mismatched [[rc:// ]] link characters`, details: `left=$leftCount.toLocaleString(), right=$rightCount.toLocaleString()`, location: ourLocation from notes-links-check.js line 1,214 - 843, `Mismatched [ ]( ) link characters`, details: `left=$leftCount.toLocaleString(), middle=$middleCount.toLocaleString(), right=$rightCount.toLocaleString()`, location: ourLocation from notes-links-check.js line 1,221 + 845, `Mismatched [[ ]] link characters`, details: `left=$leftCount.toLocaleString(), right=$rightCount.toLocaleString()`, location: ourLocation from notes-links-check.js line 1,208 + 844, `Mismatched [[rc:// ]] link characters`, details: `left=$leftCount.toLocaleString(), right=$rightCount.toLocaleString()`, location: ourLocation from notes-links-check.js line 1,212 + 843, `Mismatched [ ]( ) link characters`, details: `left=$leftCount.toLocaleString(), middle=$middleCount.toLocaleString(), right=$rightCount.toLocaleString()`, location: ourLocation from notes-links-check.js line 1,219 839, "Unexpected first \\k-s attribute", details: "expected 'x-tw'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 877 838, "Unexpected extra \\k-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 879 837, "Seems too few original \\w attributes", details: `Expected 3-4 attributes but only found $attributeCounter`, lineNumber, C, V, excerpt: regexResultArray1[0], location: lineLocation from usfm-text-check.js line 863 @@ -149,6 +149,14 @@ Got 490 notices: 835, "Seems too few original \\k-s attributes", details: `Expected one attribute but only found $attributeCounter`, lineNumber, C, V, excerpt: regexResultArray1[0], location: lineLocation from usfm-text-check.js line 882 834, "Seems too few translation \\zaln-s attributes", details: `Expected six attributes but only found $attributeCounter`, lineNumber, C, V, excerpt: regexResultArray1[0], location: lineLocation from usfm-text-check.js line 914 833, "Unexpected extra \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 911 + 832, C, V, "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from tn-tsv9-table-check.js line 237 + 832, C, V, "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from twl-tsv6-table-check.js line 226 + 832, C, V, "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from notes-tsv7-table-check.js line 226 + 832, C, V, "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from questions-tsv7-table-check.js line 226 + 831, C, V, `Duplicate '$rowID' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation from tn-tsv9-table-check.js line 234 + 831, C, V, `Duplicate '$rowID' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation from twl-tsv6-table-check.js line 223 + 831, C, V, `Duplicate '$rowID' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation from notes-tsv7-table-check.js line 223 + 831, C, V, `Duplicate '$rowID' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation from questions-tsv7-table-check.js line 223 830, "Unexpected first \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 894 829, "Unexpected second \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 897 828, "Unexpected third \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 900 @@ -156,46 +164,46 @@ Got 490 notices: 826, "Unexpected fifth \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 906 825, "Unexpected sixth \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 909 824, `Invalid zero chapter number`, excerpt: C, rowID, fieldName: 'Reference', location: ourRowLocation from twl-tsv6-row-check.js line 280 - 824, `Invalid zero chapter number`, excerpt: C, rowID, fieldName: 'Chapter', location: ourRowLocation from tn-tsv9-row-check.js line 387 + 824, `Invalid zero chapter number`, excerpt: C, rowID, fieldName: 'Chapter', location: ourRowLocation from tn-tsv9-row-check.js line 323 824, `Invalid zero chapter number`, excerpt: C, rowID, fieldName: 'Reference', location: ourRowLocation from questions-tsv7-row-check.js line 335 824, `Invalid zero chapter number`, excerpt: C, rowID, fieldName: 'Reference', location: ourRowLocation from notes-tsv7-row-check.js line 368 823, `Invalid large chapter number`, excerpt: C, rowID, fieldName: 'Reference', location: ourRowLocation from twl-tsv6-row-check.js line 285 - 823, `Invalid large chapter number`, excerpt: C, rowID, fieldName: 'Chapter', location: ourRowLocation from tn-tsv9-row-check.js line 392 + 823, `Invalid large chapter number`, excerpt: C, rowID, fieldName: 'Chapter', location: ourRowLocation from tn-tsv9-row-check.js line 328 823, `Invalid large chapter number`, excerpt: C, rowID, fieldName: 'Reference', location: ourRowLocation from questions-tsv7-row-check.js line 340 823, `Invalid large chapter number`, excerpt: C, rowID, fieldName: 'Reference', location: ourRowLocation from notes-tsv7-row-check.js line 373 822, "Unable to check chapter number", excerpt: C, rowID, fieldName: 'Reference', location: ourRowLocation from twl-tsv6-row-check.js line 298 822, "Expected field to contain an integer", lineNumber, characterIndex: 3, excerpt: `\\c $rest`, C, V, location: lineLocation from usfm-text-check.js line 939 822, "Expected field to contain an integer", characterIndex: 3, excerpt: `\\v $rest`, C, V, location: lineLocation from usfm-text-check.js line 943 - 822, "Unable to check chapter number", excerpt: C, rowID, fieldName: 'Chapter', location: ourRowLocation from tn-tsv9-row-check.js line 402 + 822, "Unable to check chapter number", excerpt: C, rowID, fieldName: 'Chapter', location: ourRowLocation from tn-tsv9-row-check.js line 338 822, "Unable to check chapter number", excerpt: C, rowID, fieldName: 'Reference', location: ourRowLocation from questions-tsv7-row-check.js line 353 822, "Unable to check chapter number", excerpt: C, rowID, fieldName: 'Reference', location: ourRowLocation from notes-tsv7-row-check.js line 386 821, "Bad chapter number", excerpt: C, rowID, fieldName: 'Reference', location: ourRowLocation from twl-tsv6-row-check.js line 304 - 821, "Bad chapter number", excerpt: C, rowID, fieldName: 'Chapter', location: ourRowLocation from tn-tsv9-row-check.js line 407 + 821, "Bad chapter number", excerpt: C, rowID, fieldName: 'Chapter', location: ourRowLocation from tn-tsv9-row-check.js line 343 821, "Bad chapter number", excerpt: C, rowID, fieldName: 'Reference', location: ourRowLocation from questions-tsv7-row-check.js line 359 821, "Bad chapter number", excerpt: C, rowID, fieldName: 'Reference', location: ourRowLocation from notes-tsv7-row-check.js line 392 820, "Missing chapter number", rowID, fieldName: 'Reference', location: ` ?:$V$ourRowLocation` from twl-tsv6-row-check.js line 307 - 820, "Missing chapter number", rowID, fieldName: 'Chapter', location: ` ?:$V$ourRowLocation` from tn-tsv9-row-check.js line 410 + 820, "Missing chapter number", rowID, fieldName: 'Chapter', location: ` ?:$V$ourRowLocation` from tn-tsv9-row-check.js line 346 820, "Missing chapter number", rowID, fieldName: 'Reference', location: ` ?:$V$ourRowLocation` from questions-tsv7-row-check.js line 362 820, "Missing chapter number", rowID, fieldName: 'Reference', location: ` ?:$V$ourRowLocation` from notes-tsv7-row-check.js line 395 819, "Missing compulsory USFM line", excerpt: `missing \\$compulsoryMarker`, location: fileLocation from usfm-text-check.js line 602 814, "Invalid zero verse number", rowID, fieldName: 'Reference', excerpt: V, location: ourRowLocation from twl-tsv6-row-check.js line 316 - 814, "Invalid zero verse number", rowID, fieldName: 'Verse', excerpt: V, location: ourRowLocation from tn-tsv9-row-check.js line 419 + 814, "Invalid zero verse number", rowID, fieldName: 'Verse', excerpt: V, location: ourRowLocation from tn-tsv9-row-check.js line 355 814, "Invalid zero verse number", rowID, fieldName: 'Reference', excerpt: V, location: ourRowLocation from questions-tsv7-row-check.js line 371 814, "Invalid zero verse number", rowID, fieldName: 'Reference', excerpt: V, location: ourRowLocation from notes-tsv7-row-check.js line 404 813, "Invalid large verse number", rowID, fieldName: 'Reference', excerpt: V, location: ourRowLocation from twl-tsv6-row-check.js line 320 - 813, "Invalid large verse number", rowID, fieldName: 'Verse', excerpt: V, location: ourRowLocation from tn-tsv9-row-check.js line 423 + 813, "Invalid large verse number", rowID, fieldName: 'Verse', excerpt: V, location: ourRowLocation from tn-tsv9-row-check.js line 359 813, "Invalid large verse number", rowID, fieldName: 'Reference', excerpt: V, location: ourRowLocation from questions-tsv7-row-check.js line 375 813, "Invalid large verse number", rowID, fieldName: 'Reference', excerpt: V, location: ourRowLocation from notes-tsv7-row-check.js line 408 812, "Unable to check verse number", rowID, fieldName: 'Reference', location: ourRowLocation from twl-tsv6-row-check.js line 322 - 812, "Unable to check verse number", rowID, fieldName: 'Verse', location: ourRowLocation from tn-tsv9-row-check.js line 425 + 812, "Unable to check verse number", rowID, fieldName: 'Verse', location: ourRowLocation from tn-tsv9-row-check.js line 361 812, "Unable to check verse number", rowID, fieldName: 'Reference', location: ourRowLocation from questions-tsv7-row-check.js line 377 812, "Unable to check verse number", rowID, fieldName: 'Reference', location: ourRowLocation from notes-tsv7-row-check.js line 410 811, "Bad verse number", rowID, fieldName: 'Reference', location: ` '$V'$ourRowLocation` from twl-tsv6-row-check.js line 326 - 811, "Bad verse number", rowID, fieldName: 'Verse', location: ` '$V'$ourRowLocation` from tn-tsv9-row-check.js line 429 + 811, "Bad verse number", rowID, fieldName: 'Verse', location: ` '$V'$ourRowLocation` from tn-tsv9-row-check.js line 365 811, "Bad verse number", rowID, fieldName: 'Reference', location: ` '$V'$ourRowLocation` from questions-tsv7-row-check.js line 381 811, "Bad verse number", rowID, fieldName: 'Reference', location: ` '$V'$ourRowLocation` from notes-tsv7-row-check.js line 414 810, "Missing verse number", rowID, fieldName: 'Reference', location: ` after $C:?$ourRowLocation` from twl-tsv6-row-check.js line 329 - 810, "Missing verse number", rowID, fieldName: 'Verse', location: ` after $C:?$ourRowLocation` from tn-tsv9-row-check.js line 432 + 810, "Missing verse number", rowID, fieldName: 'Verse', location: ` after $C:?$ourRowLocation` from tn-tsv9-row-check.js line 368 810, "Missing verse number", rowID, fieldName: 'Reference', location: ` after $C:?$ourRowLocation` from questions-tsv7-row-check.js line 384 810, "Missing verse number", rowID, fieldName: 'Reference', location: ` after $C:?$ourRowLocation` from notes-tsv7-row-check.js line 417 799, "Missing TWLink field", fieldName: 'TWLink', rowID, location: ourRowLocation from twl-tsv6-row-check.js line 417 @@ -203,33 +211,33 @@ Got 490 notices: 797, "Field doesn’t contain proper TW link", details: `should be 'kt', 'names', or 'other'`, fieldName: 'TWLink', rowID, characterIndex, excerpt, location: ourRowLocation from twl-tsv6-row-check.js line 408 796, "Field is only whitespace", fieldName: 'TWLink', rowID, location: ourRowLocation from twl-tsv6-row-check.js line 398 792, `Invalid occurrence field`, fieldName: 'Occurrence', rowID, excerpt: occurrence, location: ourRowLocation from twl-tsv6-row-check.js line 382 - 792, `Invalid occurrence field`, fieldName: 'Occurrence', rowID, excerpt: occurrence, location: ourRowLocation from tn-tsv9-row-check.js line 502 + 792, `Invalid occurrence field`, fieldName: 'Occurrence', rowID, excerpt: occurrence, location: ourRowLocation from tn-tsv9-row-check.js line 438 792, `Invalid occurrence field`, fieldName: 'Occurrence', rowID, excerpt: occurrence, location: ourRowLocation from questions-tsv7-row-check.js line 438 792, `Invalid occurrence field`, fieldName: 'Occurrence', rowID, excerpt: occurrence, location: ourRowLocation from notes-tsv7-row-check.js line 499 791, `Missing occurrence field`, fieldName: 'Occurrence', rowID, location: ourRowLocation from twl-tsv6-row-check.js line 387 - 791, `Missing occurrence field`, fieldName: 'Occurrence', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 507 + 791, `Missing occurrence field`, fieldName: 'Occurrence', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 443 791, `Missing occurrence field`, fieldName: 'Occurrence', rowID, location: ourRowLocation from questions-tsv7-row-check.js line 443 791, `Missing occurrence field`, fieldName: 'Occurrence', rowID, location: ourRowLocation from notes-tsv7-row-check.js line 504 790, C, V, "Missing verse number", rowID, lineNumber: n + 1, location: ` after $C:$lastV$ourLocation` from tn-tsv9-table-check.js line 230 790, C, V, "Missing verse number", rowID, lineNumber: n + 1, location: ` after $C:$lastV$ourLocation` from twl-tsv6-table-check.js line 219 790, C, V, "Missing verse number", rowID, lineNumber: n + 1, location: ` after $C:$lastV$ourLocation` from notes-tsv7-table-check.js line 219 790, C, V, "Missing verse number", rowID, lineNumber: n + 1, location: ` after $C:$lastV$ourLocation` from questions-tsv7-table-check.js line 219 - 789, "Should have a SupportReference when OccurrenceNote has a TA link", details, rowID, fieldName: 'OccurrenceNote', excerpt, location: ourRowLocation from tn-tsv9-row-check.js line 551 + 789, "Should have a SupportReference when OccurrenceNote has a TA link", details, rowID, fieldName: 'OccurrenceNote', excerpt, location: ourRowLocation from tn-tsv9-row-check.js line 487 789, "Should have a SupportReference when Note has a TA link", details, rowID, fieldName: 'OccurrenceNote', excerpt, location: ourRowLocation from notes-tsv7-row-check.js line 534 - 788, "Only 'Just-In-Time Training' TA articles allowed here", fieldName: 'SupportReference', excerpt: supportReference, rowID, location: ourRowLocation from tn-tsv9-row-check.js line 463 + 788, "Only 'Just-In-Time Training' TA articles allowed here", fieldName: 'SupportReference', excerpt: supportReference, rowID, location: ourRowLocation from tn-tsv9-row-check.js line 399 788, "Only 'Just-In-Time Training' TA articles allowed here", fieldName: 'SupportReference', excerpt: supportReference, rowID, location: ourRowLocation from notes-tsv7-row-check.js line 459 - 787, "Link to TA should also be in OccurrenceNote", fieldName: 'SupportReference', excerpt: supportReference, rowID, location: ourRowLocation from tn-tsv9-row-check.js line 468 + 787, "Link to TA should also be in OccurrenceNote", fieldName: 'SupportReference', excerpt: supportReference, rowID, location: ourRowLocation from tn-tsv9-row-check.js line 404 787, "Link to TA should also be in Note", fieldName: 'SupportReference', excerpt: supportReference, rowID, location: ourRowLocation from notes-tsv7-row-check.js line 464 - 786, "Shouldn’t have multiple TA links in OccurrenceNote", details, rowID, fieldName: 'OccurrenceNote', excerpt, location: ourRowLocation from tn-tsv9-row-check.js line 549 + 786, "Shouldn’t have multiple TA links in OccurrenceNote", details, rowID, fieldName: 'OccurrenceNote', excerpt, location: ourRowLocation from tn-tsv9-row-check.js line 485 786, "Shouldn’t have multiple TA links in Note", details, rowID, fieldName: 'OccurrenceNote', excerpt, location: ourRowLocation from notes-tsv7-row-check.js line 532 - 783, `Unable to find/load general link`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,172 - 781, `Linked general article seems empty`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,175 + 783, `Unable to find/load general link`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,170 + 781, `Linked general article seems empty`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,173 779, "Missing row ID field", fieldName: 'Reference', location: ourRowLocation from twl-tsv6-row-check.js line 332 - 779, "Missing row ID field", fieldName: 'Verse', location: ourRowLocation from tn-tsv9-row-check.js line 435 + 779, "Missing row ID field", fieldName: 'Verse', location: ourRowLocation from tn-tsv9-row-check.js line 371 779, "Missing row ID field", fieldName: 'Reference', location: ourRowLocation from questions-tsv7-row-check.js line 387 779, "Missing row ID field", fieldName: 'Reference', location: ourRowLocation from notes-tsv7-row-check.js line 420 778, "Row ID should be exactly 4 characters", details: `not $rowID.length`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from twl-tsv6-row-check.js line 335 - 778, "Row ID should be exactly 4 characters", details: `not $rowID.length`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from tn-tsv9-row-check.js line 438 + 778, "Row ID should be exactly 4 characters", details: `not $rowID.length`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from tn-tsv9-row-check.js line 374 778, "Row ID should be exactly 4 characters", details: `not $rowID.length`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from questions-tsv7-row-check.js line 390 778, "Row ID should be exactly 4 characters", details: `not $rowID.length`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from notes-tsv7-row-check.js line 423 777, `Bad punctuation nesting: $char closing character doesn’t match`, details, lineNumber: n, characterIndex, excerpt, location: ourLocation from plain-text-check.js line 205 @@ -249,19 +257,19 @@ Got 490 notices: 762, "Unable to convert verse bridge numbers to integers", C: chapterNumberString, V: verseNumberString, characterIndex: 3, excerpt: verseNumberString, location: `$CVlocation with $usfmVIerror` from usfm-text-check.js line 449 762, C, V, "Unable to convert verse bridge numbers to integers", lineNumber: n, characterIndex: 3, excerpt: `$rest.substring(0, Math.max(9, excerptLength))$rest.length > excerptLength ? '…' : ''`, location: ourLocation from usfm-text-check.js line 1,148 761, C, V, "Verse number didn’t increment correctly", lineNumber: n, characterIndex: 3, excerpt: `$restRest.substring(0, excerptHalfLength)$restRest.length > excerptHalfLength ? '…' : '' ($lastV ? lastV : '0' → $V)`, location: ourLocation from usfm-text-check.js line 1,169 - 752, "Verse numbers of markdown TN link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,107 + 752, "Verse numbers of markdown TN link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,105 751, "Invalid zero occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, excerpt: occurrence, location: ourRowLocation from twl-tsv6-row-check.js line 373 - 751, "Invalid zero occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, excerpt: occurrence, location: ourRowLocation from tn-tsv9-row-check.js line 493 + 751, "Invalid zero occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, excerpt: occurrence, location: ourRowLocation from tn-tsv9-row-check.js line 429 751, "Invalid zero occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, excerpt: occurrence, location: ourRowLocation from questions-tsv7-row-check.js line 429 751, "Invalid zero occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, excerpt: occurrence, location: ourRowLocation from notes-tsv7-row-check.js line 490 750, "Missing occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, location: ourRowLocation from twl-tsv6-row-check.js line 364 - 750, "Missing occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 484 + 750, "Missing occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 420 750, "Missing occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, location: ourRowLocation from questions-tsv7-row-check.js line 420 750, "Missing occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, location: ourRowLocation from notes-tsv7-row-check.js line 481 - 749, "Markdown image link seems faulty", excerpt: fetchLink, location: ourLocation from notes-links-check.js line 229 - 749, "Markdown image link seems faulty", excerpt: fetchLink, location: ourLocation from notes-links-check.js line 250 - 748, "Error fetching markdown image link", excerpt: fetchLink, location: ourLocation from notes-links-check.js line 238 - 748, "Error fetching markdown image link", excerpt: fetchLink, location: ourLocation from notes-links-check.js line 259 + 749, "Markdown image link seems faulty", excerpt: fetchLink, location: ourLocation from notes-links-check.js line 227 + 749, "Markdown image link seems faulty", excerpt: fetchLink, location: ourLocation from notes-links-check.js line 248 + 748, "Error fetching markdown image link", excerpt: fetchLink, location: ourLocation from notes-links-check.js line 236 + 748, "Error fetching markdown image link", excerpt: fetchLink, location: ourLocation from notes-links-check.js line 257 747, "Bad function call: should be given a valid book abbreviation", excerpt: bookID, location: ` (not '$bookID')$ourLocation` from tn-tsv9-table-check.js line 110 747, "Bad function call: should be given a valid book abbreviation", excerpt: bookID, location: ` (not '$bookID')$ourLocation` from twl-tsv6-table-check.js line 101 747, "Bad function call: should be given a valid book abbreviation", excerpt: bookID, location: ` (not '$bookID')$ourLocation` from notes-tsv7-table-check.js line 101 @@ -270,26 +278,26 @@ Got 490 notices: 746, "Unexpected tag", details: thisTag, excerpt: tags, fieldName: 'Tags', rowID, location: ourRowLocation from notes-tsv7-row-check.js line 444 745, C, V, `Wrong '$B' book identifier (expected '$bookID')`, rowID, lineNumber: n + 1, location: ourLocation from tn-tsv9-table-check.js line 180 744, C, V, "Missing book identifier", rowID, lineNumber: n + 1, location: ourLocation from tn-tsv9-table-check.js line 183 - 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 641 - 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $givenCint`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 707 - 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 836 - 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 888 - 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 996 - 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,048 - 743, "Chapter numbers of markdown TN link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,101 - 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 647 - 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 713 - 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $V2`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 750 - 742, "Verse numbers of markdown Bible link don’t match", details: `$V1a vs $V2`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 789 - 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 842 - 742, "Verse numbers of markdown Bible link don’t match", details: `$V1a vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 894 - 742, "Verse numbers of markdown Bible link don’t match", details: `$V1a vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 946 - 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,002 - 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,054 - 741, "Verse numbers of markdown Bible link range out of order", details: `$V1a to $V1b`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 794 - 741, "Verse numbers of markdown Bible link range out of order", details: `$V1a to $V1b`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 900 - 741, "Verse numbers of markdown Bible link range out of order", details: `$V1a to $V1b`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 952 - 740, "Unrecognized tag", details: thisTag, excerpt: tags, fieldName: 'Tags', rowID, location: ourRowLocation from twl-tsv6-row-check.js line 355 + 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 639 + 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $givenCint`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 705 + 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 834 + 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 886 + 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 994 + 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,046 + 743, "Chapter numbers of markdown TN link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,099 + 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 645 + 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 711 + 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $V2`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 748 + 742, "Verse numbers of markdown Bible link don’t match", details: `$V1a vs $V2`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 787 + 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 840 + 742, "Verse numbers of markdown Bible link don’t match", details: `$V1a vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 892 + 742, "Verse numbers of markdown Bible link don’t match", details: `$V1a vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 944 + 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,000 + 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,052 + 741, "Verse numbers of markdown Bible link range out of order", details: `$V1a to $V1b`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 792 + 741, "Verse numbers of markdown Bible link range out of order", details: `$V1a to $V1b`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 898 + 741, "Verse numbers of markdown Bible link range out of order", details: `$V1a to $V1b`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 950 + 740, "Unrecognized tag", details: `found '$thisTag' but expected 'keyterm' or 'name'`, excerpt: tags, fieldName: 'Tags', rowID, location: ourRowLocation from twl-tsv6-row-check.js line 355 739, C, V, "Missing chapter number", rowID, lineNumber: n + 1, location: ` after $lastC:$V$ourLocation` from tn-tsv9-table-check.js line 207 739, C, V, "Missing chapter number", rowID, lineNumber: n + 1, location: ` after $lastC:$V$ourLocation` from twl-tsv6-table-check.js line 196 739, C, V, "Missing chapter number", rowID, lineNumber: n + 1, location: ` after $lastC:$V$ourLocation` from notes-tsv7-table-check.js line 196 @@ -322,57 +330,49 @@ Got 490 notices: 733, C, V, "Receding verse number", details: `'$V' after '$lastV for chapter $C`, rowID, lineNumber: n + 1, excerpt: V, location: ourLocation from twl-tsv6-table-check.js line 209 733, C, V, "Receding verse number", details: `'$V' after '$lastV for chapter $C`, rowID, lineNumber: n + 1, excerpt: V, location: ourLocation from notes-tsv7-table-check.js line 209 733, C, V, "Receding verse number", details: `'$V' after '$lastV for chapter $C`, rowID, lineNumber: n + 1, excerpt: V, location: ourLocation from questions-tsv7-table-check.js line 209 - 730, C, V, "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from tn-tsv9-table-check.js line 236 - 730, C, V, "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from twl-tsv6-table-check.js line 225 - 730, C, V, "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from notes-tsv7-table-check.js line 225 - 730, C, V, "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from questions-tsv7-table-check.js line 225 - 729, C, V, `Duplicate '$rowID' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation from tn-tsv9-table-check.js line 234 - 729, C, V, `Duplicate '$rowID' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation from twl-tsv6-table-check.js line 223 - 729, C, V, `Duplicate '$rowID' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation from notes-tsv7-table-check.js line 223 - 729, C, V, `Duplicate '$rowID' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation from questions-tsv7-table-check.js line 223 724, C, V, "Unable to convert chapter number to integer", lineNumber: n, characterIndex: 3, excerpt: `$rest.substring(0, excerptHalfLength)$rest.length > excerptHalfLength ? '…' : ''`, location: ourLocation from usfm-text-check.js line 1,121 723, C, V, "Unable to convert verse number to integer", lineNumber: n, characterIndex: 3, excerpt: `$rest.substring(0, excerptHalfLength)$rest.length > excerptHalfLength ? '…' : ''`, location: ourLocation from usfm-text-check.js line 1,134 720, C, V, "Unable to convert internal verse number to integer", lineNumber: n, characterIndex: 3, excerpt: `$restRest.substring(0, excerptHalfLength)$restRest.length > excerptHalfLength ? '…' : ''`, location: ourLocation from usfm-text-check.js line 1,165 716, `Misplaced $rightChar character`, excerpt: regexResultArray[0], location: ourLocation from field-text-check.js line 427 711, "Expected compulsory content", C, V, lineNumber, characterIndex: marker.length, location: ` after \\$marker marker$lineLocation` from usfm-text-check.js line 972 703, C, V, "Unexpected CarriageReturn character", lineNumber: n, characterIndex, excerpt, location: ourLocation from usfm-text-check.js line 1,085 - 669, "Unexpected language code in link", details: `resource language code is '$languageCode'`, excerpt: Lg, location: ourLocation from notes-links-check.js line 623 - 656, "Bad chapter number in markdown TN link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,123 - 655, "Bad story number in markdown OBS help link", details: `$linkBookCode $linkChapterInt vs $numStories chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 655 - 655, "Bad chapter number in markdown Bible help link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 669 - 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $givenCint vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 729 - 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 766 - 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 807 - 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 858 - 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 916 - 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,018 - 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,070 - 654, "Bad verse number in markdown TN link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,125 - 653, "Bad frame number in markdown OBS help link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numFramesThisStory verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 657 - 653, "Bad verse number in markdown Bible help link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 671 - 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $givenCint:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 731 - 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 768 - 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 809 - 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 860 - 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 918 - 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $givenC:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 968 - 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,020 - 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,072 - 649, "Unusual [[ ]] link(s)—not a recognized TA or TW link", details: `need to carefully check $leftoverLinksList2.length === 1 ? '"' + leftoverLinksList2[0] + '"' : JSON.stringify(leftoverLinksList2)`, location: ourLocation from notes-links-check.js line 1,202 - 648, "Unusual [ ]( ) link(s)—not a recognized Bible or TA, TN, or TW link", details: `need to carefully check $leftoverLinksList1.length === 1 ? '"' + leftoverLinksList1[0] + '"' : JSON.stringify(leftoverLinksList1)`, location: ourLocation from notes-links-check.js line 1,194 + 669, "Unexpected language code in link", details: `resource language code is '$languageCode'`, excerpt: Lg, location: ourLocation from notes-links-check.js line 621 + 656, "Bad chapter number in markdown TN link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,121 + 655, "Bad story number in markdown OBS help link", details: `$linkBookCode $linkChapterInt vs $numStories chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 653 + 655, "Bad chapter number in markdown Bible help link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 667 + 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $givenCint vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 727 + 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 764 + 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 805 + 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 856 + 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 914 + 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,016 + 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,068 + 654, "Bad verse number in markdown TN link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,123 + 653, "Bad frame number in markdown OBS help link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numFramesThisStory verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 655 + 653, "Bad verse number in markdown Bible help link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 669 + 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $givenCint:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 729 + 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 766 + 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 807 + 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 858 + 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 916 + 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $givenC:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 966 + 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,018 + 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,070 + 649, "Unusual [[ ]] link(s)—not a recognized TA or TW link", details: `need to carefully check $leftoverLinksList2.length === 1 ? '"' + leftoverLinksList2[0] + '"' : JSON.stringify(leftoverLinksList2)`, location: ourLocation from notes-links-check.js line 1,200 + 648, "Unusual [ ]( ) link(s)—not a recognized Bible or TA, TN, or TW link", details: `need to carefully check $leftoverLinksList1.length === 1 ? '"' + leftoverLinksList1[0] + '"' : JSON.stringify(leftoverLinksList1)`, location: ourLocation from notes-links-check.js line 1,192 644, "USFM3 Grammar Check (relaxed mode) doesn’t pass either", location: fileLocation from usfm-text-check.js line 259 638, "Only found whitespace", location: ourLocation from field-text-check.js line 113 638, "Only found whitespace", location: ourLocation from plain-text-check.js line 133 603, "USFM marker doesn’t end with space", C, V, lineNumber, characterIndex, excerpt, location: ourLocation from usfm-text-check.js line 1,055 - 601, "Unable to load", details: `username=$username error=$gcUHBerror`, OBSPathname, location: ourLocation, extra: OBSRepoName from orig-quote-check.js line 118 - 601, "Unable to load", details: `username=$username error=$gcUHBerror`, filename, location: ourLocation, extra: originalLanguageRepoName from orig-quote-check.js line 151 - 601, "Unable to load", details: `username=$username error=$gcUGNTerror`, filename, location: ourLocation, extra: originalLanguageRepoName from orig-quote-check.js line 159 + 601, "Unable to load", details: `username=$username error=$gcUHBerror`, OBSPathname, location: ourLocation, extra: OBSRepoName from orig-quote-check.js line 120 + 601, "Unable to load", details: `username=$username error=$gcUHBerror`, filename, location: ourLocation, extra: originalLanguageRepoName from orig-quote-check.js line 153 + 601, "Unable to load", details: `username=$username error=$gcUGNTerror`, filename, location: ourLocation, extra: originalLanguageRepoName from orig-quote-check.js line 161 600, `$regexResultsArray.length link target$regexResultsArray.length === 1 ? ' is' : 's are' still being checked…`, location: ourLocation from field-link-check.js line 171 583, "Unexpected newLine character", characterIndex, excerpt, location: ourLocation from field-text-check.js line 241 582, "Unexpected carriageReturn character", characterIndex, excerpt, location: ourLocation from field-text-check.js line 247 581, "Unexpected non-break space (uA0) character", characterIndex, excerpt, location: ourLocation from field-text-check.js line 253 580, "Unexpected narrow non-break space (u202F) character", excerpt, location: ourLocation ; from field-text-check.js line 259 - 555, "Possible missing chapter number in markdown Bible link", excerpt: totalLink, location: ourLocation from notes-links-check.js line 701 + 555, "Possible missing chapter number in markdown Bible link", excerpt: totalLink, location: ourLocation from notes-links-check.js line 699 552, C, V, "Invalid zero verse number", details: `for chapter $C`, rowID, lineNumber: n + 1, excerpt: V, location: ourLocation from tn-tsv9-table-check.js line 214 552, C, V, "Invalid zero verse number", details: `for chapter $C`, rowID, lineNumber: n + 1, excerpt: V, location: ourLocation from twl-tsv6-table-check.js line 203 552, C, V, "Invalid zero verse number", details: `for chapter $C`, rowID, lineNumber: n + 1, excerpt: V, location: ourLocation from notes-tsv7-table-check.js line 203 @@ -386,8 +386,8 @@ Got 490 notices: 519, "Missing expected USFM line", excerpt: `missing \\$expectedMarker`, location: fileLocation from usfm-text-check.js line 606 518, "Missing expected USFM line", excerpt: `missing \\$expectedMarker`, location: fileLocation from usfm-text-check.js line 614 517, "Missing expected USFM line", excerpt: `missing \\$expectedMarker`, location: fileLocation from usfm-text-check.js line 610 - 450, "Resource container link should have '*' language code", details: `not '$foundLanguageCode'`, characterIndex, excerpt, location: ourLocation from notes-links-check.js line 340 - 450, "Resource container link should have '*' language code", details: `not '$foundLanguageCode'`, characterIndex, excerpt, location: ourLocation from notes-links-check.js line 509 + 450, "Resource container link should have '*' language code", details: `not '$foundLanguageCode'`, characterIndex, excerpt, location: ourLocation from notes-links-check.js line 338 + 450, "Resource container link should have '*' language code", details: `not '$foundLanguageCode'`, characterIndex, excerpt, location: ourLocation from notes-links-check.js line 507 444, "Shouldn’t have consecutive word fields without a space", details: badCount > 1 ? details + `$badCount occurrences found in line` : details, lineNumber, C, V, characterIndex, excerpt, location: lineLocation from usfm-text-check.js line 648 441, `Unknown linkType parameter`, excerpt: linkType from field-link-check.js line 153 439, "Error fetching link", location: ` $fetchLink` from field-link-check.js line 45 @@ -395,39 +395,39 @@ Got 490 notices: 401, `Unexpected content after \\$marker marker`, C, V, lineNumber, characterIndex: marker.length, excerpt: rest, location: lineLocation from usfm-text-check.js line 970 399, C, V, "Useless paragraph marker", lineNumber: n, characterIndex: 1, details: `'\\$lastMarker' before '\\$marker'`, location: ourLocation from usfm-text-check.js line 1,189 378, `Possible mismatched '$thisField' markdown formatting pairs`, details: `$count.toLocaleString() total occurrence$count === 1 ? '' : 's'`, characterIndex, excerpt, location: ourLocation from markdown-text-check.js line 380 - 375, "Divider without surrounding snippet", location: ourLocation from orig-quote-check.js line 333 + 375, "Divider without surrounding snippet", location: ourLocation from orig-quote-check.js line 335 374, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1 ? '' : 's' found`, fieldName: 'TWLink', rowID, location: ourRowLocation from twl-tsv6-row-check.js line 395 - 374, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1 ? '' : 's' found`, fieldName: 'SupportReference', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 472 - 374, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1 ? '' : 's' found`, fieldName: 'GLQuote', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 514 - 374, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1 ? '' : 's' found`, fieldName: 'OccurrenceNote', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 529 + 374, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1 ? '' : 's' found`, fieldName: 'SupportReference', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 408 + 374, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1 ? '' : 's' found`, fieldName: 'GLQuote', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 450 + 374, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1 ? '' : 's' found`, fieldName: 'OccurrenceNote', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 465 374, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1 ? '' : 's' found`, fieldName: 'Question', rowID, location: ourRowLocation from questions-tsv7-row-check.js line 450 374, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1 ? '' : 's' found`, fieldName: 'Response', rowID, location: ourRowLocation from questions-tsv7-row-check.js line 475 374, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1 ? '' : 's' found`, fieldName: 'SupportReference', characterIndex, rowID, location: ourRowLocation from notes-tsv7-row-check.js line 469 374, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1 ? '' : 's' found`, fieldName: 'Note', rowID, location: ourRowLocation from notes-tsv7-row-check.js line 511 - 373, "Field is only whitespace", fieldName: 'SupportReference', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 456 - 373, "Field is only whitespace", fieldName: 'GLQuote', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 517 - 373, "Field is only whitespace", fieldName: 'OccurrenceNote', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 532 + 373, "Field is only whitespace", fieldName: 'SupportReference', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 392 + 373, "Field is only whitespace", fieldName: 'GLQuote', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 453 + 373, "Field is only whitespace", fieldName: 'OccurrenceNote', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 468 373, "Field is only whitespace", fieldName: 'Question', rowID, location: ourRowLocation from questions-tsv7-row-check.js line 453 373, "Field is only whitespace", fieldName: 'Response', rowID, location: ourRowLocation from questions-tsv7-row-check.js line 478 373, "Field is only whitespace", fieldName: 'SupportReference', rowID, location: ourRowLocation from notes-tsv7-row-check.js line 450 373, "Field is only whitespace", fieldName: 'Note', rowID, location: ourRowLocation from notes-tsv7-row-check.js line 514 - 199, "Markdown image link has no alternative text", excerpt: totalLink, location: ourLocation from notes-links-check.js line 227 - 199, "Markdown image link has no alternative text", excerpt: totalLink, location: ourLocation from notes-links-check.js line 246 - 348, "Markdown image link has no title text", excerpt: totalLink, location: ourLocation from notes-links-check.js line 248 + 348, "Markdown image link has no title text", excerpt: totalLink, location: ourLocation from notes-links-check.js line 246 312, 'Possible unclosed footnote', details, lineNumber, C, V, location: lineLocation from usfm-text-check.js line 702 301, `Unexpected whitespace after \\$marker marker`, C, V, lineNumber, characterIndex: marker.length, excerpt: rest, location: lineLocation from usfm-text-check.js line 968 287, `Not enough links (expected $linkOptions.expectedCount link$linkOptions.expectedCount === 1 ? "" : "s")`, location: ` (only found $regexResultsArray.length)$ourLocation` from field-link-check.js line 167 282, "Nesting of header levels seems confused", details: `recent indent levels=$JSON.stringify(indentLevels) but now $numLeadingSpaces`, lineNumber: n, characterIndex: 0, location: ourLocation ; from markdown-text-check.js line 332 - 274, "Missing OccurrenceNote field", fieldName: 'OccurrenceNote', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 556 + 274, "Missing OccurrenceNote field", fieldName: 'OccurrenceNote', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 492 274, "Missing Question field", fieldName: 'Question', rowID, location: ourRowLocation from questions-tsv7-row-check.js line 470 274, "Missing Response field", fieldName: 'Response', rowID, location: ourRowLocation from questions-tsv7-row-check.js line 495 274, "Missing Note field", fieldName: 'Note', rowID, location: ourRowLocation from notes-tsv7-row-check.js line 540 256, "Possibly missing current copyright year", details: `possibly expecting '$fullYearString'`, username, repoName, filename, location: markdownLocation, extra: repoCode from checkBookPackage.js line 279 252, "Markdown headers should be preceded by a blank line", lineNumber: n, location: ourLocation ; from markdown-text-check.js line 282 251, "Markdown headers should be followed by a blank line", lineNumber: n, location: ourLocation ; from markdown-text-check.js line 288 - 250, "Multiple blank lines are not expected in markdown", lineNumber: n, location: ourLocation ; from markdown-text-check.js line 199 + 250, "Multiple blank lines are not expected in markdown", lineNumber: n, location: ourLocation ; from markdown-text-check.js line 349 224, "Multiple unexpected double spaces", details: `$doubleCount occurrences—only first is displayed`, excerpt, location: ourLocation ; from field-text-check.js line 231 218, "Using deprecated USFM marker", excerpt: `\\$deprecatedMarker`, location: fileLocation from usfm-text-check.js line 617 + 199, "Markdown image link has no alternative text", excerpt: totalLink, location: ourLocation from notes-links-check.js line 225 + 199, "Markdown image link has no alternative text", excerpt: totalLink, location: ourLocation from notes-links-check.js line 244 195, `Unexpected $punctChar character at start of line`, characterIndex, excerpt, location: ourLocation from field-text-check.js line 324 193, `Unexpected $punctChar character at end of line`, excerpt, location: ourLocation ; from field-text-check.js line 360 192, `Unexpected space after $punctChar character`, excerpt, location: ourLocation ; from field-text-check.js line 342 @@ -436,35 +436,35 @@ Got 490 notices: 178, "Unexpected space after ellipse character", characterIndex, excerpt, location: ourLocation from field-text-check.js line 275 177, `Unexpected doubled $punctChar characters`, excerpt, location: ourLocation ; from field-text-check.js line 294 176, "Row ID should start with a lowercase letter", characterIndex: 0, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from twl-tsv6-row-check.js line 342 - 176, "Row ID should start with a lowercase letter", characterIndex: 0, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from tn-tsv9-row-check.js line 445 + 176, "Row ID should start with a lowercase letter", characterIndex: 0, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from tn-tsv9-row-check.js line 381 176, "Row ID should start with a lowercase letter", characterIndex: 0, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from questions-tsv7-row-check.js line 397 176, "Row ID should start with a lowercase letter", characterIndex: 0, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from notes-tsv7-row-check.js line 430 175, "Row ID should end with a lowercase letter or digit", characterIndex: 3, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from twl-tsv6-row-check.js line 344 - 175, "Row ID should end with a lowercase letter or digit", characterIndex: 3, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from tn-tsv9-row-check.js line 447 + 175, "Row ID should end with a lowercase letter or digit", characterIndex: 3, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from tn-tsv9-row-check.js line 383 175, "Row ID should end with a lowercase letter or digit", characterIndex: 3, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from questions-tsv7-row-check.js line 399 175, "Row ID should end with a lowercase letter or digit", characterIndex: 3, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from notes-tsv7-row-check.js line 432 174, "Row ID characters should only be lowercase letters, digits, or hypen", fieldName: 'ID', characterIndex: 1, rowID, excerpt: rowID, location: ourRowLocation from twl-tsv6-row-check.js line 346 - 174, "Row ID characters should only be lowercase letters, digits, or hypen", fieldName: 'ID', characterIndex: 1, rowID, excerpt: rowID, location: ourRowLocation from tn-tsv9-row-check.js line 449 + 174, "Row ID characters should only be lowercase letters, digits, or hypen", fieldName: 'ID', characterIndex: 1, rowID, excerpt: rowID, location: ourRowLocation from tn-tsv9-row-check.js line 385 174, "Row ID characters should only be lowercase letters, digits, or hypen", fieldName: 'ID', characterIndex: 1, rowID, excerpt: rowID, location: ourRowLocation from questions-tsv7-row-check.js line 401 174, "Row ID characters should only be lowercase letters, digits, or hypen", fieldName: 'ID', characterIndex: 1, rowID, excerpt: rowID, location: ourRowLocation from notes-tsv7-row-check.js line 434 173, "Row ID characters should only be lowercase letters, digits, or hypen", fieldName: 'ID', characterIndex: 2, rowID, excerpt: rowID, location: ourRowLocation from twl-tsv6-row-check.js line 348 - 173, "Row ID characters should only be lowercase letters, digits, or hypen", fieldName: 'ID', characterIndex: 2, rowID, excerpt: rowID, location: ourRowLocation from tn-tsv9-row-check.js line 451 + 173, "Row ID characters should only be lowercase letters, digits, or hypen", fieldName: 'ID', characterIndex: 2, rowID, excerpt: rowID, location: ourRowLocation from tn-tsv9-row-check.js line 387 173, "Row ID characters should only be lowercase letters, digits, or hypen", fieldName: 'ID', characterIndex: 2, rowID, excerpt: rowID, location: ourRowLocation from questions-tsv7-row-check.js line 403 173, "Row ID characters should only be lowercase letters, digits, or hypen", fieldName: 'ID', characterIndex: 2, rowID, excerpt: rowID, location: ourRowLocation from notes-tsv7-row-check.js line 436 172, "Header levels should only increment by one", lineNumber: n, characterIndex: 0, location: ourLocation ; from markdown-text-check.js line 301 - 159, "Should use proper ellipse character (not periods)", characterIndex, excerpt, location: ourLocation from orig-quote-check.js line 257 - 158, `Unexpected space(s) beside divider $discontiguousDivider`, characterIndex, excerpt, location: ourLocation from orig-quote-check.js line 266 - 156, "Unexpected space(s) beside ellipse characters", characterIndex, excerpt, location: ourLocation from orig-quote-check.js line 280 - 152, "Should http link be https", excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,183 + 159, "Should use proper ellipse character (not periods)", characterIndex, excerpt, location: ourLocation from orig-quote-check.js line 259 + 158, `Unexpected space(s) beside divider $discontiguousDivider`, characterIndex, excerpt, location: ourLocation from orig-quote-check.js line 268 + 156, "Unexpected space(s) beside ellipse characters", characterIndex, excerpt, location: ourLocation from orig-quote-check.js line 282 + 152, "Should http link be https", excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,181 148, "'checking' key is missing", location: ourLocation from manifest-text-check.js line 676 - 144, "Unknown Bible book name in TN link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 1,092 - 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 632 - 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 691 - 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 828 - 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 879 - 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 937 - 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 987 - 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 1,039 + 144, "Unknown Bible book name in TN link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 1,090 + 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 630 + 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 689 + 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 826 + 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 877 + 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 935 + 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 985 + 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 1,037 138, "File ends with additional blank line(s)", characterIndex, excerpt, location: ourLocation from plain-text-check.js line 165 124, "Unexpected double spaces", excerpt, location: ourLocation ; from field-text-check.js line 229 111, `Bad options for checkFieldLinks: expectedCount=$linkOptions.expectedCount but allowedCount=$linkOptions.allowedCount` from field-link-check.js line 135 @@ -480,13 +480,13 @@ Got 490 notices: 93, "Unexpected trailing space(s) before line break", characterIndex, excerpt, location: ourLocation from field-text-check.js line 208 87, C, V, "Expected \\toc2 line to follow \\toc1", lineNumber: n, characterIndex: 1, details: `not '\\$lastMarker'`, location: ourLocation from usfm-text-check.js line 1,182 87, C, V, "Expected \\toc3 line to follow \\toc2", lineNumber: n, characterIndex: 1, details: `not '\\$lastMarker'`, location: ourLocation from usfm-text-check.js line 1,184 - 82, `Error loading general link`, details: "please double-check link—there may be no problem", excerpt: totalLink, location: `$ourLocation: $trcGCerror` from notes-links-check.js line 1,168 + 82, `Error loading general link`, details: "please double-check link—there may be no problem", excerpt: totalLink, location: `$ourLocation: $trcGCerror` from notes-links-check.js line 1,166 67, C: chapterNumberString, V: `$v`, "Verse appears to be left out", location: CVlocation from usfm-text-check.js line 473 64, "Unexpected leading space(s) after break", characterIndex, excerpt, location: ourLocation from field-text-check.js line 157 63, "Unexpected leading space(s) after line break", characterIndex, excerpt, location: ourLocation from field-text-check.js line 162 - 50, "Is this quote/occurrence correct???", details: `Occurrence=$occurrence`, excerpt: fieldText, location: ourLocation from orig-quote-check.js line 306 - 32, `Untested general/outside link`, details: "please manually double-check link—probably no problem", excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,149 - 20, "Note that 'disableAllLinkFetchingFlag' was set so link targets were not checked", location: ourLocation from tn-tsv9-table-check.js line 263 - 20, "Note that 'disableAllLinkFetchingFlag' was set so link targets were not checked", location: ourLocation from twl-tsv6-table-check.js line 252 - 20, "Note that 'disableAllLinkFetchingFlag' was set so link targets were not checked", location: ourLocation from notes-tsv7-table-check.js line 252 - 20, "Note that 'disableAllLinkFetchingFlag' was set so link targets were not checked", location: ourLocation from questions-tsv7-table-check.js line 252 + 50, "Is this quote/occurrence correct???", details: `Occurrence=$occurrence`, excerpt: fieldText, location: ourLocation from orig-quote-check.js line 308 + 32, `Untested general/outside link`, details: "please manually double-check link—probably no problem", excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,147 + 20, "Note that 'disableAllLinkFetchingFlag' was set so link targets were not checked", location: ourLocation from tn-tsv9-table-check.js line 264 + 20, "Note that 'disableAllLinkFetchingFlag' was set so link targets were not checked", location: ourLocation from twl-tsv6-table-check.js line 253 + 20, "Note that 'disableAllLinkFetchingFlag' was set so link targets were not checked", location: ourLocation from notes-tsv7-table-check.js line 253 + 20, "Note that 'disableAllLinkFetchingFlag' was set so link targets were not checked", location: ourLocation from questions-tsv7-table-check.js line 253 diff --git a/src/core/disabled-notices.js b/src/core/disabled-notices.js index 64d646a6..bb5ae872 100644 --- a/src/core/disabled-notices.js +++ b/src/core/disabled-notices.js @@ -10,7 +10,7 @@ import { debugLog, userLog } from './utilities'; */ -// const DISABLED_NOTICES_VERSION_STRING = '0.3.3'; +// const DISABLED_NOTICES_VERSION_STRING = '0.3.4'; const disabledNotices = [ @@ -44,6 +44,8 @@ const disabledNotices = [ { repoCode: 'TA', filename: 'translate/translate-textvariants/01.md', message: "Unexpected space after [ character", }, // 192 { repoCode: 'TA', filename: 'translate/translate-formatsignals/01.md', message: "Unexpected space after ( character", }, // 192 + { repoCode: 'TN', excerpt: ' brackets [ ] to ind', message: "Unexpected space after [ character", }, // 192 + // This file has a space-separated list of typical quotation symbols { repoCode: 'TA', filename: 'translate/figs-quotemarks/01.md', message: "Unexpected space after “ character", lineNumber: 3, }, // 192 { repoCode: 'TA', filename: 'translate/figs-quotemarks/01.md', message: "Unexpected space after “ character", lineNumber: 16, }, // 192 diff --git a/src/core/notes-tsv7-table-check.js b/src/core/notes-tsv7-table-check.js index 49a5dd98..ceda46d9 100644 --- a/src/core/notes-tsv7-table-check.js +++ b/src/core/notes-tsv7-table-check.js @@ -220,10 +220,10 @@ export async function checkNotesTSV7Table(languageCode, repoCode, bookID, filena if (rowID) { if (rowIDListForVerse.includes(rowID)) - addNoticePartial({ priority: 729, C, V, message: `Duplicate '${rowID}' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation }); + addNoticePartial({ priority: 831, C, V, message: `Duplicate '${rowID}' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation }); rowIDListForVerse.push(rowID); } else - addNoticePartial({ priority: 730, C, V, message: "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); + addNoticePartial({ priority: 832, C, V, message: "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); lastC = C; lastV = V; diff --git a/src/core/questions-tsv7-table-check.js b/src/core/questions-tsv7-table-check.js index ca8f3417..2c3ccbe8 100644 --- a/src/core/questions-tsv7-table-check.js +++ b/src/core/questions-tsv7-table-check.js @@ -220,10 +220,10 @@ export async function checkQuestionsTSV7Table(languageCode, repoCode, bookID, fi if (rowID) { if (rowIDListForVerse.includes(rowID)) - addNoticePartial({ priority: 729, C, V, message: `Duplicate '${rowID}' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation }); + addNoticePartial({ priority: 831, C, V, message: `Duplicate '${rowID}' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation }); rowIDListForVerse.push(rowID); } else - addNoticePartial({ priority: 730, C, V, message: "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); + addNoticePartial({ priority: 832, C, V, message: "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); lastC = C; lastV = V; diff --git a/src/core/tn-tsv9-table-check.js b/src/core/tn-tsv9-table-check.js index 84a3aa1c..13b13760 100644 --- a/src/core/tn-tsv9-table-check.js +++ b/src/core/tn-tsv9-table-check.js @@ -231,10 +231,10 @@ export async function checkTN_TSV9Table(languageCode, repoCode, bookID, filename if (rowID) { if (rowIDListForVerse.includes(rowID)) - addNoticePartial({ priority: 729, C, V, message: `Duplicate '${rowID}' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation }); + addNoticePartial({ priority: 831, C, V, message: `Duplicate '${rowID}' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation }); rowIDListForVerse.push(rowID); } else - addNoticePartial({ priority: 730, C, V, message: "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); + addNoticePartial({ priority: 832, C, V, message: "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); lastB = B; lastC = C; lastV = V; diff --git a/src/core/twl-tsv6-table-check.js b/src/core/twl-tsv6-table-check.js index 71ceb254..9c59d21e 100644 --- a/src/core/twl-tsv6-table-check.js +++ b/src/core/twl-tsv6-table-check.js @@ -220,10 +220,10 @@ export async function checkTWL_TSV6Table(languageCode, repoCode, bookID, filenam if (rowID) { if (rowIDListForVerse.includes(rowID)) - addNoticePartial({ priority: 729, C, V, message: `Duplicate '${rowID}' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation }); + addNoticePartial({ priority: 831, C, V, message: `Duplicate '${rowID}' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation }); rowIDListForVerse.push(rowID); } else - addNoticePartial({ priority: 730, C, V, message: "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); + addNoticePartial({ priority: 832, C, V, message: "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); lastC = C; lastV = V; diff --git a/yarn.lock b/yarn.lock index 218377e2..134f130f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4968,9 +4968,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.719: - version "1.3.720" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.720.tgz#f5d66df8754d993006b7b2ded15ff7738c58bd94" - integrity sha512-B6zLTxxaOFP4WZm6DrvgRk8kLFYWNhQ5TrHMC0l5WtkMXhU5UbnvWoTfeEwqOruUSlNMhVLfYak7REX6oC5Yfw== + version "1.3.722" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.722.tgz#621657f79e7f65402e71aa3403bc941f3a4af0a0" + integrity sha512-aAsc906l0RBsVTsGTK+KirVfey9eNtxyejdkbNzkISGxb7AFna3Kf0qvsp8tMttzBt9Bz3HddtYQ+++/PZtRYA== elliptic@^6.5.3: version "6.5.4" From 36bf759fd16e239bd2e43fc403b21736dfafdb50 Mon Sep 17 00:00:00 2001 From: Robert Hunt Date: Tue, 4 May 2021 11:47:54 +1200 Subject: [PATCH 02/15] Upgrade missing row ID priorities again --- noticeList.txt | 18 +- package.json | 2 +- src/core/notes-tsv7-row-check.js | 2 +- src/core/notes-tsv7-table-check.js | 2 +- src/core/questions-tsv7-row-check.js | 2 +- src/core/questions-tsv7-table-check.js | 2 +- src/core/tn-tsv9-row-check.js | 2 +- src/core/tn-tsv9-table-check.js | 2 +- src/core/twl-tsv6-row-check.js | 2 +- src/core/twl-tsv6-table-check.js | 2 +- yarn.lock | 323 ++++++++++++++----------- 11 files changed, 198 insertions(+), 161 deletions(-) diff --git a/noticeList.txt b/noticeList.txt index 05266a29..1ce4d9e4 100644 --- a/noticeList.txt +++ b/noticeList.txt @@ -1,4 +1,4 @@ -Last updated 2021-04-27 15:11:28.054884 by makeNoticeList.py +Last updated 2021-05-04 11:41:19.924359 by makeNoticeList.py Got 490 notices: checkRepoResult.noticeList.push( 997, "Repository doesn’t exist", details, username, repoCode, repoName, location: givenLocation, extra: repoCode from checkRepo.js line 267 languageCode === 'en' || languageCode === 'fr' ? 490 : 190, "Expected header field to contain a mixed-case string", fieldName: `\\$marker`, excerpt: rest, C, V, location: lineLocation from usfm-text-check.js line 947 @@ -149,10 +149,10 @@ Got 490 notices: 835, "Seems too few original \\k-s attributes", details: `Expected one attribute but only found $attributeCounter`, lineNumber, C, V, excerpt: regexResultArray1[0], location: lineLocation from usfm-text-check.js line 882 834, "Seems too few translation \\zaln-s attributes", details: `Expected six attributes but only found $attributeCounter`, lineNumber, C, V, excerpt: regexResultArray1[0], location: lineLocation from usfm-text-check.js line 914 833, "Unexpected extra \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 911 - 832, C, V, "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from tn-tsv9-table-check.js line 237 - 832, C, V, "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from twl-tsv6-table-check.js line 226 - 832, C, V, "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from notes-tsv7-table-check.js line 226 - 832, C, V, "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from questions-tsv7-table-check.js line 226 + 832, C, V, "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from tn-tsv9-table-check.js line 237 + 832, C, V, "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from twl-tsv6-table-check.js line 226 + 832, C, V, "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from notes-tsv7-table-check.js line 226 + 832, C, V, "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from questions-tsv7-table-check.js line 226 831, C, V, `Duplicate '$rowID' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation from tn-tsv9-table-check.js line 234 831, C, V, `Duplicate '$rowID' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation from twl-tsv6-table-check.js line 223 831, C, V, `Duplicate '$rowID' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation from notes-tsv7-table-check.js line 223 @@ -206,6 +206,10 @@ Got 490 notices: 810, "Missing verse number", rowID, fieldName: 'Verse', location: ` after $C:?$ourRowLocation` from tn-tsv9-row-check.js line 368 810, "Missing verse number", rowID, fieldName: 'Reference', location: ` after $C:?$ourRowLocation` from questions-tsv7-row-check.js line 384 810, "Missing verse number", rowID, fieldName: 'Reference', location: ` after $C:?$ourRowLocation` from notes-tsv7-row-check.js line 417 + 808, "Missing row ID field", fieldName: 'Reference', location: ourRowLocation from twl-tsv6-row-check.js line 332 + 808, "Missing row ID field", fieldName: 'Verse', location: ourRowLocation from tn-tsv9-row-check.js line 371 + 808, "Missing row ID field", fieldName: 'Reference', location: ourRowLocation from questions-tsv7-row-check.js line 387 + 808, "Missing row ID field", fieldName: 'Reference', location: ourRowLocation from notes-tsv7-row-check.js line 420 799, "Missing TWLink field", fieldName: 'TWLink', rowID, location: ourRowLocation from twl-tsv6-row-check.js line 417 798, "Field doesn’t contain expected TW link", details: `should start with 'rc://*/tw/dict/bible/'`, fieldName: 'TWLink', rowID, location: ourRowLocation from twl-tsv6-row-check.js line 401 797, "Field doesn’t contain proper TW link", details: `should be 'kt', 'names', or 'other'`, fieldName: 'TWLink', rowID, characterIndex, excerpt, location: ourRowLocation from twl-tsv6-row-check.js line 408 @@ -232,10 +236,6 @@ Got 490 notices: 786, "Shouldn’t have multiple TA links in Note", details, rowID, fieldName: 'OccurrenceNote', excerpt, location: ourRowLocation from notes-tsv7-row-check.js line 532 783, `Unable to find/load general link`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,170 781, `Linked general article seems empty`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,173 - 779, "Missing row ID field", fieldName: 'Reference', location: ourRowLocation from twl-tsv6-row-check.js line 332 - 779, "Missing row ID field", fieldName: 'Verse', location: ourRowLocation from tn-tsv9-row-check.js line 371 - 779, "Missing row ID field", fieldName: 'Reference', location: ourRowLocation from questions-tsv7-row-check.js line 387 - 779, "Missing row ID field", fieldName: 'Reference', location: ourRowLocation from notes-tsv7-row-check.js line 420 778, "Row ID should be exactly 4 characters", details: `not $rowID.length`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from twl-tsv6-row-check.js line 335 778, "Row ID should be exactly 4 characters", details: `not $rowID.length`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from tn-tsv9-row-check.js line 374 778, "Row ID should be exactly 4 characters", details: `not $rowID.length`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from questions-tsv7-row-check.js line 390 diff --git a/package.json b/package.json index d0e6eec9..39c6be21 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "uw-content-validation", "description": "Functions for Checking Door43.org Scriptural Content/Resources.", - "version": "2.1.2", + "version": "2.1.3_alpha1", "private": false, "homepage": "https://unfoldingword.github.io/uw-content-validation/", "repository": { diff --git a/src/core/notes-tsv7-row-check.js b/src/core/notes-tsv7-row-check.js index e0f66813..a70090ea 100644 --- a/src/core/notes-tsv7-row-check.js +++ b/src/core/notes-tsv7-row-check.js @@ -417,7 +417,7 @@ export async function checkNotesTSV7DataRow(languageCode, repoCode, line, bookID addNoticePartial({ priority: 810, message: "Missing verse number", rowID, fieldName: 'Reference', location: ` after ${C}:?${ourRowLocation}` }); if (!rowID.length) - addNoticePartial({ priority: 779, message: "Missing row ID field", fieldName: 'Reference', location: ourRowLocation }); + addNoticePartial({ priority: 808, message: "Missing row ID field", fieldName: 'Reference', location: ourRowLocation }); else { if (rowID.length !== 4) { addNoticePartial({ priority: 778, message: "Row ID should be exactly 4 characters", details: `not ${rowID.length}`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation }); diff --git a/src/core/notes-tsv7-table-check.js b/src/core/notes-tsv7-table-check.js index ceda46d9..3409e295 100644 --- a/src/core/notes-tsv7-table-check.js +++ b/src/core/notes-tsv7-table-check.js @@ -223,7 +223,7 @@ export async function checkNotesTSV7Table(languageCode, repoCode, bookID, filena addNoticePartial({ priority: 831, C, V, message: `Duplicate '${rowID}' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation }); rowIDListForVerse.push(rowID); } else - addNoticePartial({ priority: 832, C, V, message: "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); + addNoticePartial({ priority: 832, C, V, message: "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); lastC = C; lastV = V; diff --git a/src/core/questions-tsv7-row-check.js b/src/core/questions-tsv7-row-check.js index c3ddec8d..197e2bc4 100644 --- a/src/core/questions-tsv7-row-check.js +++ b/src/core/questions-tsv7-row-check.js @@ -384,7 +384,7 @@ export async function checkQuestionsTSV7DataRow(languageCode, repoCode, line, bo addNoticePartial({ priority: 810, message: "Missing verse number", rowID, fieldName: 'Reference', location: ` after ${C}:?${ourRowLocation}` }); if (!rowID.length) - addNoticePartial({ priority: 779, message: "Missing row ID field", fieldName: 'Reference', location: ourRowLocation }); + addNoticePartial({ priority: 808, message: "Missing row ID field", fieldName: 'Reference', location: ourRowLocation }); else { if (rowID.length !== 4) { addNoticePartial({ priority: 778, message: "Row ID should be exactly 4 characters", details: `not ${rowID.length}`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation }); diff --git a/src/core/questions-tsv7-table-check.js b/src/core/questions-tsv7-table-check.js index 2c3ccbe8..d1b0f190 100644 --- a/src/core/questions-tsv7-table-check.js +++ b/src/core/questions-tsv7-table-check.js @@ -223,7 +223,7 @@ export async function checkQuestionsTSV7Table(languageCode, repoCode, bookID, fi addNoticePartial({ priority: 831, C, V, message: `Duplicate '${rowID}' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation }); rowIDListForVerse.push(rowID); } else - addNoticePartial({ priority: 832, C, V, message: "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); + addNoticePartial({ priority: 832, C, V, message: "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); lastC = C; lastV = V; diff --git a/src/core/tn-tsv9-row-check.js b/src/core/tn-tsv9-row-check.js index e9a2ced8..fc64f38a 100644 --- a/src/core/tn-tsv9-row-check.js +++ b/src/core/tn-tsv9-row-check.js @@ -368,7 +368,7 @@ export async function checkTN_TSV9DataRow(languageCode, repoCode, line, bookID, addNoticePartial({ priority: 810, message: "Missing verse number", rowID, fieldName: 'Verse', location: ` after ${C}:?${ourRowLocation}` }); if (!rowID.length) - addNoticePartial({ priority: 779, message: "Missing row ID field", fieldName: 'Verse', location: ourRowLocation }); + addNoticePartial({ priority: 808, message: "Missing row ID field", fieldName: 'Verse', location: ourRowLocation }); else { if (rowID.length !== 4) { addNoticePartial({ priority: 778, message: "Row ID should be exactly 4 characters", details: `not ${rowID.length}`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation }); diff --git a/src/core/tn-tsv9-table-check.js b/src/core/tn-tsv9-table-check.js index 13b13760..f463e37d 100644 --- a/src/core/tn-tsv9-table-check.js +++ b/src/core/tn-tsv9-table-check.js @@ -234,7 +234,7 @@ export async function checkTN_TSV9Table(languageCode, repoCode, bookID, filename addNoticePartial({ priority: 831, C, V, message: `Duplicate '${rowID}' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation }); rowIDListForVerse.push(rowID); } else - addNoticePartial({ priority: 832, C, V, message: "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); + addNoticePartial({ priority: 832, C, V, message: "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); lastB = B; lastC = C; lastV = V; diff --git a/src/core/twl-tsv6-row-check.js b/src/core/twl-tsv6-row-check.js index 75e2eac9..0fe1674d 100644 --- a/src/core/twl-tsv6-row-check.js +++ b/src/core/twl-tsv6-row-check.js @@ -329,7 +329,7 @@ export async function checkTWL_TSV6DataRow(languageCode, repoCode, line, bookID, addNoticePartial({ priority: 810, message: "Missing verse number", rowID, fieldName: 'Reference', location: ` after ${C}:?${ourRowLocation}` }); if (!rowID.length) - addNoticePartial({ priority: 779, message: "Missing row ID field", fieldName: 'Reference', location: ourRowLocation }); + addNoticePartial({ priority: 808, message: "Missing row ID field", fieldName: 'Reference', location: ourRowLocation }); else { if (rowID.length !== 4) { addNoticePartial({ priority: 778, message: "Row ID should be exactly 4 characters", details: `not ${rowID.length}`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation }); diff --git a/src/core/twl-tsv6-table-check.js b/src/core/twl-tsv6-table-check.js index 9c59d21e..bcbcb4b9 100644 --- a/src/core/twl-tsv6-table-check.js +++ b/src/core/twl-tsv6-table-check.js @@ -223,7 +223,7 @@ export async function checkTWL_TSV6Table(languageCode, repoCode, bookID, filenam addNoticePartial({ priority: 831, C, V, message: `Duplicate '${rowID}' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation }); rowIDListForVerse.push(rowID); } else - addNoticePartial({ priority: 832, C, V, message: "Missing ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); + addNoticePartial({ priority: 832, C, V, message: "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); lastC = C; lastV = V; diff --git a/yarn.lock b/yarn.lock index 134f130f..ac648328 100644 --- a/yarn.lock +++ b/yarn.lock @@ -39,10 +39,10 @@ dependencies: "@babel/highlight" "^7.12.13" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.13.15", "@babel/compat-data@^7.13.8", "@babel/compat-data@^7.9.0": - version "7.13.15" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.15.tgz#7e8eea42d0b64fda2b375b22d06c605222e848f4" - integrity sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA== +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.13.15", "@babel/compat-data@^7.13.8", "@babel/compat-data@^7.14.0", "@babel/compat-data@^7.9.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz#a901128bce2ad02565df95e6ecbf195cf9465919" + integrity sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q== "@babel/core@7.9.0": version "7.9.0" @@ -67,19 +67,19 @@ source-map "^0.5.0" "@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.4.5", "@babel/core@^7.7.5": - version "7.13.16" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.16.tgz#7756ab24396cc9675f1c3fcd5b79fcce192ea96a" - integrity sha512-sXHpixBiWWFti0AV2Zq7avpTasr6sIAu7Y396c608541qAU2ui4a193m0KSQmfPSKFZLnQ3cvlKDOm3XkuXm3Q== + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.0.tgz#47299ff3ec8d111b493f1a9d04bf88c04e728d88" + integrity sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw== dependencies: "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.13.16" + "@babel/generator" "^7.14.0" "@babel/helper-compilation-targets" "^7.13.16" - "@babel/helper-module-transforms" "^7.13.14" - "@babel/helpers" "^7.13.16" - "@babel/parser" "^7.13.16" + "@babel/helper-module-transforms" "^7.14.0" + "@babel/helpers" "^7.14.0" + "@babel/parser" "^7.14.0" "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.15" - "@babel/types" "^7.13.16" + "@babel/traverse" "^7.14.0" + "@babel/types" "^7.14.0" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -87,12 +87,12 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.13.16", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0": - version "7.13.16" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.16.tgz#0befc287031a201d84cdfc173b46b320ae472d14" - integrity sha512-grBBR75UnKOcUWMp8WoDxNsWCFl//XCK6HWTrBQKTr5SV9f5g0pNOjdyzi/DTBv12S9GnYPInIXQBTky7OXEMg== +"@babel/generator@^7.14.0", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.0.tgz#0f35d663506c43e4f10898fbda0d752ec75494be" + integrity sha512-C6u00HbmsrNPug6A+CiNl8rEys7TsdcXwg12BHi2ca5rUfAs3+UwZsuDQSXnc+wCElCXMB8gMaJ3YXDdh8fAlg== dependencies: - "@babel/types" "^7.13.16" + "@babel/types" "^7.14.0" jsesc "^2.5.1" source-map "^0.5.0" @@ -111,7 +111,7 @@ "@babel/helper-explode-assignable-expression" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.13", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.13.8", "@babel/helper-compilation-targets@^7.8.7": +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.13.8", "@babel/helper-compilation-targets@^7.8.7": version "7.13.16" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c" integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA== @@ -121,15 +121,16 @@ browserslist "^4.14.5" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.8.3": - version "7.13.11" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz#30d30a005bca2c953f5653fc25091a492177f4f6" - integrity sha512-ays0I7XYq9xbjCSvT+EvysLgfc3tOkwCULHjrnscGT3A9qD4sk3wXnJ3of0MAWsWGjdinFvajHU2smYuqXKMrw== +"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.14.0", "@babel/helper-create-class-features-plugin@^7.8.3": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.0.tgz#38367d3dab125b12f94273de418f4df23a11a15e" + integrity sha512-6pXDPguA5zC40Y8oI5mqr+jEUpjMJonKvknvA+vD8CYDz5uuXEwWBK8sRAsE/t3gfb1k15AQb9RhwpscC4nUJQ== dependencies: + "@babel/helper-annotate-as-pure" "^7.12.13" "@babel/helper-function-name" "^7.12.13" - "@babel/helper-member-expression-to-functions" "^7.13.0" + "@babel/helper-member-expression-to-functions" "^7.13.12" "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/helper-replace-supers" "^7.13.0" + "@babel/helper-replace-supers" "^7.13.12" "@babel/helper-split-export-declaration" "^7.12.13" "@babel/helper-create-regexp-features-plugin@^7.12.13": @@ -185,7 +186,7 @@ "@babel/traverse" "^7.13.15" "@babel/types" "^7.13.16" -"@babel/helper-member-expression-to-functions@^7.13.0", "@babel/helper-member-expression-to-functions@^7.13.12": +"@babel/helper-member-expression-to-functions@^7.13.12": version "7.13.12" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72" integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw== @@ -199,19 +200,19 @@ dependencies: "@babel/types" "^7.13.12" -"@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.13.14", "@babel/helper-module-transforms@^7.9.0": - version "7.13.14" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz#e600652ba48ccb1641775413cb32cfa4e8b495ef" - integrity sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g== +"@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.14.0", "@babel/helper-module-transforms@^7.9.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz#8fcf78be220156f22633ee204ea81f73f826a8ad" + integrity sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw== dependencies: "@babel/helper-module-imports" "^7.13.12" "@babel/helper-replace-supers" "^7.13.12" "@babel/helper-simple-access" "^7.13.12" "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/helper-validator-identifier" "^7.12.11" + "@babel/helper-validator-identifier" "^7.14.0" "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.13" - "@babel/types" "^7.13.14" + "@babel/traverse" "^7.14.0" + "@babel/types" "^7.14.0" "@babel/helper-optimise-call-expression@^7.12.13": version "7.12.13" @@ -244,7 +245,7 @@ "@babel/traverse" "^7.13.0" "@babel/types" "^7.13.12" -"@babel/helper-simple-access@^7.12.13", "@babel/helper-simple-access@^7.13.12": +"@babel/helper-simple-access@^7.13.12": version "7.13.12" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6" integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA== @@ -265,10 +266,10 @@ dependencies: "@babel/types" "^7.12.13" -"@babel/helper-validator-identifier@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" - integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== +"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288" + integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A== "@babel/helper-validator-option@^7.12.17": version "7.12.17" @@ -285,28 +286,28 @@ "@babel/traverse" "^7.13.0" "@babel/types" "^7.13.0" -"@babel/helpers@^7.13.16", "@babel/helpers@^7.9.0": - version "7.13.17" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.17.tgz#b497c7a00e9719d5b613b8982bda6ed3ee94caf6" - integrity sha512-Eal4Gce4kGijo1/TGJdqp3WuhllaMLSrW6XcL0ulyUAQOuxHcCafZE8KHg9857gcTehsm/v7RcOx2+jp0Ryjsg== +"@babel/helpers@^7.14.0", "@babel/helpers@^7.9.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62" + integrity sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg== dependencies: "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.17" - "@babel/types" "^7.13.17" + "@babel/traverse" "^7.14.0" + "@babel/types" "^7.14.0" "@babel/highlight@^7.0.0", "@babel/highlight@^7.12.13", "@babel/highlight@^7.8.3": - version "7.13.10" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1" - integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg== + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf" + integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg== dependencies: - "@babel/helper-validator-identifier" "^7.12.11" + "@babel/helper-validator-identifier" "^7.14.0" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.16", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0": - version "7.13.16" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.16.tgz#0f18179b0448e6939b1f3f5c4c355a3a9bcdfd37" - integrity sha512-6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.0.tgz#2f0ebfed92bcddcc8395b91f1895191ce2760380" + integrity sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q== "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12": version "7.13.12" @@ -342,6 +343,14 @@ "@babel/helper-create-class-features-plugin" "^7.13.0" "@babel/helper-plugin-utils" "^7.13.0" +"@babel/plugin-proposal-class-static-block@^7.13.11": + version "7.13.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.13.11.tgz#6fcbba4a962702c17e5371a0c7b39afde186d703" + integrity sha512-fJTdFI4bfnMjvxJyNuaf8i9mVcZ0UhetaGEUHaHV9KEnibLugJkZAtXikR8KcYj+NYmI4DZMS8yQAyg+hvfSqg== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-class-static-block" "^7.12.13" + "@babel/plugin-proposal-decorators@7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz#2156860ab65c5abf068c3f67042184041066543e" @@ -459,6 +468,16 @@ "@babel/helper-create-class-features-plugin" "^7.13.0" "@babel/helper-plugin-utils" "^7.13.0" +"@babel/plugin-proposal-private-property-in-object@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.0.tgz#b1a1f2030586b9d3489cc26179d2eb5883277636" + integrity sha512-59ANdmEwwRUkLjB7CRtwJxxwtjESw+X2IePItA+RGQh+oy5RmpCh/EvVVvh5XQc3yxsm5gtv0+i9oBZhaDNVTg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-create-class-features-plugin" "^7.14.0" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-private-property-in-object" "^7.14.0" + "@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba" @@ -488,6 +507,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" +"@babel/plugin-syntax-class-static-block@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.12.13.tgz#8e3d674b0613e67975ceac2776c97b60cafc5c9c" + integrity sha512-ZmKQ0ZXR0nYpHZIIuj9zE7oIqCx2hw9TKi+lIo73NNrMPAZGHfS92/VRV0ZmPj6H2ffBgyFHXvJ5NYsNeEaP2A== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/plugin-syntax-decorators@^7.8.3": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz#fac829bf3c7ef4a1bc916257b403e58c6bdaf648" @@ -579,6 +605,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-private-property-in-object@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.0.tgz#762a4babec61176fec6c88480dec40372b140c0b" + integrity sha512-bda3xF8wGl5/5btF794utNOL0Jw+9jE5C1sLZcoK7c4uonE/y3iQiyG+KbkF3WBV/paX58VCpjhxLPkdj5Fe4w== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-top-level-await@^7.12.13", "@babel/plugin-syntax-top-level-await@^7.8.3": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178" @@ -616,7 +649,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-block-scoping@^7.12.13", "@babel/plugin-transform-block-scoping@^7.8.3": +"@babel/plugin-transform-block-scoping@^7.13.16", "@babel/plugin-transform-block-scoping@^7.8.3": version "7.13.16" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.13.16.tgz#a9c0f10794855c63b1d629914c7dcfeddd185892" integrity sha512-ad3PHUxGnfWF4Efd3qFuznEtZKoBp0spS+DgqzVzRPV7urEBvPLue3y2j80w4Jf2YLzZHj8TOv/Lmvdmh3b2xg== @@ -643,7 +676,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.13.0" -"@babel/plugin-transform-destructuring@^7.13.0", "@babel/plugin-transform-destructuring@^7.8.3": +"@babel/plugin-transform-destructuring@^7.13.17", "@babel/plugin-transform-destructuring@^7.8.3": version "7.13.17" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz#678d96576638c19d5b36b332504d3fd6e06dea27" integrity sha512-UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA== @@ -710,23 +743,23 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.9.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz#19f511d60e3d8753cc5a6d4e775d3a5184866cc3" - integrity sha512-EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ== +"@babel/plugin-transform-modules-amd@^7.14.0", "@babel/plugin-transform-modules-amd@^7.9.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.0.tgz#589494b5b290ff76cf7f59c798011f6d77026553" + integrity sha512-CF4c5LX4LQ03LebQxJ5JZes2OYjzBuk1TdiF7cG7d5dK4lAdw9NZmaxq5K/mouUdNeqwz3TNjnW6v01UqUNgpQ== dependencies: - "@babel/helper-module-transforms" "^7.13.0" + "@babel/helper-module-transforms" "^7.14.0" "@babel/helper-plugin-utils" "^7.13.0" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.9.0": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz#7b01ad7c2dcf2275b06fa1781e00d13d420b3e1b" - integrity sha512-9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw== +"@babel/plugin-transform-modules-commonjs@^7.14.0", "@babel/plugin-transform-modules-commonjs@^7.9.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz#52bc199cb581e0992edba0f0f80356467587f161" + integrity sha512-EX4QePlsTaRZQmw9BsoPeyh5OCtRGIhwfLquhxGp5e32w+dyL8htOcDwamlitmNFK6xBZYlygjdye9dbd9rUlQ== dependencies: - "@babel/helper-module-transforms" "^7.13.0" + "@babel/helper-module-transforms" "^7.14.0" "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-simple-access" "^7.12.13" + "@babel/helper-simple-access" "^7.13.12" babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-systemjs@^7.13.8", "@babel/plugin-transform-modules-systemjs@^7.9.0": @@ -740,12 +773,12 @@ "@babel/helper-validator-identifier" "^7.12.11" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-umd@^7.13.0", "@babel/plugin-transform-modules-umd@^7.9.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz#8a3d96a97d199705b9fd021580082af81c06e70b" - integrity sha512-D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw== +"@babel/plugin-transform-modules-umd@^7.14.0", "@babel/plugin-transform-modules-umd@^7.9.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz#2f8179d1bbc9263665ce4a65f305526b2ea8ac34" + integrity sha512-nPZdnWtXXeY7I87UZr9VlsWme3Y0cfFFE41Wbxz4bbaexAjNMInXPFUpRRUJ8NoMm0Cw+zxbqjdPmLhcjfazMw== dependencies: - "@babel/helper-module-transforms" "^7.13.0" + "@babel/helper-module-transforms" "^7.14.0" "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-transform-named-capturing-groups-regex@^7.12.13", "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3": @@ -1008,17 +1041,18 @@ semver "^5.5.0" "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.4.5": - version "7.13.15" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.15.tgz#c8a6eb584f96ecba183d3d414a83553a599f478f" - integrity sha512-D4JAPMXcxk69PKe81jRJ21/fP/uYdcTZ3hJDF5QX2HSI9bBxxYw/dumdR6dGumhjxlprHPE4XWoPaqzZUVy2MA== + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.0.tgz#236f88cd5da625e625dd40500d4824523f50e6c5" + integrity sha512-GWRCdBv2whxqqaSi7bo/BEXf070G/fWFMEdCnmoRg2CZJy4GK06ovFuEjJrZhDRXYgBsYtxVbG8GUHvw+UWBkQ== dependencies: - "@babel/compat-data" "^7.13.15" - "@babel/helper-compilation-targets" "^7.13.13" + "@babel/compat-data" "^7.14.0" + "@babel/helper-compilation-targets" "^7.13.16" "@babel/helper-plugin-utils" "^7.13.0" "@babel/helper-validator-option" "^7.12.17" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.13.12" "@babel/plugin-proposal-async-generator-functions" "^7.13.15" "@babel/plugin-proposal-class-properties" "^7.13.0" + "@babel/plugin-proposal-class-static-block" "^7.13.11" "@babel/plugin-proposal-dynamic-import" "^7.13.8" "@babel/plugin-proposal-export-namespace-from" "^7.12.13" "@babel/plugin-proposal-json-strings" "^7.13.8" @@ -1029,9 +1063,11 @@ "@babel/plugin-proposal-optional-catch-binding" "^7.13.8" "@babel/plugin-proposal-optional-chaining" "^7.13.12" "@babel/plugin-proposal-private-methods" "^7.13.0" + "@babel/plugin-proposal-private-property-in-object" "^7.14.0" "@babel/plugin-proposal-unicode-property-regex" "^7.12.13" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-class-properties" "^7.12.13" + "@babel/plugin-syntax-class-static-block" "^7.12.13" "@babel/plugin-syntax-dynamic-import" "^7.8.3" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" "@babel/plugin-syntax-json-strings" "^7.8.3" @@ -1041,14 +1077,15 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-private-property-in-object" "^7.14.0" "@babel/plugin-syntax-top-level-await" "^7.12.13" "@babel/plugin-transform-arrow-functions" "^7.13.0" "@babel/plugin-transform-async-to-generator" "^7.13.0" "@babel/plugin-transform-block-scoped-functions" "^7.12.13" - "@babel/plugin-transform-block-scoping" "^7.12.13" + "@babel/plugin-transform-block-scoping" "^7.13.16" "@babel/plugin-transform-classes" "^7.13.0" "@babel/plugin-transform-computed-properties" "^7.13.0" - "@babel/plugin-transform-destructuring" "^7.13.0" + "@babel/plugin-transform-destructuring" "^7.13.17" "@babel/plugin-transform-dotall-regex" "^7.12.13" "@babel/plugin-transform-duplicate-keys" "^7.12.13" "@babel/plugin-transform-exponentiation-operator" "^7.12.13" @@ -1056,10 +1093,10 @@ "@babel/plugin-transform-function-name" "^7.12.13" "@babel/plugin-transform-literals" "^7.12.13" "@babel/plugin-transform-member-expression-literals" "^7.12.13" - "@babel/plugin-transform-modules-amd" "^7.13.0" - "@babel/plugin-transform-modules-commonjs" "^7.13.8" + "@babel/plugin-transform-modules-amd" "^7.14.0" + "@babel/plugin-transform-modules-commonjs" "^7.14.0" "@babel/plugin-transform-modules-systemjs" "^7.13.8" - "@babel/plugin-transform-modules-umd" "^7.13.0" + "@babel/plugin-transform-modules-umd" "^7.14.0" "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13" "@babel/plugin-transform-new-target" "^7.12.13" "@babel/plugin-transform-object-super" "^7.12.13" @@ -1075,7 +1112,7 @@ "@babel/plugin-transform-unicode-escapes" "^7.12.13" "@babel/plugin-transform-unicode-regex" "^7.12.13" "@babel/preset-modules" "^0.1.4" - "@babel/types" "^7.13.14" + "@babel/types" "^7.14.0" babel-plugin-polyfill-corejs2 "^0.2.0" babel-plugin-polyfill-corejs3 "^0.2.0" babel-plugin-polyfill-regenerator "^0.2.0" @@ -1126,9 +1163,9 @@ "@babel/plugin-transform-typescript" "^7.9.0" "@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.12.1", "@babel/runtime-corejs3@^7.9.6": - version "7.13.17" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.13.17.tgz#9baf45f03d4d013f021760b992d6349a9d27deaf" - integrity sha512-RGXINY1YvduBlGrP+vHjJqd/nK7JVpfM4rmZLGMx77WoL3sMrhheA0qxii9VNn1VHnxJLEyxmvCB+Wqc+x/FMw== + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.14.0.tgz#6bf5fbc0b961f8e3202888cb2cd0fb7a0a9a3f66" + integrity sha512-0R0HTZWHLk6G8jIk0FtoX+AatCtKnswS98VhXwGImFc759PJRp4Tru0PQYZofyijTFUr+gT8Mu7sgXVJLQ0ceg== dependencies: core-js-pure "^3.0.0" regenerator-runtime "^0.13.4" @@ -1141,9 +1178,9 @@ regenerator-runtime "^0.13.4" "@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": - version "7.13.17" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.17.tgz#8966d1fc9593bf848602f0662d6b4d0069e3a7ec" - integrity sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA== + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz#46794bc20b612c5f75e62dd071e24dfd95f1cbe6" + integrity sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA== dependencies: regenerator-runtime "^0.13.4" @@ -1156,26 +1193,26 @@ "@babel/parser" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15", "@babel/traverse@^7.13.17", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0": - version "7.13.17" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.17.tgz#c85415e0c7d50ac053d758baec98b28b2ecfeea3" - integrity sha512-BMnZn0R+X6ayqm3C3To7o1j7Q020gWdqdyP50KEoVqaCO2c/Im7sYZSmVgvefp8TTMQ+9CtwuBp0Z1CZ8V3Pvg== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.15", "@babel/traverse@^7.14.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.0.tgz#cea0dc8ae7e2b1dec65f512f39f3483e8cc95aef" + integrity sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA== dependencies: "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.13.16" + "@babel/generator" "^7.14.0" "@babel/helper-function-name" "^7.12.13" "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/parser" "^7.13.16" - "@babel/types" "^7.13.17" + "@babel/parser" "^7.14.0" + "@babel/types" "^7.14.0" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.13.16", "@babel/types@^7.13.17", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0": - version "7.13.17" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.17.tgz#48010a115c9fba7588b4437dd68c9469012b38b4" - integrity sha512-RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA== +"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.0.tgz#3fc3fc74e0cdad878182e5f66cc6bcab1915a802" + integrity sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg== dependencies: - "@babel/helper-validator-identifier" "^7.12.11" + "@babel/helper-validator-identifier" "^7.14.0" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -1591,14 +1628,14 @@ chalk "^4.0.0" "@material-ui/core@^4.11.0": - version "4.11.3" - resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.3.tgz#f22e41775b0bd075e36a7a093d43951bf7f63850" - integrity sha512-Adt40rGW6Uds+cAyk3pVgcErpzU/qxc7KBR94jFHBYretU4AtWZltYcNsbeMn9tXL86jjVL1kuGcIHsgLgFGRw== + version "4.11.4" + resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.4.tgz#4fb9fe5dec5dcf780b687e3a40cff78b2b9640a4" + integrity sha512-oqb+lJ2Dl9HXI9orc6/aN8ZIAMkeThufA5iZELf2LQeBn2NtjVilF5D2w7e9RpntAzDb4jK5DsVhkfOvFY/8fg== dependencies: "@babel/runtime" "^7.4.4" - "@material-ui/styles" "^4.11.3" + "@material-ui/styles" "^4.11.4" "@material-ui/system" "^4.11.3" - "@material-ui/types" "^5.1.0" + "@material-ui/types" "5.1.0" "@material-ui/utils" "^4.11.2" "@types/react-transition-group" "^4.2.0" clsx "^1.0.4" @@ -1627,14 +1664,14 @@ rifm "^0.7.0" tslib "^1.9.3" -"@material-ui/styles@^4.11.3": - version "4.11.3" - resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.3.tgz#1b8d97775a4a643b53478c895e3f2a464e8916f2" - integrity sha512-HzVzCG+PpgUGMUYEJ2rTEmQYeonGh41BYfILNFb/1ueqma+p1meSdu4RX6NjxYBMhf7k+jgfHFTTz+L1SXL/Zg== +"@material-ui/styles@^4.11.4": + version "4.11.4" + resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.4.tgz#eb9dfccfcc2d208243d986457dff025497afa00d" + integrity sha512-KNTIZcnj/zprG5LW0Sao7zw+yG3O35pviHzejMdcSGCdWbiO8qzRgOYL8JAxAsWBKOKYwVZxXtHWaB5T2Kvxew== dependencies: "@babel/runtime" "^7.4.4" "@emotion/hash" "^0.8.0" - "@material-ui/types" "^5.1.0" + "@material-ui/types" "5.1.0" "@material-ui/utils" "^4.11.2" clsx "^1.0.4" csstype "^2.5.2" @@ -1659,7 +1696,7 @@ csstype "^2.5.2" prop-types "^15.7.2" -"@material-ui/types@^5.1.0": +"@material-ui/types@5.1.0": version "5.1.0" resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2" integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A== @@ -1931,9 +1968,9 @@ integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== "@types/node@*": - version "15.0.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.0.tgz#557dd0da4a6dca1407481df3bbacae0cd6f68042" - integrity sha512-YN1d+ae2MCb4U0mMa+Zlb5lWTdpFShbAj5nmte6lel27waMMBfivrm0prC16p/Di3DyTrmerrYUT8/145HXxVw== + version "15.0.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz#ef34dea0881028d11398be5bf4e856743e3dc35a" + integrity sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -2486,9 +2523,9 @@ acorn@^7.1.1: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.1.0: - version "8.2.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.1.tgz#0d36af126fb6755095879c1dc6fd7edf7d60a5fb" - integrity sha512-z716cpm5TX4uzOzILx8PavOE6C6DKshHDw1aQN52M/yNSqE9s5O8SMfyhCCfCJ3HmTL0NkVOi+8a/55T7YB3bg== + version "8.2.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.2.tgz#c4574e4fea298d6e6ed4b85ab844b06dd59f26d6" + integrity sha512-VrMS8kxT0e7J1EX0p6rI/E0FbfOVcvBpbIqHThFv+f8YrZIlMfVotYcXKVPmTvPW8sW5miJzfUFrrvthUZg8VQ== address@1.1.2, address@^1.0.1: version "1.1.2" @@ -3346,14 +3383,14 @@ browserslist@4.7.0: electron-to-chromium "^1.3.247" node-releases "^1.1.29" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.4, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1: - version "4.16.5" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.5.tgz#952825440bca8913c62d0021334cbe928ef062ae" - integrity sha512-C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A== +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1: + version "4.16.6" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" + integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== dependencies: - caniuse-lite "^1.0.30001214" + caniuse-lite "^1.0.30001219" colorette "^1.2.2" - electron-to-chromium "^1.3.719" + electron-to-chromium "^1.3.723" escalade "^3.1.1" node-releases "^1.1.71" @@ -3571,10 +3608,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001214: - version "1.0.30001216" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001216.tgz#47418a082a4f952d14d8964ae739e25efb2060a9" - integrity sha512-1uU+ww/n5WCJRwUcc9UH/W6925Se5aNnem/G5QaSDga2HzvjYMs8vRbekGUN/PnTZ7ezTHcxxTEb9fgiMYwH6Q== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219: + version "1.0.30001220" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001220.tgz#c080e1c8eefb99f6cc9685da6313840bdbaf4c36" + integrity sha512-pjC2T4DIDyGAKTL4dMvGUQaMUHRmhvPpAgNNTa14jaBWHu+bLQgvpFqElxh9L4829Fdx0PlKiMp3wnYldRtECA== canvg@^3.0.6: version "3.0.7" @@ -4124,17 +4161,17 @@ copy-webpack-plugin@^4.6.0: serialize-javascript "^1.4.0" core-js-compat@^3.6.2, core-js-compat@^3.9.0, core-js-compat@^3.9.1: - version "3.11.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.11.0.tgz#635683f43480a0b41e3f6be3b1c648dadb8b4390" - integrity sha512-3wsN9YZJohOSDCjVB0GequOyHax8zFiogSX3XWLE28M1Ew7dTU57tgHjIylSBKSIouwmLBp3g61sKMz/q3xEGA== + version "3.11.2" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.11.2.tgz#5048e367851cfd2c6c0cb81310757b4da296e385" + integrity sha512-gYhNwu7AJjecNtRrIfyoBabQ3ZG+llfPmg9BifIX8yxIpDyfNLRM73zIjINSm6z3dMdI1nwNC9C7uiy4pIC6cw== dependencies: - browserslist "^4.16.4" + browserslist "^4.16.6" semver "7.0.0" core-js-pure@^3.0.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.11.0.tgz#e07f25a8f616d178ec16b0354b008ad28b20b2f0" - integrity sha512-PxEiQGjzC+5qbvE7ZIs5Zn6BynNeZO9zHhrrWmkRff2SZLq0CE/H5LuZOJHhmOQ8L38+eMzEHAmPYWrUtDfuDQ== + version "3.11.2" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.11.2.tgz#10e3b35788c00f431bc0d601d7551475ec3e792c" + integrity sha512-DQxdEKm+zFsnON7ZGOgUAQXBt1UJJ01tOzN/HgQ7cNf0oEHW1tcBLfCQQd1q6otdLu5gAdvKYxKHAoXGwE/kiQ== core-js@^2.4.0: version "2.6.12" @@ -4142,9 +4179,9 @@ core-js@^2.4.0: integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.0.0, core-js@^3.5.0, core-js@^3.6.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.11.0.tgz#05dac6aa70c0a4ad842261f8957b961d36eb8926" - integrity sha512-bd79DPpx+1Ilh9+30aT5O1sgpQd4Ttg8oqkqi51ZzhedMM1omD2e6IOF48Z/DzDCZ2svp49tN/3vneTK6ZBkXw== + version "3.11.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.11.2.tgz#af087a43373fc6e72942917c4a4c3de43ed574d6" + integrity sha512-3tfrrO1JpJSYGKnd9LKTBPqgUES/UYiCzMKeqwR1+jF16q4kD1BY2NvqkfuzXwQ6+CIWm55V9cjD7PQd+hijdw== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -4893,9 +4930,9 @@ domhandler@^4.0.0, domhandler@^4.2.0: domelementtype "^2.2.0" dompurify@^2.0.12: - version "2.2.7" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.7.tgz#a5f055a2a471638680e779bd08fc334962d11fd8" - integrity sha512-jdtDffdGNY+C76jvodNTu9jt5yYj59vuTUyx+wXdzcSwAGTYZDAQkQ7Iwx9zcGrA4ixC1syU4H3RZROqRxokxg== + version "2.2.8" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.8.tgz#ce88e395f6d00b6dc53f80d6b2a6fdf5446873c6" + integrity sha512-9H0UL59EkDLgY3dUFjLV6IEUaHm5qp3mxSqWw7Yyx4Zhk2Jn2cmLe+CNPP3xy13zl8Bqg+0NehQzkdMoVhGRww== domutils@^1.5.1, domutils@^1.7.0: version "1.7.0" @@ -4967,10 +5004,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.719: - version "1.3.722" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.722.tgz#621657f79e7f65402e71aa3403bc941f3a4af0a0" - integrity sha512-aAsc906l0RBsVTsGTK+KirVfey9eNtxyejdkbNzkISGxb7AFna3Kf0qvsp8tMttzBt9Bz3HddtYQ+++/PZtRYA== +electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.723: + version "1.3.725" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.725.tgz#04fc83f9189169aff50f0a00c6b4090b910cba85" + integrity sha512-2BbeAESz7kc6KBzs7WVrMc1BY5waUphk4D4DX5dSQXJhsc3tP5ZFaiyuL0AB7vUKzDYpIeYwTYlEfxyjsGUrhw== elliptic@^6.5.3: version "6.5.4" From e6553260a7abc8265f41b30a034860b9a5237ab7 Mon Sep 17 00:00:00 2001 From: Robert Hunt Date: Mon, 10 May 2021 09:58:04 +1200 Subject: [PATCH 03/15] Small fixes --- src/__tests__/__snapshots__/tn-table-row-check.test.js.snap | 2 +- src/core/tn-tsv9-row-check.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/__tests__/__snapshots__/tn-table-row-check.test.js.snap b/src/__tests__/__snapshots__/tn-table-row-check.test.js.snap index 5a87ed57..d4d06557 100644 --- a/src/__tests__/__snapshots__/tn-table-row-check.test.js.snap +++ b/src/__tests__/__snapshots__/tn-table-row-check.test.js.snap @@ -591,7 +591,7 @@ Object { "fieldName": "Verse", "location": " that was supplied", "message": "Missing row ID field", - "priority": 779, + "priority": 808, }, Object { "C": "1", diff --git a/src/core/tn-tsv9-row-check.js b/src/core/tn-tsv9-row-check.js index fc64f38a..a43a85f6 100644 --- a/src/core/tn-tsv9-row-check.js +++ b/src/core/tn-tsv9-row-check.js @@ -421,7 +421,7 @@ export async function checkTN_TSV9DataRow(languageCode, repoCode, line, bookID, } else // TODO: Find more details about when these fields are really compulsory (and when they're not, e.g., for 'intro') ??? if (V !== 'intro' && occurrence !== '0') - addNoticePartial({ priority: 919, message: "Missing Quote field", fieldName: 'OrigQuote', rowID, location: ourRowLocation }); + addNoticePartial({ priority: 919, message: "Missing OrigQuote field", fieldName: 'OrigQuote', rowID, location: ourRowLocation }); if (occurrence.length) { // This should usually be a digit if (occurrence === '0') { // zero means that it doesn’t occur From ede2db51d96d436f70eff93e6277c99cc624b766 Mon Sep 17 00:00:00 2001 From: Robert Hunt Date: Mon, 10 May 2021 09:58:15 +1200 Subject: [PATCH 04/15] Start on upgrading to latest BCS Grammar Checker release --- package.json | 4 +- src/core/BCS-usfm-grammar-check.js | 38 +- yarn.lock | 1388 +++++++++++++++++++++++++--- 3 files changed, 1274 insertions(+), 156 deletions(-) diff --git a/package.json b/package.json index 39c6be21..a9330f62 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "uw-content-validation", "description": "Functions for Checking Door43.org Scriptural Content/Resources.", - "version": "2.1.3_alpha1", + "version": "2.1.3_alpha3", "private": false, "homepage": "https://unfoldingword.github.io/uw-content-validation/", "repository": { @@ -41,7 +41,7 @@ "localforage": "^1.9.0", "lodash": "^4.17.20", "prop-types": "^15.7.2", - "usfm-grammar": "2.0.0-beta.4", + "usfm-grammar": "^2.0.0", "usfm-js": "^2.1.0", "yaml": "^1.10.0" }, diff --git a/src/core/BCS-usfm-grammar-check.js b/src/core/BCS-usfm-grammar-check.js index 1124489f..80d32443 100644 --- a/src/core/BCS-usfm-grammar-check.js +++ b/src/core/BCS-usfm-grammar-check.js @@ -1,7 +1,7 @@ import grammar from 'usfm-grammar'; import * as books from '../core/books/books'; import { DEFAULT_EXCERPT_LENGTH } from './defaults' -import { userLog, parameterAssert } from './utilities'; +import { userLog, debugLog, parameterAssert } from './utilities'; // const USFM_GRAMMAR_VALIDATOR_VERSION_STRING = '0.3.3'; @@ -28,21 +28,40 @@ export function runBCSGrammarCheck(strictnessString, fileText, filename, givenLo // debugLog(`Using excerptHalfLength=${excerptHalfLength}`, `excerptHalfLengthPlus=${excerptHalfLengthPlus}`); // Now create the parser and run the check - const ourUsfmParser = new grammar.USFMParser(fileText, - strictnessString === 'relaxed' ? grammar.LEVEL.RELAXED : null); - // Returns a Boolean indicating whether the input USFM text satisfies the grammar or not. - // This method is available in both default and relaxed modes. - // const parserResult = ourUsfmParser.validate(); - const parserResult = ourUsfmParser.toJSON() + let parserToJSONResultObject, parseWarnings; + try { + debugLog(`${new Date().getTime()/1000} Setting-up the USFMGrammar checker…`); + const ourUsfmParser = new grammar.USFMParser(fileText, strictnessString === 'relaxed' ? grammar.LEVEL.RELAXED : null); + // Returns a Boolean indicating whether the input USFM text satisfies the grammar or not. + // This method is available in both default and relaxed modes. + // const parserResult = ourUsfmParser.validate(); + debugLog(`${new Date().getTime()/1000} Running the USFMGrammar checker (may take several seconds)…`); + parserToJSONResultObject = ourUsfmParser.toJSON() + debugLog(`${new Date().getTime()/1000} Got the USFMGrammar checker toJSON result: ${Object.keys(parserToJSONResultObject)}`); + debugLog(`${new Date().getTime()/1000} Got the USFMGrammar checker toJSON _messages: ${Object.keys(parserToJSONResultObject._messages)}`); + debugLog(`${new Date().getTime()/1000} Got the USFMGrammar checker: ${Object.keys(ourUsfmParser)}`); + parseWarnings = parserToJSONResultObject._warnings ? parserToJSONResultObject._warnings : ourUsfmParser.warnings; + debugLog(`${new Date().getTime()/1000} Got the warnings from the USFMGrammar checker: (${parseWarnings.length}) ${parseWarnings}`); + } catch (parserError) { + debugLog(`${new Date().getTime()/1000} Got an exception when using the USFMGrammar checker: ${parserError}`); + const ourErrorObject = { + priority: 333, message: "USFMGrammar checker failed", + details: parserError, + filename, + location: givenLocation + }; + // Say it's valid so we don't get an additional high-priority error + return { isValidUSFM: true, error: ourErrorObject, warnings: [] }; + } let parserMessages; - parserMessages = parserResult._messages; // Throw away the JSON (if any) + parserMessages = parserToJSONResultObject._messages; // Throw away the JSON (if any) // debugLog(` Finished BCS USFM grammar check with messages: ${JSON.stringify(parserResult)}\n and warnings: ${JSON.stringify(ourUsfmParser.warnings)}.`); let parseError; parseError = parserMessages._error; // debugLog(` parseError: ${parseError}`); let ourErrorMessage, lineNumberString, characterIndex, excerpt; // NOTE: The following code is quite fragile - // as it depends on the precise format of the error message return from USFMParser + // as it depends on the precise format of the error message returned from USFMParser let ourErrorObject = {}; if (parseError) { const contextRE = /(\d+?)\s\|\s(.+)/g; @@ -102,7 +121,6 @@ export function runBCSGrammarCheck(strictnessString, fileText, filename, givenLo } } - const parseWarnings = parserResult._warnings ? parserResult._warnings : ourUsfmParser.warnings; // debugLog(` Warnings: ${JSON.stringify(parseWarnings)}`); let ourWarnings = []; for (const warningString of parseWarnings) { diff --git a/yarn.lock b/yarn.lock index ac648328..5b11474e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -88,11 +88,11 @@ source-map "^0.5.0" "@babel/generator@^7.14.0", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.0.tgz#0f35d663506c43e4f10898fbda0d752ec75494be" - integrity sha512-C6u00HbmsrNPug6A+CiNl8rEys7TsdcXwg12BHi2ca5rUfAs3+UwZsuDQSXnc+wCElCXMB8gMaJ3YXDdh8fAlg== + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.1.tgz#1f99331babd65700183628da186f36f63d615c93" + integrity sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ== dependencies: - "@babel/types" "^7.14.0" + "@babel/types" "^7.14.1" jsesc "^2.5.1" source-map "^0.5.0" @@ -122,9 +122,9 @@ semver "^6.3.0" "@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.14.0", "@babel/helper-create-class-features-plugin@^7.8.3": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.0.tgz#38367d3dab125b12f94273de418f4df23a11a15e" - integrity sha512-6pXDPguA5zC40Y8oI5mqr+jEUpjMJonKvknvA+vD8CYDz5uuXEwWBK8sRAsE/t3gfb1k15AQb9RhwpscC4nUJQ== + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.1.tgz#1fe11b376f3c41650ad9fedc665b0068722ea76c" + integrity sha512-r8rsUahG4ywm0QpGcCrLaUSOuNAISR3IZCg4Fx05Ozq31aCUrQsTLH6KPxy0N5ULoQ4Sn9qjNdGNtbPWAC6hYg== dependencies: "@babel/helper-annotate-as-pure" "^7.12.13" "@babel/helper-function-name" "^7.12.13" @@ -305,9 +305,9 @@ js-tokens "^4.0.0" "@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.0.tgz#2f0ebfed92bcddcc8395b91f1895191ce2760380" - integrity sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q== + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.1.tgz#1bd644b5db3f5797c4479d89ec1817fe02b84c47" + integrity sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q== "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12": version "7.13.12" @@ -649,10 +649,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-block-scoping@^7.13.16", "@babel/plugin-transform-block-scoping@^7.8.3": - version "7.13.16" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.13.16.tgz#a9c0f10794855c63b1d629914c7dcfeddd185892" - integrity sha512-ad3PHUxGnfWF4Efd3qFuznEtZKoBp0spS+DgqzVzRPV7urEBvPLue3y2j80w4Jf2YLzZHj8TOv/Lmvdmh3b2xg== +"@babel/plugin-transform-block-scoping@^7.14.1", "@babel/plugin-transform-block-scoping@^7.8.3": + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.1.tgz#ac1b3a8e3d8cbb31efc6b9be2f74eb9823b74ab2" + integrity sha512-2mQXd0zBrwfp0O1moWIhPpEeTKDvxyHcnma3JATVP1l+CctWBuot6OJG8LQ4DnBj4ZZPSmlb/fm4mu47EOAnVA== dependencies: "@babel/helper-plugin-utils" "^7.13.0" @@ -1041,9 +1041,9 @@ semver "^5.5.0" "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.4.5": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.0.tgz#236f88cd5da625e625dd40500d4824523f50e6c5" - integrity sha512-GWRCdBv2whxqqaSi7bo/BEXf070G/fWFMEdCnmoRg2CZJy4GK06ovFuEjJrZhDRXYgBsYtxVbG8GUHvw+UWBkQ== + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.1.tgz#b55914e2e68885ea03f69600b2d3537e54574a93" + integrity sha512-0M4yL1l7V4l+j/UHvxcdvNfLB9pPtIooHTbEhgD/6UGyh8Hy3Bm1Mj0buzjDXATCSz3JFibVdnoJZCrlUCanrQ== dependencies: "@babel/compat-data" "^7.14.0" "@babel/helper-compilation-targets" "^7.13.16" @@ -1082,7 +1082,7 @@ "@babel/plugin-transform-arrow-functions" "^7.13.0" "@babel/plugin-transform-async-to-generator" "^7.13.0" "@babel/plugin-transform-block-scoped-functions" "^7.12.13" - "@babel/plugin-transform-block-scoping" "^7.13.16" + "@babel/plugin-transform-block-scoping" "^7.14.1" "@babel/plugin-transform-classes" "^7.13.0" "@babel/plugin-transform-computed-properties" "^7.13.0" "@babel/plugin-transform-destructuring" "^7.13.17" @@ -1112,7 +1112,7 @@ "@babel/plugin-transform-unicode-escapes" "^7.12.13" "@babel/plugin-transform-unicode-regex" "^7.12.13" "@babel/preset-modules" "^0.1.4" - "@babel/types" "^7.14.0" + "@babel/types" "^7.14.1" babel-plugin-polyfill-corejs2 "^0.2.0" babel-plugin-polyfill-corejs3 "^0.2.0" babel-plugin-polyfill-regenerator "^0.2.0" @@ -1207,10 +1207,10 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.0.tgz#3fc3fc74e0cdad878182e5f66cc6bcab1915a802" - integrity sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg== +"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.14.1", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0": + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz#095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db" + integrity sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA== dependencies: "@babel/helper-validator-identifier" "^7.14.0" to-fast-properties "^2.0.0" @@ -1740,6 +1740,139 @@ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== +"@npmcli/arborist@^2.0.0", "@npmcli/arborist@^2.3.0", "@npmcli/arborist@^2.4.2": + version "2.4.2" + resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-2.4.2.tgz#7c22eb0d7b66f31e250e1927047d0bd497dbdf8a" + integrity sha512-QrsMrRWzO1D2EmPQheyPz1yRnnmln6vPe4SujV4cRF0v9qIAQbD8M0dMH6K3y+w/2X3t7vg5lx20LHXsbcu7lw== + dependencies: + "@npmcli/installed-package-contents" "^1.0.7" + "@npmcli/map-workspaces" "^1.0.2" + "@npmcli/metavuln-calculator" "^1.1.0" + "@npmcli/move-file" "^1.1.0" + "@npmcli/name-from-folder" "^1.0.1" + "@npmcli/node-gyp" "^1.0.1" + "@npmcli/run-script" "^1.8.2" + bin-links "^2.2.1" + cacache "^15.0.3" + common-ancestor-path "^1.0.1" + json-parse-even-better-errors "^2.3.1" + json-stringify-nice "^1.1.2" + mkdirp-infer-owner "^2.0.0" + npm-install-checks "^4.0.0" + npm-package-arg "^8.1.0" + npm-pick-manifest "^6.1.0" + npm-registry-fetch "^10.0.0" + pacote "^11.2.6" + parse-conflict-json "^1.1.1" + promise-all-reject-late "^1.0.0" + promise-call-limit "^1.0.1" + read-package-json-fast "^2.0.2" + readdir-scoped-modules "^1.1.0" + semver "^7.3.5" + tar "^6.1.0" + treeverse "^1.0.4" + walk-up-path "^1.0.0" + +"@npmcli/ci-detect@^1.2.0", "@npmcli/ci-detect@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-1.3.0.tgz#6c1d2c625fb6ef1b9dea85ad0a5afcbef85ef22a" + integrity sha512-oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q== + +"@npmcli/config@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-2.2.0.tgz#c3f6cb76e74691d1ae746cda482b7df751ed2124" + integrity sha512-y0V3F7RCWXy8kBOvKvKSRUNKRobLB6vL/UNchy/6+IUNIqu+UyrY3Z7jvj1ZA/AkYc/0WkCUtppCo+bPhMU8Aw== + dependencies: + ini "^2.0.0" + mkdirp-infer-owner "^2.0.0" + nopt "^5.0.0" + semver "^7.3.4" + walk-up-path "^1.0.0" + +"@npmcli/disparity-colors@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@npmcli/disparity-colors/-/disparity-colors-1.0.1.tgz#b23c864c9658f9f0318d5aa6d17986619989535c" + integrity sha512-kQ1aCTTU45mPXN+pdAaRxlxr3OunkyztjbbxDY/aIcPS5CnCUrx+1+NvA6pTcYR7wmLZe37+Mi5v3nfbwPxq3A== + dependencies: + ansi-styles "^4.3.0" + +"@npmcli/git@^2.0.1", "@npmcli/git@^2.0.7": + version "2.0.9" + resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.0.9.tgz#915bbfe66300e67b4da5ef765a4475ffb2ca5b6b" + integrity sha512-hTMbMryvOqGLwnmMBKs5usbPsJtyEsMsgXwJbmNrsEuQQh1LAIMDU77IoOrwkCg+NgQWl+ySlarJASwM3SutCA== + dependencies: + "@npmcli/promise-spawn" "^1.3.2" + lru-cache "^6.0.0" + mkdirp "^1.0.4" + npm-pick-manifest "^6.1.1" + promise-inflight "^1.0.1" + promise-retry "^2.0.1" + semver "^7.3.5" + which "^2.0.2" + +"@npmcli/installed-package-contents@^1.0.6", "@npmcli/installed-package-contents@^1.0.7": + version "1.0.7" + resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa" + integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw== + dependencies: + npm-bundled "^1.1.1" + npm-normalize-package-bin "^1.0.1" + +"@npmcli/map-workspaces@^1.0.2": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-1.0.3.tgz#6072a0794762cf8f572e6080fa66d1bbefa991d5" + integrity sha512-SdlRlOoQw4WKD4vtb/n5gUkobEABYBEOo8fRE4L8CtBkyWDSvIrReTfKvQ/Jc/LQqDaaZ5iv1iMSQzKCUr1n1A== + dependencies: + "@npmcli/name-from-folder" "^1.0.1" + glob "^7.1.6" + minimatch "^3.0.4" + read-package-json-fast "^2.0.1" + +"@npmcli/metavuln-calculator@^1.1.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-1.1.1.tgz#2f95ff3c6d88b366dd70de1c3f304267c631b458" + integrity sha512-9xe+ZZ1iGVaUovBVFI9h3qW+UuECUzhvZPxK9RaEA2mjU26o5D0JloGYWwLYvQELJNmBdQB6rrpuN8jni6LwzQ== + dependencies: + cacache "^15.0.5" + pacote "^11.1.11" + semver "^7.3.2" + +"@npmcli/move-file@^1.0.1", "@npmcli/move-file@^1.1.0": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" + integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg== + dependencies: + mkdirp "^1.0.4" + rimraf "^3.0.2" + +"@npmcli/name-from-folder@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@npmcli/name-from-folder/-/name-from-folder-1.0.1.tgz#77ecd0a4fcb772ba6fe927e2e2e155fbec2e6b1a" + integrity sha512-qq3oEfcLFwNfEYOQ8HLimRGKlD8WSeGEdtUa7hmzpR8Sa7haL1KVQrvgO6wqMjhWFFVjgtrh1gIxDz+P8sjUaA== + +"@npmcli/node-gyp@^1.0.1", "@npmcli/node-gyp@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz#3cdc1f30e9736dbc417373ed803b42b1a0a29ede" + integrity sha512-yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg== + +"@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5" + integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg== + dependencies: + infer-owner "^1.0.4" + +"@npmcli/run-script@^1.8.2", "@npmcli/run-script@^1.8.3", "@npmcli/run-script@^1.8.4", "@npmcli/run-script@^1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.5.tgz#f250a0c5e1a08a792d775a315d0ff42fc3a51e1d" + integrity sha512-NQspusBCpTjNwNRFMtz2C5MxoxyzlbuJ4YEhxAKrIonTiirKDtatsZictx9RgamQIx6+QuHMNmPl0wQdoESs9A== + dependencies: + "@npmcli/node-gyp" "^1.0.2" + "@npmcli/promise-spawn" "^1.3.2" + infer-owner "^1.0.4" + node-gyp "^7.1.0" + read-package-json-fast "^2.0.1" + "@sinonjs/commons@^1.7.0": version "1.8.3" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" @@ -1857,6 +1990,11 @@ "@svgr/plugin-svgo" "^4.3.1" loader-utils "^1.2.3" +"@tootallnate/once@1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" + integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.0", "@types/babel__core@^7.1.7": version "7.1.14" resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz#faaeefc4185ec71c389f4501ee5ec84b170cc402" @@ -1968,9 +2106,9 @@ integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== "@types/node@*": - version "15.0.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz#ef34dea0881028d11398be5bf4e856743e3dc35a" - integrity sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA== + version "15.0.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67" + integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -2020,9 +2158,9 @@ "@types/react" "*" "@types/react@*": - version "17.0.4" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.4.tgz#a67c6f7a460d2660e950d9ccc1c2f18525c28220" - integrity sha512-onz2BqScSFMoTRdJUZUDD/7xrusM8hBA2Fktk2qgaTYPCgPvWnDEgkrOs8hhPUf2jfcIXkJ5yK6VfYormJS3Jw== + version "17.0.5" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.5.tgz#3d887570c4489011f75a3fc8f965bf87d09a1bea" + integrity sha512-bj4biDB9ZJmGAYTWSKJly6bMr4BLUiBrx9ujiJEoP9XIDY9CTaPGxE5QWN/1WjpPLzYF7/jRNnV2nNxNe970sw== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -2050,7 +2188,7 @@ dependencies: "@types/react" "*" -"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2": +"@types/unist@*", "@types/unist@^2.0.0": version "2.0.3" resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e" integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ== @@ -2463,6 +2601,11 @@ abab@^2.0.0, abab@^2.0.3, abab@^2.0.5: resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== +abbrev@1, abbrev@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: version "1.3.7" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" @@ -2523,9 +2666,9 @@ acorn@^7.1.1: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.1.0: - version "8.2.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.2.tgz#c4574e4fea298d6e6ed4b85ab844b06dd59f26d6" - integrity sha512-VrMS8kxT0e7J1EX0p6rI/E0FbfOVcvBpbIqHThFv+f8YrZIlMfVotYcXKVPmTvPW8sW5miJzfUFrrvthUZg8VQ== + version "8.2.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz#caba24b08185c3b56e3168e97d15ed17f4d31fd0" + integrity sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg== address@1.1.2, address@^1.0.1: version "1.1.2" @@ -2540,6 +2683,22 @@ adjust-sourcemap-loader@3.0.0: loader-utils "^2.0.0" regex-parser "^2.2.11" +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +agentkeepalive@^4.1.3: + version "4.1.4" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz#d928028a4862cb11718e55227872e842a44c945b" + integrity sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ== + dependencies: + debug "^4.1.0" + depd "^1.1.2" + humanize-ms "^1.2.1" + aggregate-error@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" @@ -2627,13 +2786,23 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" -ansi-styles@^4.0.0, ansi-styles@^4.1.0: +ansi-styles@^4.0.0, ansi-styles@^4.1.0, ansi-styles@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== dependencies: color-convert "^2.0.1" +ansicolors@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979" + integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk= + +ansistyles@~0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539" + integrity sha1-XeYEFb2gcbs3EnhUyGT0GyMlRTk= + anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -2650,11 +2819,29 @@ anymatch@^3.0.3, anymatch@~3.1.1: normalize-path "^3.0.0" picomatch "^2.0.4" -aproba@^1.1.1: +aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== +aproba@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" + integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== + +archy@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" + integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA= + +are-we-there-yet@~1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" + integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -2765,7 +2952,7 @@ arrify@^1.0.1: resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= -asap@~2.0.6: +asap@^2.0.0, asap@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= @@ -3190,12 +3377,24 @@ big.js@^5.2.2: resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== +bin-links@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-2.2.1.tgz#347d9dbb48f7d60e6c11fe68b77a424bee14d61b" + integrity sha512-wFzVTqavpgCCYAh8SVBdnZdiQMxTkGR+T3b14CNpBXIBe2neJWaMGAZ55XWWHELJJ89dscuq0VCBqcVaIOgCMg== + dependencies: + cmd-shim "^4.0.1" + mkdirp "^1.0.3" + npm-normalize-package-bin "^1.0.0" + read-cmd-shim "^2.0.0" + rimraf "^3.0.0" + write-file-atomic "^3.0.3" + binary-extensions@^1.0.0: version "1.13.1" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== -binary-extensions@^2.0.0: +binary-extensions@^2.0.0, binary-extensions@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== @@ -3449,6 +3648,16 @@ builtin-status-codes@^3.0.0: resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= +builtins@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88" + integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og= + +byte-size@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-7.0.1.tgz#b1daf3386de7ab9d706b941a748dbfc71130dee3" + integrity sha512-crQdqyCwhokxwV1UyDzLZanhkugAgft7vt0qbbdt60C6Zf3CAiGmtUCylbtYwrU6loOUw3euGrNtW1J651ot1A== + bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" @@ -3523,6 +3732,29 @@ cacache@^13.0.1: ssri "^7.0.0" unique-filename "^1.1.1" +cacache@^15.0.3, cacache@^15.0.5, cacache@^15.0.6: + version "15.0.6" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.6.tgz#65a8c580fda15b59150fb76bf3f3a8e45d583099" + integrity sha512-g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w== + dependencies: + "@npmcli/move-file" "^1.0.1" + chownr "^2.0.0" + fs-minipass "^2.0.0" + glob "^7.1.4" + infer-owner "^1.0.4" + lru-cache "^6.0.0" + minipass "^3.1.1" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.2" + mkdirp "^1.0.3" + p-map "^4.0.0" + promise-inflight "^1.0.1" + rimraf "^3.0.2" + ssri "^8.0.1" + tar "^6.0.2" + unique-filename "^1.1.1" + cache-base@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" @@ -3609,9 +3841,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219: - version "1.0.30001220" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001220.tgz#c080e1c8eefb99f6cc9685da6313840bdbaf4c36" - integrity sha512-pjC2T4DIDyGAKTL4dMvGUQaMUHRmhvPpAgNNTa14jaBWHu+bLQgvpFqElxh9L4829Fdx0PlKiMp3wnYldRtECA== + version "1.0.30001223" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz#39b49ff0bfb3ee3587000d2f66c47addc6e14443" + integrity sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA== canvg@^3.0.6: version "3.0.7" @@ -3749,6 +3981,11 @@ chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.2: resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== + chrome-trace-event@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" @@ -3759,6 +3996,13 @@ ci-info@^2.0.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== +cidr-regex@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/cidr-regex/-/cidr-regex-3.1.1.tgz#ba1972c57c66f61875f18fd7dd487469770b571d" + integrity sha512-RBqYd32aDwbCMFJRL6wHOlDNYJsPNTt8vC82ErHF5vKt8QQzxm1FrkW8s/R5pVrXMf17sba09Uoy91PKiddAsw== + dependencies: + ip-regex "^4.1.0" + cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" @@ -3806,6 +4050,14 @@ clean-webpack-plugin@^1.0.1: dependencies: rimraf "^2.6.1" +cli-columns@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-3.1.2.tgz#6732d972979efc2ae444a1f08e08fa139c96a18e" + integrity sha1-ZzLZcpee/CrkRKHwjgj6E5yWoY4= + dependencies: + string-width "^2.0.0" + strip-ansi "^3.0.1" + cli-cursor@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" @@ -3825,6 +4077,16 @@ cli-spinners@^2.0.0: resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.0.tgz#36c7dc98fb6a9a76bd6238ec3f77e2425627e939" integrity sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q== +cli-table3@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.0.tgz#b7b1bc65ca8e7b5cef9124e13dc2b21e2ce4faee" + integrity sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ== + dependencies: + object-assign "^4.1.0" + string-width "^4.2.0" + optionalDependencies: + colors "^1.1.2" + cli-width@^2.0.0: version "2.2.1" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" @@ -3867,6 +4129,15 @@ cliui@^6.0.0: strip-ansi "^6.0.0" wrap-ansi "^6.2.0" +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + clone-deep@^0.2.4: version "0.2.4" resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.2.4.tgz#4e73dd09e9fb971cc38670c5dced9c1896481cc6" @@ -3897,6 +4168,13 @@ clsx@^1.0.2, clsx@^1.0.3, clsx@^1.0.4: resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188" integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA== +cmd-shim@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-4.1.0.tgz#b3a904a6743e9fede4148c6f3800bf2a08135bdd" + integrity sha512-lb9L7EM4I/ZRVuljLPEtUJOP+xiQVknZ4ZMpMgEp4JzNldPb27HU03hi6K1/6CoIuit/Zm/LQXySErFeXxDprw== + dependencies: + mkdirp-infer-owner "^2.0.0" + co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -3911,6 +4189,11 @@ coa@^2.0.2: chalk "^2.4.1" q "^1.1.2" +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + collapse-white-space@^1.0.2: version "1.0.6" resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287" @@ -3974,11 +4257,24 @@ colorette@^1.2.1, colorette@^1.2.2: resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== +colors@^1.1.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" + integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== + colors@~0.6.0-1: version "0.6.2" resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc" integrity sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w= +columnify@~1.5.4: + version "1.5.4" + resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb" + integrity sha1-Rzfd8ce2mop8NAVweC6UfuyOeLs= + dependencies: + strip-ansi "^3.0.0" + wcwidth "^1.0.0" + combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -4001,6 +4297,11 @@ commander@~2.1.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781" integrity sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E= +common-ancestor-path@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz#4f7d2d1394d91b7abdf51871c62f71eadb0182a7" + integrity sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w== + common-dir@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/common-dir/-/common-dir-2.0.2.tgz#cfea16f48564a0ecbb088065fad029047f469dc1" @@ -4085,6 +4386,11 @@ console-browserify@^1.1.0: resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" @@ -4161,17 +4467,17 @@ copy-webpack-plugin@^4.6.0: serialize-javascript "^1.4.0" core-js-compat@^3.6.2, core-js-compat@^3.9.0, core-js-compat@^3.9.1: - version "3.11.2" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.11.2.tgz#5048e367851cfd2c6c0cb81310757b4da296e385" - integrity sha512-gYhNwu7AJjecNtRrIfyoBabQ3ZG+llfPmg9BifIX8yxIpDyfNLRM73zIjINSm6z3dMdI1nwNC9C7uiy4pIC6cw== + version "3.12.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.12.1.tgz#2c302c4708505fa7072b0adb5156d26f7801a18b" + integrity sha512-i6h5qODpw6EsHAoIdQhKoZdWn+dGBF3dSS8m5tif36RlWvW3A6+yu2S16QHUo3CrkzrnEskMAt9f8FxmY9fhWQ== dependencies: browserslist "^4.16.6" semver "7.0.0" core-js-pure@^3.0.0: - version "3.11.2" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.11.2.tgz#10e3b35788c00f431bc0d601d7551475ec3e792c" - integrity sha512-DQxdEKm+zFsnON7ZGOgUAQXBt1UJJ01tOzN/HgQ7cNf0oEHW1tcBLfCQQd1q6otdLu5gAdvKYxKHAoXGwE/kiQ== + version "3.12.1" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.12.1.tgz#934da8b9b7221e2a2443dc71dfa5bd77a7ea00b8" + integrity sha512-1cch+qads4JnDSWsvc7d6nzlKAippwjUlf6vykkTLW53VSV+NkE6muGBToAjEA8pG90cSfcud3JgVmW2ds5TaQ== core-js@^2.4.0: version "2.6.12" @@ -4179,9 +4485,9 @@ core-js@^2.4.0: integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.0.0, core-js@^3.5.0, core-js@^3.6.0: - version "3.11.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.11.2.tgz#af087a43373fc6e72942917c4a4c3de43ed574d6" - integrity sha512-3tfrrO1JpJSYGKnd9LKTBPqgUES/UYiCzMKeqwR1+jF16q4kD1BY2NvqkfuzXwQ6+CIWm55V9cjD7PQd+hijdw== + version "3.12.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.12.1.tgz#6b5af4ff55616c08a44d386f1f510917ff204112" + integrity sha512-Ne9DKPHTObRuB09Dru5AjwKjY4cJHVGu+y5f7coGn1E9Grkc3p2iBwE9AI/nJzsE29mQF7oq+mhYYRqOMFN1Bw== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -4566,9 +4872,9 @@ d@1, d@^1.0.1: type "^1.0.1" damerau-levenshtein@^1.0.4, damerau-levenshtein@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz#143c1641cb3d85c60c32329e26899adea8701791" - integrity sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug== + version "1.0.7" + resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz#64368003512a1a6992593741a09a9d31a836f55d" + integrity sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw== dashdash@^1.12.0: version "1.14.1" @@ -4612,6 +4918,13 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9: dependencies: ms "2.0.0" +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== + dependencies: + ms "2.1.2" + debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" @@ -4619,12 +4932,10 @@ debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: dependencies: ms "^2.1.1" -debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" +debuglog@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" + integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= decamelize@^1.2.0: version "1.2.0" @@ -4730,7 +5041,12 @@ delegate@^3.1.2: resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166" integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw== -depd@~1.1.2: +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + +depd@^1.1.2, depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= @@ -4771,6 +5087,14 @@ detect-port-alt@1.1.6: address "^1.0.1" debug "^2.6.0" +dezalgo@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456" + integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY= + dependencies: + asap "^2.0.0" + wrappy "1" + diff-sequences@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5" @@ -4781,6 +5105,11 @@ diff-sequences@^26.6.2: resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q== +diff@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" + integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== + diffie-hellman@^5.0.0: version "5.0.3" resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" @@ -5005,9 +5334,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.723: - version "1.3.725" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.725.tgz#04fc83f9189169aff50f0a00c6b4090b910cba85" - integrity sha512-2BbeAESz7kc6KBzs7WVrMc1BY5waUphk4D4DX5dSQXJhsc3tP5ZFaiyuL0AB7vUKzDYpIeYwTYlEfxyjsGUrhw== + version "1.3.727" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf" + integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg== elliptic@^6.5.3: version "6.5.4" @@ -5067,6 +5396,13 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= +encoding@^0.1.12: + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== + dependencies: + iconv-lite "^0.6.2" + end-of-stream@^1.0.0, end-of-stream@^1.1.0: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" @@ -5093,6 +5429,16 @@ entities@^2.0.0: resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== +env-paths@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== + +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== + errno@^0.1.3, errno@~0.1.7: version "0.1.8" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" @@ -5166,7 +5512,7 @@ es6-promise@^4.2.6: resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w== -es6-symbol@^3.1.0, es6-symbol@^3.1.1, es6-symbol@~3.1.3: +es6-symbol@^3.1.1, es6-symbol@~3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18" integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA== @@ -5987,9 +6333,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.3.6" follow-redirects@^1.0.0, follow-redirects@^1.10.0: - version "1.14.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz#f5d260f95c5f8c105894491feee5dc8993b402fe" - integrity sha512-0vRwd7RKQBTt+mgu87mtYeofLFZpTas2S9zY+jIeuLJMNvudIgF52nr19q40HOwH5RrhWIPuj9puybzSJiRrVg== + version "1.14.1" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43" + integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg== for-each@^0.3.3: version "0.3.3" @@ -6109,7 +6455,7 @@ fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-minipass@^2.0.0: +fs-minipass@^2.0.0, fs-minipass@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== @@ -6169,12 +6515,26 @@ functional-red-black-tree@^1.0.1: resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2: version "1.0.0-beta.2" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== -get-caller-file@^2.0.1: +get-caller-file@^2.0.1, get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== @@ -6265,9 +6625,9 @@ glob-to-regexp@^0.3.0: integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -6354,7 +6714,7 @@ good-listener@^1.2.2: dependencies: delegate "^3.1.2" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.6: version "4.2.6" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== @@ -6422,6 +6782,11 @@ has-symbols@^1.0.1, has-symbols@^1.0.2: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -6508,6 +6873,13 @@ hosted-git-info@^2.1.4: resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== +hosted-git-info@^4.0.1, hosted-git-info@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" + integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== + dependencies: + lru-cache "^6.0.0" + hpack.js@^2.1.6: version "2.1.6" resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" @@ -6616,6 +6988,11 @@ htmlparser2@^5.0: domutils "^2.4.2" entities "^2.0.0" +http-cache-semantics@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" + integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + http-deceiver@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" @@ -6658,6 +7035,15 @@ http-parser-js@>=0.5.1: resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9" integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg== +http-proxy-agent@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" + integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== + dependencies: + "@tootallnate/once" "1" + agent-base "6" + debug "4" + http-proxy-middleware@0.19.1: version "0.19.1" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a" @@ -6691,11 +7077,26 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= +https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + human-signals@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== +humanize-ms@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" + integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0= + dependencies: + ms "^2.0.0" + humanize-url@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/humanize-url/-/humanize-url-1.0.1.tgz#f4ab99e0d288174ca4e1e50407c55fbae464efff" @@ -6716,6 +7117,13 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24: dependencies: safer-buffer ">= 2.1.2 < 3" +iconv-lite@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01" + integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + icss-utils@^4.0.0, icss-utils@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" @@ -6740,6 +7148,13 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= +ignore-walk@^3.0.3: + version "3.0.4" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335" + integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ== + dependencies: + minimatch "^3.0.4" + ignore@^3.3.5: version "3.3.10" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" @@ -6861,6 +7276,25 @@ ini@^1.3.5: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== +ini@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" + integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== + +init-package-json@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-2.0.3.tgz#c8ae4f2a4ad353bcbc089e5ffe98a8f1a314e8fd" + integrity sha512-tk/gAgbMMxR6fn1MgMaM1HpU1ryAmBWWitnxG5OhuNXeX0cbpbgV5jA4AIpQJVNoyOfOevTtO6WX+rPs+EFqaQ== + dependencies: + glob "^7.1.1" + npm-package-arg "^8.1.2" + promzard "^0.3.0" + read "~1.0.1" + read-package-json "^3.0.1" + semver "^7.3.5" + validate-npm-package-license "^3.0.4" + validate-npm-package-name "^3.0.0" + inquirer@6.5.0: version "6.5.0" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.0.tgz#2303317efc9a4ea7ec2e2df6f86569b734accf42" @@ -6947,6 +7381,11 @@ ip-regex@^2.1.0: resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= +ip-regex@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.3.0.tgz#687275ab0f57fa76978ff8f4dddc8a23d5990db5" + integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q== + ip@^1.1.0, ip@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" @@ -7017,9 +7456,9 @@ is-arrayish@^0.3.1: integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== is-bigint@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2" - integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg== + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a" + integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA== is-binary-path@^1.0.0: version "1.0.1" @@ -7036,18 +7475,18 @@ is-binary-path@~2.1.0: binary-extensions "^2.0.0" is-boolean-object@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0" - integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA== + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8" + integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" is-buffer@^1.0.2, is-buffer@^1.1.4, is-buffer@^1.1.5, is-buffer@~1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-buffer@^2.0.0: +is-buffer@^2.0.0, is-buffer@^2.0.4: version "2.0.5" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== @@ -7064,6 +7503,13 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" +is-cidr@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-4.0.2.tgz#94c7585e4c6c77ceabf920f8cde51b8c0fda8814" + integrity sha512-z4a1ENUajDbEl/Q6/pVBpTR1nBjjEE1X7qb7bmWYanNnPoKAvUCPFKeXV6Fe4mgTkWKBqiHIcwsI3SndiO5FeA== + dependencies: + cidr-regex "^3.1.1" + is-color-stop@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345" @@ -7098,9 +7544,9 @@ is-data-descriptor@^1.0.0: kind-of "^6.0.0" is-date-object@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" - integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5" + integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A== is-decimal@^1.0.0: version "1.0.4" @@ -7152,6 +7598,13 @@ is-extglob@^2.1.0, is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" + is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" @@ -7191,15 +7644,20 @@ is-in-browser@^1.0.2, is-in-browser@^1.1.3: resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835" integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU= +is-lambda@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" + integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU= + is-negative-zero@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== is-number-object@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197" - integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw== + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb" + integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw== is-number@^3.0.0: version "3.0.0" @@ -7260,12 +7718,12 @@ is-potential-custom-element-name@^1.0.0: integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== is-regex@^1.0.4, is-regex@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251" - integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg== + version "1.1.3" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f" + integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ== dependencies: call-bind "^1.0.2" - has-symbols "^1.0.1" + has-symbols "^1.0.2" is-regexp@^1.0.0: version "1.0.0" @@ -7293,16 +7751,16 @@ is-stream@^2.0.0: integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== is-string@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" - integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f" + integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w== is-symbol@^1.0.2, is-symbol@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" - integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== dependencies: - has-symbols "^1.0.1" + has-symbols "^1.0.2" is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" @@ -8351,7 +8809,7 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== -json-parse-even-better-errors@^2.3.0: +json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== @@ -8378,6 +8836,11 @@ json-stable-stringify@^1.0.1: dependencies: jsonify "~0.0.0" +json-stringify-nice@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz#2c937962b80181d3f317dd39aa323e14f5a60a67" + integrity sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw== + json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" @@ -8414,6 +8877,16 @@ jsonify@~0.0.0: resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= +jsonparse@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" + integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= + +jsonschema@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.0.tgz#1afa34c4bc22190d8e42271ec17ac8b3404f87b2" + integrity sha512-/YgW6pRMr6M7C+4o8kS+B/2myEpHCrxO4PEWnqJNBFMjn7EWXqlQ4tGwL6xTHeRplwuZmcAncdvfOad1nT2yMw== + jspdf-autotable@3.5.9: version "3.5.9" resolved "https://registry.yarnpkg.com/jspdf-autotable/-/jspdf-autotable-3.5.9.tgz#8a625ef2aead44271da95e9f649843c401536925" @@ -8586,6 +9059,16 @@ jszip@^3.5.0: readable-stream "~2.3.6" set-immediate-shim "~1.0.1" +just-diff-apply@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-3.0.0.tgz#a77348d24f0694e378b57293dceb65bdf5a91c4f" + integrity sha512-K2MLc+ZC2DVxX4V61bIKPeMUUfj1YYZ3h0myhchDXOW1cKoPZMnjIoNCqv9bF2n5Oob1PFxuR2gVJxkxz4e58w== + +just-diff@^3.0.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-3.1.1.tgz#d50c597c6fd4776495308c63bdee1b6839082647" + integrity sha512-sdMWKjRq8qWZEjDcVA6llnUT8RDEBIfOiGpYFPYa9u+2c39JCsejktSP7mj5eRid5EIvTzIpQ2kDOCw1Nq9BjQ== + killable@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" @@ -8692,6 +9175,116 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" +libnpmaccess@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-4.0.2.tgz#781832fb7ccb867b26343a75a85ad9c43e50406e" + integrity sha512-avXtJibZuGap0/qADDYqb9zdpgzVu/yG5+tl2sTRa7MCkDNv2ZlGwCYI0r6/+tmqXPj0iB9fKexHz426vB326w== + dependencies: + aproba "^2.0.0" + minipass "^3.1.1" + npm-package-arg "^8.1.2" + npm-registry-fetch "^10.0.0" + +libnpmdiff@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-2.0.4.tgz#bb1687992b1a97a8ea4a32f58ad7c7f92de53b74" + integrity sha512-q3zWePOJLHwsLEUjZw3Kyu/MJMYfl4tWCg78Vl6QGSfm4aXBUSVzMzjJ6jGiyarsT4d+1NH4B1gxfs62/+y9iQ== + dependencies: + "@npmcli/disparity-colors" "^1.0.1" + "@npmcli/installed-package-contents" "^1.0.7" + binary-extensions "^2.2.0" + diff "^5.0.0" + minimatch "^3.0.4" + npm-package-arg "^8.1.1" + pacote "^11.3.0" + tar "^6.1.0" + +libnpmexec@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-1.1.0.tgz#daa79d4545e21d0eb6887a33e0bbc8ab466099b2" + integrity sha512-OWpsPWtD6CAn66JouyjBfhQ9eS1mAtXgZXXd1SoAyUP3Mol+ao9IJ2THcJQcgX96keVmZkUA11uJS5ZNEd9DwA== + dependencies: + "@npmcli/arborist" "^2.3.0" + "@npmcli/ci-detect" "^1.3.0" + "@npmcli/run-script" "^1.8.4" + chalk "^4.1.0" + mkdirp-infer-owner "^2.0.0" + npm-package-arg "^8.1.2" + pacote "^11.3.1" + proc-log "^1.0.0" + read "^1.0.7" + read-package-json-fast "^2.0.2" + walk-up-path "^1.0.0" + +libnpmfund@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-1.0.2.tgz#d9552d4b76dd7f0a1a61b7af6b8f27184e51b0f5" + integrity sha512-Scw2JiLxfT7wqW/VbxIXV8u3FaFT/ZlR8YLFgTdCPsL1Hhli0554ZXyP8JTu1sLeDpHsoqtgLb4mgYVQnqigjA== + dependencies: + "@npmcli/arborist" "^2.0.0" + +libnpmhook@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-6.0.2.tgz#4a7ad17d7c0f7e0d0e4268c443147938f6bfc534" + integrity sha512-fTw+8i6iyz9v6azSvQEVYxQhAaE2X1eiVMAUqsiwECWeylyc5KUoghHyYg0Kz5jEy9IOTaWYJXc6gMf0rQFpow== + dependencies: + aproba "^2.0.0" + npm-registry-fetch "^10.0.0" + +libnpmorg@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-2.0.2.tgz#395344d6b43c0b63a7b03f9e29c191144c0dd7f9" + integrity sha512-FY5Mzd2CblVqLWwhEIuefzdWwZOxYN1Vvk8KnXxrPhXHDijuQqaN9wgxZlsHwdGC02kPoDKkg67mH/ir/W/YLQ== + dependencies: + aproba "^2.0.0" + npm-registry-fetch "^10.0.0" + +libnpmpack@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-2.0.1.tgz#d3eac25cc8612f4e7cdeed4730eee339ba51c643" + integrity sha512-He4/jxOwlaQ7YG7sIC1+yNeXeUDQt8RLBvpI68R3RzPMZPa4/VpxhlDo8GtBOBDYoU8eq6v1wKL38sq58u4ibQ== + dependencies: + "@npmcli/run-script" "^1.8.3" + npm-package-arg "^8.1.0" + pacote "^11.2.6" + +libnpmpublish@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-4.0.1.tgz#08ca2cbb5d7f6be1ce4f3f9c49b3822682bcf166" + integrity sha512-hZCrZ8v4G9YH3DxpIyBdob25ijD5v5LNzRbwsej4pPDopjdcLLj1Widl+BUeFa7D0ble1JYL4F3owjLJqiA8yA== + dependencies: + normalize-package-data "^3.0.2" + npm-package-arg "^8.1.2" + npm-registry-fetch "^10.0.0" + semver "^7.1.3" + ssri "^8.0.1" + +libnpmsearch@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-3.1.1.tgz#418ad6a2587b77b68222210f0a864a96d3841d57" + integrity sha512-XpJpsc7cg7+gdsC5IglXrPjeGzJh+GLhy8yLv4iKPhUFoe1s7dQvhsP5lN7YF0T98WwdEoMkKmbRJRCjEn3pEw== + dependencies: + npm-registry-fetch "^10.0.0" + +libnpmteam@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-2.0.3.tgz#dee3f113f9f8901ecbebb49ead13845874ed845d" + integrity sha512-bCNyYddHmvGEfxOYIk5WcdWHXHIygfAo5tmcGf19YyIG42igd0+CckpuXXJgtIAMZSTFhwskWx9YZ9CmWL94CA== + dependencies: + aproba "^2.0.0" + npm-registry-fetch "^10.0.0" + +libnpmversion@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-1.2.0.tgz#e181eb7ab750003b7fd29a578c31e84bb91a67b9" + integrity sha512-0pfmobLZbOvq1cLIONZk8ISvEM1k3JdkNXWhMDZvUeH+ijBNvMVdPu/CPUr1eDFbNINS3b6R/0PbTIZDVz7thg== + dependencies: + "@npmcli/git" "^2.0.7" + "@npmcli/run-script" "^1.8.4" + json-parse-even-better-errors "^2.3.1" + semver "^7.3.5" + stringify-package "^1.0.1" + lie@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e" @@ -8958,6 +9551,27 @@ make-dir@^3.0.0, make-dir@^3.0.2: dependencies: semver "^6.0.0" +make-fetch-happen@^8.0.14, make-fetch-happen@^8.0.9: + version "8.0.14" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz#aaba73ae0ab5586ad8eaa68bd83332669393e222" + integrity sha512-EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ== + dependencies: + agentkeepalive "^4.1.3" + cacache "^15.0.5" + http-cache-semantics "^4.1.0" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + is-lambda "^1.0.1" + lru-cache "^6.0.0" + minipass "^3.1.3" + minipass-collect "^1.0.2" + minipass-fetch "^1.3.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + promise-retry "^2.0.1" + socks-proxy-agent "^5.0.0" + ssri "^8.0.0" + makeerror@1.0.x: version "1.0.11" resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" @@ -9233,6 +9847,17 @@ minipass-collect@^1.0.2: dependencies: minipass "^3.0.0" +minipass-fetch@^1.3.0, minipass-fetch@^1.3.2: + version "1.3.3" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.3.3.tgz#34c7cea038c817a8658461bf35174551dce17a0a" + integrity sha512-akCrLDWfbdAWkMLBxJEeWTdNsjML+dt5YgOI4gJ53vuO0vrmYQkUPxa6j6V65s9CcePIr2SSWqjT2EcrNseryQ== + dependencies: + minipass "^3.1.0" + minipass-sized "^1.0.3" + minizlib "^2.0.0" + optionalDependencies: + encoding "^0.1.12" + minipass-flush@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" @@ -9240,20 +9865,43 @@ minipass-flush@^1.0.5: dependencies: minipass "^3.0.0" -minipass-pipeline@^1.2.2: +minipass-json-stream@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7" + integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg== + dependencies: + jsonparse "^1.3.1" + minipass "^3.0.0" + +minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== dependencies: minipass "^3.0.0" -minipass@^3.0.0, minipass@^3.1.1: +minipass-sized@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" + integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== + dependencies: + minipass "^3.0.0" + +minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== dependencies: yallist "^4.0.0" +minizlib@^2.0.0, minizlib@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" + integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== + dependencies: + minipass "^3.0.0" + yallist "^4.0.0" + mississippi@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f" @@ -9302,6 +9950,15 @@ mixin-object@^2.0.1: for-in "^0.1.3" is-extendable "^0.1.1" +mkdirp-infer-owner@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316" + integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw== + dependencies: + chownr "^2.0.0" + infer-owner "^1.0.4" + mkdirp "^1.0.3" + mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" @@ -9309,6 +9966,11 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: dependencies: minimist "^1.2.5" +mkdirp@^1.0.3, mkdirp@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" @@ -9341,7 +10003,7 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@^2.1.1: +ms@^2.0.0, ms@^2.1.1, ms@^2.1.2: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -9364,7 +10026,7 @@ mute-stream@0.0.7: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= -mute-stream@0.0.8: +mute-stream@0.0.8, mute-stream@~0.0.4: version "0.0.8" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== @@ -9436,6 +10098,22 @@ node-forge@^0.10.0: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== +node-gyp@^7.1.0, node-gyp@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae" + integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ== + dependencies: + env-paths "^2.2.0" + glob "^7.1.4" + graceful-fs "^4.2.3" + nopt "^5.0.0" + npmlog "^4.1.2" + request "^2.88.2" + rimraf "^3.0.2" + semver "^7.3.2" + tar "^6.0.2" + which "^2.0.2" + node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" @@ -9503,6 +10181,13 @@ node-releases@^1.1.29, node-releases@^1.1.52, node-releases@^1.1.71: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb" integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg== +nopt@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" + integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== + dependencies: + abbrev "1" + normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -9513,6 +10198,16 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" +normalize-package-data@^3.0.0, normalize-package-data@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz#cae5c410ae2434f9a6c1baa65d5bc3b9366c8699" + integrity sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg== + dependencies: + hosted-git-info "^4.0.1" + resolve "^1.20.0" + semver "^7.3.4" + validate-npm-package-license "^3.0.1" + normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" @@ -9545,6 +10240,81 @@ normalize-url@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== +npm-audit-report@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-2.1.4.tgz#b14c4625131fb7bcacc4b1c83842af1f58c92c98" + integrity sha512-Tz7rnfskSdZ0msTzt2mENC/B+H2QI8u0jN0ck7o3zDsQYIQrek/l3MjEc+CARer+64LsVTU6ZIqNuh0X55QPhw== + dependencies: + chalk "^4.0.0" + +npm-bundled@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1" + integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ== + dependencies: + npm-normalize-package-bin "^1.0.1" + +npm-install-checks@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4" + integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w== + dependencies: + semver "^7.1.1" + +npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" + integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== + +npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.1, npm-package-arg@^8.1.2: + version "8.1.2" + resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.2.tgz#b868016ae7de5619e729993fbd8d11dc3c52ab62" + integrity sha512-6Eem455JsSMJY6Kpd3EyWE+n5hC+g9bSyHr9K9U2zqZb7+02+hObQ2c0+8iDk/mNF+8r1MhY44WypKJAkySIYA== + dependencies: + hosted-git-info "^4.0.1" + semver "^7.3.4" + validate-npm-package-name "^3.0.0" + +npm-packlist@^2.1.4: + version "2.2.2" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8" + integrity sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg== + dependencies: + glob "^7.1.6" + ignore-walk "^3.0.3" + npm-bundled "^1.1.1" + npm-normalize-package-bin "^1.0.1" + +npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.0, npm-pick-manifest@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148" + integrity sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA== + dependencies: + npm-install-checks "^4.0.0" + npm-normalize-package-bin "^1.0.1" + npm-package-arg "^8.1.2" + semver "^7.3.4" + +npm-profile@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-5.0.3.tgz#d7f519002f477ebec925cd4b6c02287674f8b09c" + integrity sha512-fZbRtN7JyEPBkdr+xLlj0lQrNI42TKlw/3EvEB7OzrwiUNl4veHsu2u06N2MrF5EiQbNUuZ54156Qr1K4R+91w== + dependencies: + npm-registry-fetch "^10.0.0" + +npm-registry-fetch@^10.0.0, npm-registry-fetch@^10.1.1: + version "10.1.1" + resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-10.1.1.tgz#97bc7a0fca5e8f76cc5162185b8de8caa8bea639" + integrity sha512-F6a3l+ffCQ7hvvN16YG5bpm1rPZntCg66PLHDQ1apWJPOCUVHoKnL2w5fqEaTVhp42dmossTyXeR7hTGirfXrg== + dependencies: + lru-cache "^6.0.0" + make-fetch-happen "^8.0.9" + minipass "^3.1.3" + minipass-fetch "^1.3.0" + minipass-json-stream "^1.0.1" + minizlib "^2.0.0" + npm-package-arg "^8.0.0" + npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -9559,6 +10329,94 @@ npm-run-path@^4.0.0: dependencies: path-key "^3.0.0" +npm-user-validate@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz#31428fc5475fe8416023f178c0ab47935ad8c561" + integrity sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw== + +npm@^7.11.2: + version "7.12.0" + resolved "https://registry.yarnpkg.com/npm/-/npm-7.12.0.tgz#c2fb58bbb4f7bbef339a945a28b7c75117799bdd" + integrity sha512-8Zvas3+1zKtE4uXIxHWRpg1bqGNrOta9RTDZWJ2k+EfOfzOggPQh9N4jHtsrIuGLawXv9xCWyvauke1UWMOMoA== + dependencies: + "@npmcli/arborist" "^2.4.2" + "@npmcli/ci-detect" "^1.2.0" + "@npmcli/config" "^2.2.0" + "@npmcli/run-script" "^1.8.5" + abbrev "~1.1.1" + ansicolors "~0.3.2" + ansistyles "~0.1.3" + archy "~1.0.0" + byte-size "^7.0.1" + cacache "^15.0.6" + chalk "^4.1.0" + chownr "^2.0.0" + cli-columns "^3.1.2" + cli-table3 "^0.6.0" + columnify "~1.5.4" + glob "^7.1.4" + graceful-fs "^4.2.6" + hosted-git-info "^4.0.2" + ini "^2.0.0" + init-package-json "^2.0.3" + is-cidr "^4.0.2" + json-parse-even-better-errors "^2.3.1" + leven "^3.1.0" + libnpmaccess "^4.0.2" + libnpmdiff "^2.0.4" + libnpmexec "^1.1.0" + libnpmfund "^1.0.2" + libnpmhook "^6.0.2" + libnpmorg "^2.0.2" + libnpmpack "^2.0.1" + libnpmpublish "^4.0.1" + libnpmsearch "^3.1.1" + libnpmteam "^2.0.3" + libnpmversion "^1.2.0" + make-fetch-happen "^8.0.14" + minipass "^3.1.3" + minipass-pipeline "^1.2.4" + mkdirp "^1.0.4" + mkdirp-infer-owner "^2.0.0" + ms "^2.1.2" + node-gyp "^7.1.2" + nopt "^5.0.0" + npm-audit-report "^2.1.4" + npm-package-arg "^8.1.2" + npm-pick-manifest "^6.1.1" + npm-profile "^5.0.3" + npm-registry-fetch "^10.1.1" + npm-user-validate "^1.0.1" + npmlog "~4.1.2" + opener "^1.5.2" + pacote "^11.3.3" + parse-conflict-json "^1.1.1" + qrcode-terminal "^0.12.0" + read "~1.0.7" + read-package-json "^3.0.1" + read-package-json-fast "^2.0.2" + readdir-scoped-modules "^1.1.0" + rimraf "^3.0.2" + semver "^7.3.5" + ssri "^8.0.1" + tar "^6.1.0" + text-table "~0.2.0" + tiny-relative-date "^1.3.0" + treeverse "^1.0.4" + validate-npm-package-name "~3.0.0" + which "^2.0.2" + write-file-atomic "^3.0.3" + +npmlog@^4.1.2, npmlog@~4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + nth-check@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" @@ -9571,6 +10429,11 @@ num2fraction@^1.2.2: resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + nwsapi@^2.0.7, nwsapi@^2.1.3, nwsapi@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" @@ -9601,9 +10464,9 @@ object-hash@^2.0.1: integrity sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ== object-inspect@^1.9.0: - version "1.10.2" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.2.tgz#b6385a3e2b7cae0b5eafcf90cddf85d128767f30" - integrity sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA== + version "1.10.3" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369" + integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw== object-is@^1.0.1: version "1.1.5" @@ -9686,14 +10549,12 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== -ohm-fork@^0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/ohm-fork/-/ohm-fork-0.15.1.tgz#0024fb74c714a80fe377eece59184eb3c5a0afc4" - integrity sha512-Avfj9HqP10uwZD20gjwcMA6vyxf5QMWYSyAD332GkDk44hktYDmZKNIpY7Ks6JpJ2HHQC0xzSj4hU4UcsYDjvQ== +ohm-js@^15.5.0: + version "15.5.0" + resolved "https://registry.yarnpkg.com/ohm-js/-/ohm-js-15.5.0.tgz#45d23f4bbf52281853d35524ccf62a0a4663f8b4" + integrity sha512-pmTx/SXZLMekLXJi0V6TEfESpPCSd5B95pWKaY+1ZIgvV5IEUiP2K3EdkESbLZ4VpO94oNCEJ2OTmQyzxSklmA== dependencies: - es6-symbol "^3.1.0" - inherits "^2.0.3" - is-buffer "^1.1.4" + is-buffer "^2.0.4" util-extend "^1.0.3" on-finished@~2.3.0: @@ -9744,6 +10605,11 @@ open@^7.0.2: is-docker "^2.0.0" is-wsl "^2.1.1" +opener@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" + integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A== + opn@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" @@ -9869,6 +10735,13 @@ p-map@^3.0.0: dependencies: aggregate-error "^3.0.0" +p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" + p-reduce@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa" @@ -9891,6 +10764,31 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== +pacote@^11.1.11, pacote@^11.2.6, pacote@^11.3.0, pacote@^11.3.1, pacote@^11.3.3: + version "11.3.3" + resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.3.3.tgz#d7d6091464f77c09691699df2ded13ab906b3e68" + integrity sha512-GQxBX+UcVZrrJRYMK2HoG+gPeSUX/rQhnbPkkGrCYa4n2F/bgClFPaMm0nsdnYrxnmUy85uMHoFXZ0jTD0drew== + dependencies: + "@npmcli/git" "^2.0.1" + "@npmcli/installed-package-contents" "^1.0.6" + "@npmcli/promise-spawn" "^1.2.0" + "@npmcli/run-script" "^1.8.2" + cacache "^15.0.5" + chownr "^2.0.0" + fs-minipass "^2.1.0" + infer-owner "^1.0.4" + minipass "^3.1.3" + mkdirp "^1.0.3" + npm-package-arg "^8.0.1" + npm-packlist "^2.1.4" + npm-pick-manifest "^6.0.0" + npm-registry-fetch "^10.0.0" + promise-retry "^2.0.1" + read-package-json-fast "^2.0.1" + rimraf "^3.0.2" + ssri "^8.0.1" + tar "^6.1.0" + pako@~1.0.2, pako@~1.0.5: version "1.0.11" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" @@ -9931,6 +10829,15 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5: pbkdf2 "^3.0.3" safe-buffer "^5.1.1" +parse-conflict-json@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-1.1.1.tgz#54ec175bde0f2d70abf6be79e0e042290b86701b" + integrity sha512-4gySviBiW5TRl7XHvp1agcS7SOe0KZOjC//71dzZVWJrY9hCrgtvl5v3SyIxCZ4fZF47TxD9nfzmxcx76xmbUw== + dependencies: + json-parse-even-better-errors "^2.3.0" + just-diff "^3.0.1" + just-diff-apply "^3.0.0" + parse-entities@^1.0.2, parse-entities@^1.1.0: version "1.2.2" resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.2.tgz#c31bf0f653b6661354f8973559cb86dd1d5edf50" @@ -10918,6 +11825,11 @@ private@^0.1.8: resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== +proc-log@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-1.0.0.tgz#0d927307401f69ed79341e83a0b2c9a13395eb77" + integrity sha512-aCk8AO51s+4JyuYGg3Q/a6gnrlDO09NpVWePtjp7xwphcoQ04x5WAfCyugcsbLooWcMJ87CLkD4+604IckEdhg== + process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -10933,11 +11845,29 @@ progress@^2.0.0: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== +promise-all-reject-late@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz#f8ebf13483e5ca91ad809ccc2fcf25f26f8643c2" + integrity sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw== + +promise-call-limit@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/promise-call-limit/-/promise-call-limit-1.0.1.tgz#4bdee03aeb85674385ca934da7114e9bcd3c6e24" + integrity sha512-3+hgaa19jzCGLuSCbieeRsu5C2joKfYn8pY6JAuXFRVfF4IO+L7UPpFWNTeWT9pM7uhskvbPPd/oEOktCn317Q== + promise-inflight@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== + dependencies: + err-code "^2.0.2" + retry "^0.12.0" + promise@^8.0.3: version "8.1.0" resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e" @@ -10953,6 +11883,13 @@ prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" +promzard@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee" + integrity sha1-JqXW7ox97kyxIggwWs+5O6OCqe4= + dependencies: + read "1" + prop-types@15.6.2: version "15.6.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102" @@ -11059,6 +11996,11 @@ q@^1.1.2: resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= +qrcode-terminal@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz#bb5b699ef7f9f0505092a3748be4464fe71b5819" + integrity sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ== + qs@6.7.0: version "6.7.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" @@ -11490,6 +12432,29 @@ react@^17.0.0: loose-envify "^1.1.0" object-assign "^4.1.1" +read-cmd-shim@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz#4a50a71d6f0965364938e9038476f7eede3928d9" + integrity sha512-HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw== + +read-package-json-fast@^2.0.1, read-package-json-fast@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.2.tgz#2dcb24d9e8dd50fb322042c8c35a954e6cc7ac9e" + integrity sha512-5fyFUyO9B799foVk4n6ylcoAktG/FbE3jwRKxvwaeSrIunaoMc0u81dzXxjeAFKOce7O5KncdfwpGvvs6r5PsQ== + dependencies: + json-parse-even-better-errors "^2.3.0" + npm-normalize-package-bin "^1.0.1" + +read-package-json@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-3.0.1.tgz#c7108f0b9390257b08c21e3004d2404c806744b9" + integrity sha512-aLcPqxovhJTVJcsnROuuzQvv6oziQx4zd3JvG0vGCL5MjTONUc4uJ90zCBC6R7W7oUKBNoR/F8pkyfVwlbxqng== + dependencies: + glob "^7.1.1" + json-parse-even-better-errors "^2.3.0" + normalize-package-data "^3.0.0" + npm-normalize-package-bin "^1.0.0" + read-pkg-up@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" @@ -11543,7 +12508,14 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: +read@1, read@^1.0.7, read@~1.0.1, read@~1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4" + integrity sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ= + dependencies: + mute-stream "~0.0.4" + +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -11565,6 +12537,16 @@ readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.6.0: string_decoder "^1.1.1" util-deprecate "^1.0.1" +readdir-scoped-modules@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309" + integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw== + dependencies: + debuglog "^1.0.1" + dezalgo "^1.0.0" + graceful-fs "^4.1.2" + once "^1.3.0" + readdirp@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" @@ -11922,7 +12904,7 @@ resolve@1.15.0: dependencies: path-parse "^1.0.6" -resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2, resolve@^1.8.1: +resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.8.1: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -12018,7 +13000,7 @@ rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1: dependencies: glob "^7.1.3" -rimraf@^3.0.0: +rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -12074,7 +13056,7 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -12174,9 +13156,9 @@ select@^1.1.2: integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0= selfsigned@^1.10.7, selfsigned@^1.10.8: - version "1.10.8" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30" - integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w== + version "1.10.11" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9" + integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA== dependencies: node-forge "^0.10.0" @@ -12200,7 +13182,7 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@^7.3.2: +semver@^7.1.1, semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== @@ -12261,7 +13243,7 @@ serve-static@1.14.1: parseurl "~1.3.3" send "0.17.1" -set-blocking@^2.0.0: +set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= @@ -12405,6 +13387,11 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" +smart-buffer@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba" + integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw== + snapdragon-node@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" @@ -12477,6 +13464,23 @@ sockjs@^0.3.21: uuid "^3.4.0" websocket-driver "^0.7.4" +socks-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz#7c0f364e7b1cf4a7a437e71253bed72e9004be60" + integrity sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA== + dependencies: + agent-base "6" + debug "4" + socks "^2.3.3" + +socks@^2.3.3: + version "2.6.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e" + integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA== + dependencies: + ip "^1.1.5" + smart-buffer "^4.1.0" + sort-keys@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" @@ -12636,6 +13640,13 @@ ssri@^7.0.0: figgy-pudding "^3.5.1" minipass "^3.1.1" +ssri@^8.0.0, ssri@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" + integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== + dependencies: + minipass "^3.1.1" + stable@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" @@ -12749,7 +13760,16 @@ string-natural-compare@^3.0.1: resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4" integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw== -string-width@^2.1.0: +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -12837,6 +13857,11 @@ stringify-object@^3.2.0, stringify-object@^3.3.0: is-obj "^1.0.1" is-regexp "^1.0.0" +stringify-package@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85" + integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg== + strip-ansi@5.2.0, strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" @@ -13020,6 +14045,18 @@ tapable@^1.0.0, tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== +tar@^6.0.2, tar@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83" + integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^3.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + terminal-link@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" @@ -13086,7 +14123,7 @@ test-exclude@^6.0.0: glob "^7.1.4" minimatch "^3.0.4" -text-table@0.2.0, text-table@^0.2.0: +text-table@0.2.0, text-table@^0.2.0, text-table@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= @@ -13141,6 +14178,11 @@ tiny-invariant@^1.0.6: resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz#634c5f8efdc27714b7f386c35e6760991d230875" integrity sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw== +tiny-relative-date@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07" + integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A== + tiny-warning@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" @@ -13244,6 +14286,11 @@ tr46@^2.0.2: dependencies: punycode "^2.1.1" +treeverse@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-1.0.4.tgz#a6b0ebf98a1bca6846ddc7ecbc900df08cb9cd5f" + integrity sha512-whw60l7r+8ZU8Tu/Uc2yxtc4ZTZbR/PF3u1IPNKGQ6p8EICLb3Z2lAgoqw9bqYd8IkgnsaOcLzYHFckjqNsf0g== + trim-repeated@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21" @@ -13495,12 +14542,12 @@ unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1: resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz#3f37fcf351279dcbca7480ab5889bb8a832ee1c6" integrity sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ== -unist-util-stringify-position@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" - integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g== +unist-util-stringify-position@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-3.0.0.tgz#d517d2883d74d0daa0b565adc3d10a02b4a8cde9" + integrity sha512-SdfAl8fsDclywZpfMDTVDxA2V7LjtRDTOFd44wUJamgl6OlVngsqWjxvermMYf60elWHbxhuRCZml7AnuXCaSA== dependencies: - "@types/unist" "^2.0.2" + "@types/unist" "^2.0.0" unist-util-visit-parents@1.1.2: version "1.1.2" @@ -13596,13 +14643,15 @@ use@^3.1.0: resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== -usfm-grammar@2.0.0-beta.4: - version "2.0.0-beta.4" - resolved "https://registry.yarnpkg.com/usfm-grammar/-/usfm-grammar-2.0.0-beta.4.tgz#bfdf8a2dd01456902df4e613518380a14b2119da" - integrity sha512-/jSriFMGkBNxevdTKQqDwNoFSUP1GsuPukEtFjIBbT2+Niaej8DZxnujhd426CY9i5KjfYBrOqsXf+dJAB+yeg== +usfm-grammar@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/usfm-grammar/-/usfm-grammar-2.0.0.tgz#760e1012bc548c4b3e114bd17eec527cc9a3ed92" + integrity sha512-tYssAScOT8BpfWqWl/vVaRnPrLJRciHr6zac14EtNEx8RE4p550Kkxd1ET+1dtsEczcOOsImla+NdBux/Y9vag== dependencies: - ohm-fork "^0.15.1" - yargs "^15.4.1" + jsonschema "^1.4.0" + npm "^7.11.2" + ohm-js "^15.5.0" + yargs "^16.2.0" usfm-js@^2.1.0: version "2.1.0" @@ -13690,15 +14739,15 @@ v8-compile-cache@^2.0.3: integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== v8-to-istanbul@^7.0.0: - version "7.1.1" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.1.tgz#04bfd1026ba4577de5472df4f5e89af49de5edda" - integrity sha512-p0BB09E5FRjx0ELN6RgusIPsSPhtgexSRcKETybEs6IGOTXJSZqfwxp7r//55nnu0f1AxltY5VvdVqy2vZf9AA== + version "7.1.2" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1" + integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" source-map "^0.7.3" -validate-npm-package-license@^3.0.1: +validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== @@ -13706,6 +14755,13 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" +validate-npm-package-name@^3.0.0, validate-npm-package-name@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e" + integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34= + dependencies: + builtins "^1.0.3" + vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" @@ -13731,12 +14787,12 @@ vfile-location@^2.0.0: integrity sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA== vfile-message@*: - version "2.0.4" - resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" - integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ== + version "3.0.1" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.0.1.tgz#b9bcf87cb5525e61777e0c6df07e816a577588a3" + integrity sha512-gYmSHcZZUEtYpTmaWaFJwsuUD70/rTY4v09COp8TGtOkix6gGxb/a8iTQByIY9ciTk9GwAwIXd/J9OPfM4Bvaw== dependencies: "@types/unist" "^2.0.0" - unist-util-stringify-position "^2.0.0" + unist-util-stringify-position "^3.0.0" vfile-message@^1.0.0: version "1.1.1" @@ -13793,6 +14849,11 @@ w3c-xmlserializer@^2.0.0: dependencies: xml-name-validator "^3.0.0" +walk-up-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-1.0.0.tgz#d4745e893dd5fd0dbb58dd0a4c6a33d9c9fec53e" + integrity sha512-hwj/qMDUEjCU5h0xr90KGCf0tg0/LgJbmOWgrWKYlcJZM7XvquvUJZ0G/HMGr7F7OQMOUuPHWP9JpriinkAlkg== + walker@^1.0.7, walker@~1.0.5: version "1.0.7" resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" @@ -13832,7 +14893,7 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" -wcwidth@^1.0.1: +wcwidth@^1.0.0, wcwidth@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g= @@ -14129,6 +15190,13 @@ which@^2.0.1, which@^2.0.2: dependencies: isexe "^2.0.0" +wide-align@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== + dependencies: + string-width "^1.0.2 || 2" + word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" @@ -14301,6 +15369,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -14315,7 +15392,7 @@ write-file-atomic@2.4.1: imurmurhash "^0.1.4" signal-exit "^3.0.2" -write-file-atomic@^3.0.0: +write-file-atomic@^3.0.0, write-file-atomic@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== @@ -14383,6 +15460,11 @@ y18n@^4.0.0: resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + yallist@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" @@ -14419,6 +15501,11 @@ yargs-parser@^18.1.2: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^20.2.2: + version "20.2.7" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" + integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== + yargs@^13.3.0, yargs@^13.3.2: version "13.3.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" @@ -14451,3 +15538,16 @@ yargs@^15.4.1: which-module "^2.0.0" y18n "^4.0.0" yargs-parser "^18.1.2" + +yargs@^16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" From f21da1e46d3a35689d8bffe38099c910aebd0245 Mon Sep 17 00:00:00 2001 From: Robert Hunt Date: Mon, 10 May 2021 10:52:03 +1200 Subject: [PATCH 05/15] Give more helpful info on 886 error --- src/core/notes-links-check.js | 45 ++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/src/core/notes-links-check.js b/src/core/notes-links-check.js index 38ef4657..4a6bc5e6 100644 --- a/src/core/notes-links-check.js +++ b/src/core/notes-links-check.js @@ -8,7 +8,7 @@ import { cachedGetFile, cachedGetFileUsingFullURL, checkMarkdownText } from '../ import { userLog, debugLog, functionLog, parameterAssert, logicAssert, dataAssert, ourParseInt } from './utilities'; -// const NOTES_LINKS_VALIDATOR_VERSION_STRING = '0.7.19'; +// const NOTES_LINKS_VALIDATOR_VERSION_STRING = '0.7.20'; // const DEFAULT_LANGUAGE_CODE = 'en'; const DEFAULT_BRANCH = 'master'; @@ -92,6 +92,8 @@ async function alreadyChecked({ username, repository, path, branch }) { * @param {string} languageCode, e.g., 'en' * @param {string} repoCode, e.g., 'TN', 'SN', 'TN2', or even 'TWL' * @param {string} bookID + * @param {string} givenC + * @param {string} givenV * @param {string} fieldName, e.g., 'TWLink' or 'OccurrenceNote' or 'Note' or .md filename, etc. * @param {string} fieldText * @param {string} givenLocation @@ -154,6 +156,11 @@ export async function checkNotesLinksToOutside(languageCode, repoCode, bookID, g const ctarResult = { noticeList: [], checkedFileCount: 0, checkedFilenames: [], checkedRepoNames: [] }; + /** + * + * @description - adds a new notice entry from the partial fields given -- adding bookID and fieldName to the given fields + * @param {Object} noticeObject expected to contain priority, message, characterIndex, exerpt, location + */ function addNoticePartial(noticeObject) { // functionLog(`checkNotesLinksToOutside Notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${excerpt ? ` ${excerpt}` : ""}${location}`); parameterAssert(noticeObject.priority !== undefined, "cTNlnk addNoticePartial: 'priority' parameter should be defined"); @@ -294,13 +301,13 @@ export async function checkNotesLinksToOutside(languageCode, repoCode, bookID, g // if (regexResultArray[3] === 'brother') debugLog(`Fetched fileContent for ${JSON.stringify(twPathParameters)}: ${typeof twFileContent} ${twFileContent.length}`); } catch (trcGCerror) { console.error(`checkNotesLinksToOutside(${bookID}, ${fieldName}, …) failed to load TW`, twRepoUsername, twRepoName, filepath, twRepoBranch, trcGCerror.message); - addNoticePartial({ priority: 882, message: `Error loading TW article`, details: `linked from ${fieldName}`, excerpt: totalLink, location: `${ourLocation} ${filepath}: ${trcGCerror}` }); + addNoticePartial({ priority: 882, message: `Error loading TW article`, details: `${twRepoUsername} ${twRepoName} ${twRepoBranch} ${filepath}`, excerpt: totalLink, location: `${ourLocation} ${filepath}: ${trcGCerror}` }); } if (!twFileContent) - addNoticePartial({ priority: 883, message: `Unable to find/load TW article`, details: `linked from ${fieldName}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); + addNoticePartial({ priority: 883, message: `Unable to find/load TW article`, details: `${twRepoUsername} ${twRepoName} ${twRepoBranch} ${filepath}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); else { // we got the content of the TW article if (twFileContent.length < 10) - addNoticePartial({ priority: 881, message: `TW article seems empty`, details: `linked from ${fieldName}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); + addNoticePartial({ priority: 881, message: `TW article seems empty`, details: `${twRepoUsername} ${twRepoName} ${twRepoBranch} ${filepath}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); // THIS IS DISABLED COZ IT CAN GIVE AN INFINITE LOOP !!! // else if (checkingOptions?.disableLinkedTWArticlesCheckFlag !== true) { // // functionLog(`checkNotesLinksToOutside got ${checkingOptions?.disableLinkedTWArticlesCheckFlag} so checking TW article: ${filepath}`); @@ -357,14 +364,14 @@ export async function checkNotesLinksToOutside(languageCode, repoCode, bookID, g // debugLog("Fetched fileContent for", taRepoName, filepath, typeof fileContent, fileContent.length); } catch (trcGCerror) { // console.error(`checkNotesLinksToOutside(${bookID}, ${fieldName}, …) failed to load TA for '${taRepoUsername}', '${taRepoName}', '${filepath}', '${taRepoBranch}', ${trcGCerror.message}`); - addNoticePartial({ priority: 885, message: `Error loading TA article`, details: `linked from ${fieldName}`, excerpt: totalLink, location: `${ourLocation} ${filepath}: ${trcGCerror}` }); + addNoticePartial({ priority: 885, message: `Error loading TA article`, details: `${taRepoUsername} ${taRepoName} ${taRepoBranch} ${filepath}`, excerpt: totalLink, location: `${ourLocation} ${filepath}: ${trcGCerror}` }); alreadyGaveError = true; } if (!alreadyGaveError) { if (!taFileContent) - addNoticePartial({ priority: 886, message: `Unable to find/load TA article`, details: `linked from ${fieldName}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); + addNoticePartial({ priority: 886, message: `Unable to find/load TA article`, details: `${taRepoUsername} ${taRepoName} ${taRepoBranch} ${filepath}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); else if (taFileContent.length < 10) - addNoticePartial({ priority: 884, message: `TA article seems empty`, details: `linked from ${fieldName}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); + addNoticePartial({ priority: 884, message: `TA article seems empty`, details: `${taRepoUsername} ${taRepoName} ${taRepoBranch} ${filepath}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); else if (checkingOptions?.disableLinkedTAArticlesCheckFlag !== true) { // functionLog(`checkNotesLinksToOutside got ${checkingOptions?.disableLinkedTAArticlesCheckFlag} so checking TA article: ${filepath}`); if (await alreadyChecked(taPathParameters) !== true) { @@ -413,14 +420,14 @@ export async function checkNotesLinksToOutside(languageCode, repoCode, bookID, g // debugLog("Fetched fileContent for", taRepoName, filepath, typeof fileContent, fileContent.length); } catch (trcGCerror) { // console.error(`checkNotesLinksToOutside(${bookID}, ${fieldName}, …) failed to load TA for '${taRepoUsername}', '${taRepoName}', '${filepath}', '${taRepoBranch}', ${trcGCerror.message}`); - addNoticePartial({ priority: 885, message: `Error loading TA article`, details: `linked from ${fieldName}`, excerpt: totalLink, location: `${ourLocation} ${filepath}: ${trcGCerror}` }); + addNoticePartial({ priority: 885, message: `Error loading TA article`, details: `${taRepoUsername} ${taRepoName} ${taRepoBranch} ${filepath}`, excerpt: totalLink, location: `${ourLocation} ${filepath}: ${trcGCerror}` }); alreadyGaveError = true; } if (!alreadyGaveError) { if (!taFileContent) - addNoticePartial({ priority: 886, message: `Unable to find/load TA article`, details: `linked from ${fieldName}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); + addNoticePartial({ priority: 886, message: `Unable to find/load TA article`, details: `${taRepoUsername} ${taRepoName} ${taRepoBranch} ${filepath}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); else if (taFileContent.length < 10) - addNoticePartial({ priority: 884, message: `TA article seems empty`, details: `linked from ${fieldName}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); + addNoticePartial({ priority: 884, message: `TA article seems empty`, details: `${taRepoUsername} ${taRepoName} ${taRepoBranch} ${filepath}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); // Don't do this or it gets infinite recursion!!! // else if (checkingOptions?.disableLinkedTAArticlesCheckFlag !== true) { // // functionLog(`checkNotesLinksToOutside got ${checkingOptions?.disableLinkedTAArticlesCheckFlag} so checking TA article: ${filepath}`); @@ -463,14 +470,14 @@ export async function checkNotesLinksToOutside(languageCode, repoCode, bookID, g // debugLog("Fetched fileContent for", taRepoName, filepath, typeof fileContent, fileContent.length); } catch (trcGCerror) { // console.error(`checkNotesLinksToOutside(${bookID}, ${fieldName}, …) failed to load TA for '${taRepoUsername}', '${taRepoName}', '${filepath}', '${taRepoBranch}', ${trcGCerror.message}`); - addNoticePartial({ priority: 885, message: `Error loading TA article`, details: `linked from ${fieldName}`, excerpt: totalLink, location: `${ourLocation} ${filepath}: ${trcGCerror}` }); + addNoticePartial({ priority: 885, message: `Error loading TA article`, details: `${taRepoUsername} ${taRepoName} ${taRepoBranch} ${filepath}`, excerpt: totalLink, location: `${ourLocation} ${filepath}: ${trcGCerror}` }); alreadyGaveError = true; } if (!alreadyGaveError) { if (!taFileContent) - addNoticePartial({ priority: 886, message: `Unable to find/load TA article`, details: `linked from ${fieldName}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); + addNoticePartial({ priority: 886, message: `Unable to find/load TA article`, details: `${taRepoUsername} ${taRepoName} ${taRepoBranch} ${filepath}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); else if (taFileContent.length < 10) - addNoticePartial({ priority: 884, message: `TA article seems empty`, details: `linked from ${fieldName}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); + addNoticePartial({ priority: 884, message: `TA article seems empty`, details: `${taRepoUsername} ${taRepoName} ${taRepoBranch} ${filepath}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); // Don't do this or it gets infinite recursion!!! // else if (checkingOptions?.disableLinkedTAArticlesCheckFlag !== true) { // // functionLog(`checkNotesLinksToOutside got ${checkingOptions?.disableLinkedTAArticlesCheckFlag} so checking TA article: ${filepath}`); @@ -526,14 +533,14 @@ export async function checkNotesLinksToOutside(languageCode, repoCode, bookID, g // debugLog("Fetched fileContent for", taRepoName, filepath, typeof fileContent, fileContent.length); } catch (trcGCerror) { // console.error(`checkNotesLinksToOutside(${bookID}, ${fieldName}, …) failed to load TA for '${taRepoUsername}', '${taRepoName}', '${filepath}', '${taRepoBranch}', ${trcGCerror.message}`); - addNoticePartial({ priority: 885, message: `Error loading TA article`, details: `linked from ${fieldName}`, excerpt: totalLink, location: `${ourLocation} ${filepath}: ${trcGCerror}` }); + addNoticePartial({ priority: 885, message: `Error loading TA article`, details: `${taRepoUsername} ${taRepoName} ${taRepoBranch} ${filepath}`, excerpt: totalLink, location: `${ourLocation} ${filepath}: ${trcGCerror}` }); alreadyGaveError = true; } if (!alreadyGaveError) { if (!taFileContent) - addNoticePartial({ priority: 886, message: `Unable to find/load TA article`, details: `linked from ${fieldName}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); + addNoticePartial({ priority: 886, message: `Unable to find/load TA article`, details: `${taRepoUsername} ${taRepoName} ${taRepoBranch} ${filepath}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); else if (taFileContent.length < 10) - addNoticePartial({ priority: 884, message: `TA article seems empty`, details: `linked from ${fieldName}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); + addNoticePartial({ priority: 884, message: `TA article seems empty`, details: `${taRepoUsername} ${taRepoName} ${taRepoBranch} ${filepath}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); else if (checkingOptions?.disableLinkedTAArticlesCheckFlag !== true) { // functionLog(`checkNotesLinksToOutside got ${checkingOptions?.disableLinkedTAArticlesCheckFlag} so checking TA article: ${filepath}`); if (await alreadyChecked(taPathParameters) !== true) { @@ -579,13 +586,13 @@ export async function checkNotesLinksToOutside(languageCode, repoCode, bookID, g // if (article === 'brother') debugLog(`Fetched fileContent for ${JSON.stringify(twPathParameters)}: ${typeof twFileContent} ${twFileContent.length}`); } catch (trcGCerror) { console.error(`checkNotesLinksToOutside(${bookID}, ${fieldName}, …) failed to load TW`, twRepoUsername, twRepoName, filepath, twRepoBranch, trcGCerror.message); - addNoticePartial({ priority: 882, message: `Error loading TW article`, details: `linked from ${fieldName}`, excerpt: totalLink, location: `${ourLocation} ${filepath}: ${trcGCerror}` }); + addNoticePartial({ priority: 882, message: `Error loading TW article`, details: `${twRepoUsername} ${twRepoName} ${twRepoBranch} ${filepath}`, excerpt: totalLink, location: `${ourLocation} ${filepath}: ${trcGCerror}` }); } if (!twFileContent) - addNoticePartial({ priority: 883, message: `Unable to find/load TW article`, details: `linked from ${fieldName}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); + addNoticePartial({ priority: 883, message: `Unable to find/load TW article`, details: `${twRepoUsername} ${twRepoName} ${twRepoBranch} ${filepath}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); else { // we got the content of the TW article if (twFileContent.length < 10) - addNoticePartial({ priority: 881, message: `TW article seems empty`, details: `linked from ${fieldName}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); + addNoticePartial({ priority: 881, message: `TW article seems empty`, details: `${twRepoUsername} ${twRepoName} ${twRepoBranch} ${filepath}`, excerpt: totalLink, location: `${ourLocation} ${filepath}` }); else if (checkingOptions?.disableLinkedTWArticlesCheckFlag !== true) { // functionLog(`checkNotesLinksToOutside got ${checkingOptions?.disableLinkedTWArticlesCheckFlag} so checking TW article: ${filepath}`); if (await alreadyChecked(twPathParameters) !== true) { From 9a86a2dd3a988283c0e709a6923de47b84234cdf Mon Sep 17 00:00:00 2001 From: Robert Hunt Date: Mon, 10 May 2021 22:09:53 +1200 Subject: [PATCH 06/15] Various fixes from EN publishing checks including getting RepoCheck demo to work for branches other than master --- src/core/BCS-usfm-grammar-check.js | 47 +++++++++--------- src/core/getApi.js | 48 +++++++++---------- src/core/notes-links-check.js | 32 +++++++------ src/core/usfm-text-check.js | 7 ++- src/demos/RenderProcessedResults.js | 36 +++++++++----- .../book-package-check/checkBookPackage.js | 4 +- src/demos/repo-check/RepoCheck.js | 21 +++++--- src/demos/repo-check/checkRepo.js | 8 ++-- 8 files changed, 113 insertions(+), 90 deletions(-) diff --git a/src/core/BCS-usfm-grammar-check.js b/src/core/BCS-usfm-grammar-check.js index 80d32443..91da56ba 100644 --- a/src/core/BCS-usfm-grammar-check.js +++ b/src/core/BCS-usfm-grammar-check.js @@ -4,7 +4,7 @@ import { DEFAULT_EXCERPT_LENGTH } from './defaults' import { userLog, debugLog, parameterAssert } from './utilities'; -// const USFM_GRAMMAR_VALIDATOR_VERSION_STRING = '0.3.3'; +// const USFM_GRAMMAR_VALIDATOR_VERSION_STRING = '0.4.0'; export function runBCSGrammarCheck(strictnessString, fileText, filename, givenLocation, checkingOptions) { @@ -155,30 +155,31 @@ export function checkUSFMGrammar(bookID, strictnessString, filename, givenText, const cugResult = { successList: [], noticeList: [] }; + /** + * + * @param {string} successString + */ function addSuccessMessage(successString) { // functionLog(`checkUSFMGrammar success: ${successString}`); cugResult.successList.push(successString); } - function addNotice6to7(noticeObject) { - /** - * @description - adds a new notice entry, adding bookID,C,V to the given fields - * @param {Number} priority - notice priority from 1 (lowest) to 999 (highest) - * @param {string} message - the text of the notice message - * @param {Number} characterIndex - where the issue occurs in the line - * @param {string} excerpt - short excerpt from the line centred on the problem (if available) - * @param {string} location - description of where the issue is located - */ + /** + * + * @description - adds a new notice entry from the partial fields given -- adding bookID and filename to the given fields + * @param {Object} noticeObject expected to contain priority, message, characterIndex, exerpt, location + */ + function addNoticePartial(noticeObject) { // functionLog(`checkUSFMGrammar notice: (priority=${priority}) ${message}${characterIndex > 0 ? ` (at character ${characterIndex})` : ""}${excerpt ? ` ${excerpt}` : ""}${location}`); - parameterAssert(noticeObject.priority !== undefined, "cUSFMgr addNotice6to7: 'priority' parameter should be defined"); - parameterAssert(typeof noticeObject.priority === 'number', `cUSFMgr addNotice6to7: 'priority' parameter should be a number not a '${typeof noticeObject.priority}': ${noticeObject.priority}`); - parameterAssert(noticeObject.message !== undefined, "cUSFMgr addNotice6to7: 'message' parameter should be defined"); - parameterAssert(typeof noticeObject.message === 'string', `cUSFMgr addNotice6to7: 'message' parameter should be a string not a '${typeof noticeObject.message}': ${noticeObject.message}`); - // parameterAssert(characterIndex !== undefined, "cUSFMgr addNotice6to7: 'characterIndex' parameter should be defined"); - if (noticeObject.characterIndex) parameterAssert(typeof noticeObject.characterIndex === 'number', `cUSFMgr addNotice6to7: 'characterIndex' parameter should be a number not a '${typeof noticeObject.characterIndex}': ${noticeObject.characterIndex}`); - // parameterAssert(excerpt !== undefined, "cUSFMgr addNotice6to7: 'excerpt' parameter should be defined"); - if (noticeObject.excerpt) parameterAssert(typeof noticeObject.excerpt === 'string', `cUSFMgr addNotice6to7: 'excerpt' parameter should be a string not a '${typeof excerpt}': ${noticeObject.excerpt}`); - parameterAssert(noticeObject.location !== undefined, "cUSFMgr addNotice6to7: 'location' parameter should be defined"); - parameterAssert(typeof noticeObject.location === 'string', `cUSFMgr addNotice6to7: 'location' parameter should be a string not a '${typeof noticeObject.location}': ${noticeObject.location}`); + parameterAssert(noticeObject.priority !== undefined, "cUSFMgr addNoticePartial: 'priority' parameter should be defined"); + parameterAssert(typeof noticeObject.priority === 'number', `cUSFMgr addNoticePartial: 'priority' parameter should be a number not a '${typeof noticeObject.priority}': ${noticeObject.priority}`); + parameterAssert(noticeObject.message !== undefined, "cUSFMgr addNoticePartial: 'message' parameter should be defined"); + parameterAssert(typeof noticeObject.message === 'string', `cUSFMgr addNoticePartial: 'message' parameter should be a string not a '${typeof noticeObject.message}': ${noticeObject.message}`); + // parameterAssert(characterIndex !== undefined, "cUSFMgr addNoticePartial: 'characterIndex' parameter should be defined"); + if (noticeObject.characterIndex) parameterAssert(typeof noticeObject.characterIndex === 'number', `cUSFMgr addNoticePartial: 'characterIndex' parameter should be a number not a '${typeof noticeObject.characterIndex}': ${noticeObject.characterIndex}`); + // parameterAssert(excerpt !== undefined, "cUSFMgr addNoticePartial: 'excerpt' parameter should be defined"); + if (noticeObject.excerpt) parameterAssert(typeof noticeObject.excerpt === 'string', `cUSFMgr addNoticePartial: 'excerpt' parameter should be a string not a '${typeof excerpt}': ${noticeObject.excerpt}`); + parameterAssert(noticeObject.location !== undefined, "cUSFMgr addNoticePartial: 'location' parameter should be defined"); + parameterAssert(typeof noticeObject.location === 'string', `cUSFMgr addNoticePartial: 'location' parameter should be a string not a '${typeof noticeObject.location}': ${noticeObject.location}`); cugResult.noticeList.push({ ...noticeObject, bookID, filename }); } @@ -191,15 +192,15 @@ export function checkUSFMGrammar(bookID, strictnessString, filename, givenText, // debugLog(`grammarCheckResult=${JSON.stringify(grammarCheckResult)}`); if (!grammarCheckResult.isValidUSFM) - addNotice6to7({ priority: 944, message: `USFM3 Grammar Check (${strictnessString} mode) doesn’t pass`, filename, location: ourLocation }); + addNoticePartial({ priority: 944, message: `USFM3 Grammar Check (${strictnessString} mode) doesn’t pass`, filename, location: ourLocation }); // We only get one error if it fails if (grammarCheckResult.error && grammarCheckResult.priority) - addNotice6to7(grammarCheckResult.error); + addNoticePartial(grammarCheckResult.error); // Display these warnings but with a lowish priority for (const warningString of grammarCheckResult.warnings) - addNotice6to7({ priority: 101, message: `USFMGrammar: ${warningString}`, filename, location: ourLocation }); + addNoticePartial({ priority: 101, message: `USFMGrammar: ${warningString}`, filename, location: ourLocation }); addSuccessMessage(`Checked USFM Grammar (${strictnessString} mode) ${grammarCheckResult.isValidUSFM ? "without errors" : " (but the USFM DIDN’T validate)"}`); // debugLog(` checkUSFMGrammar returning with ${result.successList.length.toLocaleString()} success(es) and ${result.noticeList.length.toLocaleString()} notice(s).`); diff --git a/src/core/getApi.js b/src/core/getApi.js index 528465c9..69d7797f 100644 --- a/src/core/getApi.js +++ b/src/core/getApi.js @@ -9,7 +9,7 @@ import { clearCheckedArticleCache } from './notes-links-check'; import { functionLog, debugLog, userLog, parameterAssert } from './utilities'; -// const GETAPI_VERSION_STRING = '0.7.0'; +// const GETAPI_VERSION_STRING = '0.7.1'; const MAX_INDIVIDUAL_FILES_TO_DOWNLOAD = 5; // More than this and it downloads the zipfile for the entire repo @@ -123,7 +123,7 @@ function addToListIfMissing(repos, newRepo) { * @return {Promise} resolves to file contents or null if not found */ async function getUnZippedFile(path) { - // debugLog(`getUnZippedFile(${path})`); + // functionLog(`getUnZippedFile(${path})`); // TODO: Why did we need to lowerCase it here ??? const contents = await unzipStore.getItem(path.toLowerCase()); return contents; @@ -142,7 +142,7 @@ async function getUnZippedFile(path) { */ // This is the function that we call the most from the outside export async function cachedGetFile({ username, repository, path, branch }) { - // debugLog(`cachedGetFile(${username}, ${repository}, ${path}, ${branch})…`); + // functionLog(`cachedGetFile(${username}, ${repository}, ${path}, ${branch})…`); parameterAssert(typeof username === 'string' && username.length, `cachedGetFile: username parameter should be a non-empty string not ${typeof username}: ${username}`); parameterAssert(typeof repository === 'string' && repository.length, `cachedGetFile: repository parameter should be a non-empty string not ${typeof repository}: ${repository}`); parameterAssert(typeof path === 'string' && path.length, `cachedGetFile: path parameter should be a non-empty string not ${typeof path}: ${path}`); @@ -155,7 +155,7 @@ export async function cachedGetFile({ username, repository, path, branch }) { return contents; } - contents = await getFileFromZip({ username, repository, path, branch }); + contents = await getFileFromZip({ username, repository, path, branchOrRelease: branch }); // if (contents) // if (filePath.indexOf('_tq/') < 0) // Don’t log for TQ2 files coz too many // userLog(` cachedGetFile got ${filePath} from zipfile`); @@ -183,7 +183,7 @@ export async function cachedGetFile({ username, repository, path, branch }) { * @return {Promise<[]|*[]>} resolves to manifest contents if downloaded (else undefined) */ async function cachedGetManifest({ username, repository, branch }) { - // debugLog(`cachedGetManifest(${username}, ${repository}, ${branch})…`); + // functionLog(`cachedGetManifest(${username}, ${repository}, ${branch})…`); const manifestContents = await cachedGetFile({ username, repository, path: 'manifest.yaml', branch }); let formData; @@ -207,7 +207,7 @@ async function cachedGetManifest({ username, repository, branch }) { * @return {Promise<[]|*[]>} resolves to filename from the manifest for the book (else undefined) */ export async function cachedGetBookFilenameFromManifest({ username, repository, branch, bookID }) { - // debugLog(`cachedGetBookFilenameFromManifest(${username}, ${repository}, ${branch}, ${bookID})…`); + // functionLog(`cachedGetBookFilenameFromManifest(${username}, ${repository}, ${branch}, ${bookID})…`); const manifestJSON = await cachedGetManifest({ username, repository, branch }); for (const projectEntry of manifestJSON.projects) { if (projectEntry.identifier === bookID) { @@ -314,7 +314,7 @@ export async function preloadReposIfNecessary(username, languageCode, bookIDList * @return {Promise} resolves to file content */ async function cachedFetchFileFromServerBranch({ username, repository, path, branch = 'master' }) { - // debugLog(`cachedFetchFileFromServerBranch(${username}, ${repository}, ${path}, ${branch})…`); + // functionLog(`cachedFetchFileFromServerBranch(${username}, ${repository}, ${path}, ${branch})…`); // TODO: Check how slow this next call is -- can it be avoided or cached? // RJH removed this 2Oct2020 -- what’s the point -- it just slows things down -- // if it needs to be checked, should be checked before this point @@ -334,7 +334,7 @@ async function cachedFetchFileFromServerBranch({ username, repository, path, bra * @return {Promise} resolves to file content */ export async function cachedFetchFileFromServerTag({ username, repository, path, tag }) { - // debugLog(`cachedFetchFileFromServerTag(${username}, ${repository}, ${path}, ${tag})…`); + // functionLog(`cachedFetchFileFromServerTag(${username}, ${repository}, ${path}, ${tag})…`); // TODO: Check how slow this next call is -- can it be avoided or cached? // RJH removed this 2Oct2020 -- what’s the point -- it just slows things down -- // if it needs to be checked, should be checked before this point @@ -354,7 +354,7 @@ async function cachedFetchFileFromServerBranch({ username, repository, path, bra * @return {Promise} resolves to file content */ async function cachedFetchFileFromServerWorker(uri, username, repository, path, branchOrTag) { - // debugLog(`cachedFetchFileFromServerWorker(${uri}, ${username}, ${repository}, ${path}, ${branchOrTag})…`); + // functionLog(`cachedFetchFileFromServerWorker(${uri}, ${username}, ${repository}, ${path}, ${branchOrTag})…`); // TODO: Check how slow this next call is -- can it be avoided or cached? // RJH removed this 2Oct2020 -- what’s the point -- it just slows things down -- // if it needs to be checked, should be checked before this point @@ -394,7 +394,7 @@ async function cachedFetchFileFromServerBranch({ username, repository, path, bra */ /* async function cachedGetFileFromZipOrServer({ username, repository, path, branch }) { - // debugLog(`cachedGetFileFromZipOrServer(${username}, ${repository}, ${path}, ${branch})…`); + // functionLog(`cachedGetFileFromZipOrServer(${username}, ${repository}, ${path}, ${branch})…`); let file; file = await getFileFromZip({ username, repository, path, branch }); if (!file) { @@ -405,7 +405,7 @@ async function cachedGetFileFromZipOrServer({ username, repository, path, branch */ async function getUID({ username }) { - // debugLog(`getUID(${username})…`); + // functionLog(`getUID(${username})…`); const uri = Path.join(apiPath, 'users', username); // debugLog(`getUID uri=${uri}`); const user = await cachedGetFileUsingPartialURL({ uri }); @@ -416,7 +416,7 @@ async function getUID({ username }) { } export async function repositoryExistsOnDoor43({ username, repository }) { - // debugLog(`repositoryExistsOnDoor43(${username}, ${repository})…`); + // functionLog(`repositoryExistsOnDoor43(${username}, ${repository})…`); let uid; try { uid = await getUID({ username }); @@ -458,7 +458,7 @@ export async function repositoryExistsOnDoor43({ username, repository }) { async function cachedGetFileUsingPartialURL({ uri, params }) { - // debugLog(`cachedGetFileUsingPartialURL(${uri}, ${JSON.stringify(params)})…`); + // functionLog(`cachedGetFileUsingPartialURL(${uri}, ${JSON.stringify(params)})…`); // debugLog(` get querying: ${baseURL+uri}`); const response = await Door43Api.get(baseURL + uri, { params }); if (response.request.fromCache !== true) userLog(` Door43Api downloaded Door43 ${uri}`); @@ -467,7 +467,7 @@ async function cachedGetFileUsingPartialURL({ uri, params }) { }; export async function cachedGetFileUsingFullURL({ uri, params }) { - // debugLog(`cachedGetFileUsingFullURL(${uri}, ${params})…`); + // functionLog(`cachedGetFileUsingFullURL(${uri}, ${params})…`); const response = await Door43Api.get(uri, { params }); if (response.request.fromCache !== true) userLog(` Door43Api downloaded ${uri}`); // debugLog(` cachedGetFileUsingFullURL returning: ${response.data}`); @@ -495,18 +495,18 @@ function fetchRepositoriesZipFiles({username, languageId, branch}) { * @param {boolean} forceLoad - if not true, then use existing repo in zipstore * @return {Promise<[]|*[]>} resolves to true if downloaded */ -export async function cachedGetRepositoryZipFile({ username, repository, branch }, forceLoad = false) { +export async function cachedGetRepositoryZipFile({ username, repository, branchOrRelease }, forceLoad = false) { // https://git.door43.org/{username}/{repository}/archive/{branch}.zip - // debugLog(`cachedGetRepositoryZipFile(${username}, ${repository}, ${branch}, ${forceLoad})…`); + // functionLog(`cachedGetRepositoryZipFile(${username}, ${repository}, ${branchOrRelease}, ${forceLoad})…`); if (!forceLoad) { // see if we already have in zipStore - const zipBlob = await getZipFromStore(username, repository, branch); + const zipBlob = await getZipFromStore(username, repository, branchOrRelease); if (zipBlob) { - // debugLog(`cachedGetRepositoryZipFile for ${username}, ${repository}, ${branch} -- already loaded`); + // debugLog(`cachedGetRepositoryZipFile for ${username}, ${repository}, ${branchOrRelease} -- already loaded`); return true; } } - return downloadRepositoryZipFile({ username, repository, branch }); + return downloadRepositoryZipFile({ username, repository, branchOrRelease }); }; @@ -544,7 +544,7 @@ async function downloadRepositoryZipFile({ username, repository, branchOrRelease * @return {Promise<[]|*[]>} resolves to file list */ export async function getFileListFromZip({ username, repository, branchOrRelease, optionalPrefix }) { - // debugLog(`getFileListFromZip(${username}, ${repository}, ${branchOrRelease}, ${optionalPrefix})…`); + // functionLog(`getFileListFromZip(${username}, ${repository}, ${branchOrRelease}, ${optionalPrefix})…`); const uri = zipUri({ username, repository, branchOrRelease }); let zipBlob = await getZipFromStore(username, repository, branchOrRelease); @@ -601,7 +601,7 @@ export async function getFileListFromZip({ username, repository, branchOrRelease * @return {Promise} resolves to null if not found */ async function getZipFromStore(username, repository, branchOrRelease) { - // debugLog(`getZipFromStore(${username}, ${repository}, ${branchOrRelease})…`); + // functionLog(`getZipFromStore(${username}, ${repository}, ${branchOrRelease})…`); const uri = zipUri({ username, repository, branchOrRelease }); // debugLog(` uri=${uri}`); const zipBlob = await zipStore.getItem(uri.toLowerCase()); @@ -619,7 +619,7 @@ async function getZipFromStore(username, repository, branchOrRelease) { * @return {Promise<[]|*[]>} resolves to unzipped file if found or null */ async function getFileFromZip({ username, repository, path, branchOrRelease }) { - // debugLog(`getFileFromZip(${username}, ${repository}, ${path}, ${branchOrRelease})…`); + // functionLog(`getFileFromZip(${username}, ${repository}, ${path}, ${branchOrRelease})…`); let file; const zipBlob = await getZipFromStore(username, repository, branchOrRelease); try { @@ -642,7 +642,7 @@ async function getFileFromZip({ username, repository, path, branchOrRelease }) { function zipUri({ username, repository, branchOrRelease = 'master' }) { - // debugLog(`zipUri(${username}, ${repository}, ${branchOrRelease})…`); + // functionLog(`zipUri(${username}, ${repository}, ${branchOrRelease})…`); const zipPath = Path.join(username, repository, 'archive', `${branchOrRelease}.zip`); const zipUri = baseURL + zipPath; return zipUri; @@ -650,7 +650,7 @@ function zipUri({ username, repository, branchOrRelease = 'master' }) { // async function fetchTree({ username, repository, sha = 'master' }) { -// // debugLog(`fetchTree(${username}, ${repository}, ${sha})…`); +// // functionLog(`fetchTree(${username}, ${repository}, ${sha})…`); // let data; // try { // const uri = Path.join('api/v1/repos', username, repository, 'git/trees', sha); diff --git a/src/core/notes-links-check.js b/src/core/notes-links-check.js index 4a6bc5e6..d4697408 100644 --- a/src/core/notes-links-check.js +++ b/src/core/notes-links-check.js @@ -8,7 +8,7 @@ import { cachedGetFile, cachedGetFileUsingFullURL, checkMarkdownText } from '../ import { userLog, debugLog, functionLog, parameterAssert, logicAssert, dataAssert, ourParseInt } from './utilities'; -// const NOTES_LINKS_VALIDATOR_VERSION_STRING = '0.7.20'; +// const NOTES_LINKS_VALIDATOR_VERSION_STRING = '0.7.21'; // const DEFAULT_LANGUAGE_CODE = 'en'; const DEFAULT_BRANCH = 'master'; @@ -23,24 +23,26 @@ const TA_RELATIVE2_DISPLAY_LINK_REGEX = new RegExp('\\[([^\\]]+?)\\]\\(\\.{2}/\\ const TW_DOUBLE_BRACKETED_LINK_REGEX = new RegExp('\\[\\[rc://([^ /]+?)/tw/dict/bible/([^ /]+?)/([^ /\\]]+?)\\]\\]', 'g'); // Enclosed in [[ ]] const TWL_RAW_LINK_REGEX = new RegExp('rc://([^ /]+?)/tw/dict/bible/([^ /]+?)/(.+)', 'g'); // Just a raw link -const TW_INTERNAL_REGEX = new RegExp('\\[([-A-Za-z ()]+?)\\]\\(\\.{2}/([a-z]{2,5})/([-A-Za-z\\d]{2,20})\\.md\\)', 'g');// [Asher](../names/asher.md) +const TW_INTERNAL_REGEX = new RegExp('\\[([-,A-Za-z ()]+?)\\]\\(\\.{2}/([a-z]{2,5})/([-A-Za-z\\d]{2,20})\\.md\\)', 'g');// [Asher](../names/asher.md) +// NOTE: Bible link format is archaic, presumably from pre-USFM days! // TODO: Do we need to normalise Bible links, i.e., make sure that the link itself // (we don't care about the displayed text) doesn't specify superfluous levels/information // TODO: We need a decision on hyphen vs en-dash in verse references // TODO: Test to see if "[2:23](../02/03.md)" is found by more than one regex below -const BIBLE_REGEX_OTHER_BOOK_ABSOLUTE = new RegExp('\\[((?:1 |2 |3 )?)((?:\\w+? )?)(\\d{1,3}):(\\d{1,3})\\]\\(([123a-z]{3})/(\\d{1,3})/(\\d{1,3})\\.md\\)', 'g'); // [Revelation 3:11](rev/03/11.md) -const BIBLE_REGEX_OTHER_BOOK_RELATIVE = new RegExp('\\[((?:1 |2 |3 )?)((?:\\w+? )?)(\\d{1,3}):(\\d{1,3})\\]\\(\\.{2}/\\.{2}/([123a-z]{3})/(\\d{1,3})/(\\d{1,3})\\.md\\)', 'g'); // [Revelation 3:11](../../rev/03/11.md) +const BIBLE_REGEX_OTHER_BOOK_ABSOLUTE = new RegExp('\\[((?:1 |2 |3 )?)((?:[\\w ]+? )?)(\\d{1,3}):(\\d{1,3})\\]\\(([123a-z]{3})/(\\d{1,3})/(\\d{1,3})\\.md\\)', 'g'); // [Revelation 3:11](rev/03/11.md) +// TODO: Is this one with ../../ really valid? Where does it occur? +const BIBLE_REGEX_OTHER_BOOK_RELATIVE = new RegExp('\\[((?:1 |2 |3 )?)((?:[\\w ]+? )?)(\\d{1,3}):(\\d{1,3})\\]\\((?:\\.{2}/)?\\.{2}/([123a-z]{3})/(\\d{1,3})/(\\d{1,3})\\.md\\)', 'g'); // [Revelation 3:11](../../rev/03/11.md) or (../rev/03/11.md) const BIBLE_REGEX_THIS_BOOK_RELATIVE = new RegExp('\\[((?:1 |2 |3 )?)((?:[\\w ]+? )?)(\\d{1,3}):(\\d{1,3})\\]\\(\\.{2}/(\\d{1,3})/(\\d{1,3})\\.md\\)', 'g'); // [Revelation 3:11](../03/11.md) or [Song of Solomon 3:11](../03/11.md) -const BCV_V_TO_THIS_BOOK_BIBLE_REGEX = new RegExp('\\[((?:1 |2 |3 )?)((?:\\w+? )?)(\\d{1,3}):(\\d{1,3})[–-](\\d{1,3})\\]\\((\\.{2})/(\\d{1,3})/(\\d{1,3})\\.md\\)', 'g'); // [Genesis 26:12-14](../26/12.md) or [4:11–16](../04/11.md) NOTE en-dash -const BIBLE_REGEX_THIS_CHAPTER_RELATIVE = new RegExp('\\[((?:1 |2 |3 )?)((?:\\w+? )?)(?:(\\d{1,3}):)?(\\d{1,3})\\]\\(\\./(\\d{1,3})\\.md\\)', 'g'); +const BCV_V_TO_THIS_BOOK_BIBLE_REGEX = new RegExp('\\[((?:1 |2 |3 )?)((?:[\\w ]+? )?)(\\d{1,3}):(\\d{1,3})[–-](\\d{1,3})\\]\\((\\.{2})/(\\d{1,3})/(\\d{1,3})\\.md\\)', 'g'); // [Genesis 26:12-14](../26/12.md) or [4:11–16](../04/11.md) NOTE en-dash +const BIBLE_REGEX_THIS_CHAPTER_RELATIVE = new RegExp('\\[((?:1 |2 |3 )?)((?:[\\w ]+? )?)(?:(\\d{1,3}):)?(\\d{1,3})\\]\\(\\./(\\d{1,3})\\.md\\)', 'g'); // [Exodus 2:7](./07.md) const THIS_VERSE_TO_THIS_CHAPTER_BIBLE_REGEX = new RegExp('\\[(?:verse )?(\\d{1,3})\\]\\(\\.{2}/(\\d{1,3})/(\\d{1,3})\\.md\\)', 'g');// [27](../11/27.md) or [verse 27](../11/27.md) const THIS_VERSE_RANGE_TO_THIS_CHAPTER_BIBLE_REGEX = new RegExp('\\[(?:verses )?(\\d{1,3})[–-](\\d{1,3})\\]\\(\\.{2}/(\\d{1,3})/(\\d{1,3})\\.md\\)', 'g');// [2–7](../09/2.md) or [verses 2–7](../09/2.md) NOTE en-dash -const BCV_V_TO_THIS_CHAPTER_BIBLE_REGEX = new RegExp('\\[((?:1 |2 |3 )?)((?:\\w+? )?)(\\d{1,3}):(\\d{1,3})[–-](\\d{1,3})\\]\\(\\./(\\d{1,3})\\.md\\)', 'g'); // [Genesis 26:12-14](./12.md) NOTE en-dash +const BCV_V_TO_THIS_CHAPTER_BIBLE_REGEX = new RegExp('\\[((?:1 |2 |3 )?)((?:[\\w ]+? )?)(\\d{1,3}):(\\d{1,3})[–-](\\d{1,3})\\]\\(\\./(\\d{1,3})\\.md\\)', 'g'); // [Genesis 26:12-14](./12.md) NOTE en-dash const BIBLE_FULL_HELP_REGEX = new RegExp('\\[((?:1 |2 |3 )?)((?:[\\w ]+? )?)(\\d{1,3}):(\\d{1,3})(?:-\\d{1,3})?\\]\\(rc://([^ /]+?)/tn/help/([123a-z]{3})/(\\d{1,3})/(\\d{1,3})\\)', 'g'); // [Song of Solomon 29:23-24](rc://en/tn/help/sng/29/23) -const TN_REGEX = new RegExp('\\[((?:1 |2 |3 )?)((?:\\w+? )?)(\\d{1,3}):(\\d{1,3})\\]\\((\\.{2})/(\\d{1,3})/(\\d{1,3})/([a-z][a-z0-9][a-z0-9][a-z0-9])\\)', 'g'); +const TN_REGEX = new RegExp('\\[((?:1 |2 |3 )?)((?:[\\w ]+? )?)(\\d{1,3}):(\\d{1,3})\\]\\((\\.{2})/(\\d{1,3})/(\\d{1,3})/([a-z][a-z0-9][a-z0-9][a-z0-9])\\)', 'g'); const SIMPLE_DISPLAY_LINK_REGEX = new RegExp('\\[([^\\]]+?)\\]\\((https?://[^\\)]+?)\\)', 'g');// [ULT](https://something) @@ -634,7 +636,7 @@ export async function checkNotesLinksToOutside(languageCode, repoCode, bookID, g const checkResult = books.isGoodEnglishBookName(optionalB1); // debugLog(optionalB1, "isGoodEnglishBookName checkResult", checkResult); if (checkResult === undefined || checkResult === false) - addNoticePartial({ priority: 143, message: "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation }); + addNoticePartial({ priority: 143, message: "Unknown Bible book name in TN RC link", details: totalLink, excerpt: optionalB1, location: ourLocation }); } } @@ -693,7 +695,7 @@ export async function checkNotesLinksToOutside(languageCode, repoCode, bookID, g const checkResult = books.isGoodEnglishBookName(optionalB1); // debugLog(optionalB1, "isGoodEnglishBookName checkResult", checkResult); if (checkResult === undefined || checkResult === false) - addNoticePartial({ priority: 143, message: "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation }); + addNoticePartial({ priority: 143, message: "Unknown Bible book name in Bible link", details: totalLink, excerpt: optionalB1, location: ourLocation }); } } @@ -830,7 +832,7 @@ export async function checkNotesLinksToOutside(languageCode, repoCode, bookID, g const checkResult = books.isGoodEnglishBookName(optionalB1); // debugLog(optionalB1, "isGoodEnglishBookName checkResult", checkResult); if (checkResult === undefined || checkResult === false) - addNoticePartial({ priority: 143, message: "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation }); + addNoticePartial({ priority: 143, message: "Unknown Bible book name in relative Bible link", details: totalLink, excerpt: optionalB1, location: ourLocation }); } } @@ -881,7 +883,7 @@ export async function checkNotesLinksToOutside(languageCode, repoCode, bookID, g const checkResult = books.isGoodEnglishBookName(optionalB1); // debugLog(optionalB1, "isGoodEnglishBookName checkResult", checkResult); if (checkResult === undefined || checkResult === false) - addNoticePartial({ priority: 143, message: "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation }); + addNoticePartial({ priority: 143, message: "Unknown Bible book name in Bible link", details: totalLink, excerpt: optionalB1, location: ourLocation }); } } @@ -939,7 +941,7 @@ export async function checkNotesLinksToOutside(languageCode, repoCode, bookID, g const checkResult = books.isGoodEnglishBookName(optionalB1); // debugLog(optionalB1, "isGoodEnglishBookName checkResult", checkResult); if (checkResult === undefined || checkResult === false) - addNoticePartial({ priority: 143, message: "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation }); + addNoticePartial({ priority: 143, message: "Unknown Bible book name in Bible link", details: totalLink, excerpt: optionalB1, location: ourLocation }); } } @@ -989,7 +991,7 @@ export async function checkNotesLinksToOutside(languageCode, repoCode, bookID, g const checkResult = books.isGoodEnglishBookName(optionalB1); // debugLog(optionalB1, "isGoodEnglishBookName checkResult", checkResult); if (checkResult === undefined || checkResult === false) - addNoticePartial({ priority: 143, message: "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation }); + addNoticePartial({ priority: 143, message: "Unknown Bible book name in Bible link", details: totalLink, excerpt: optionalB1, location: ourLocation }); } } @@ -1041,7 +1043,7 @@ export async function checkNotesLinksToOutside(languageCode, repoCode, bookID, g const checkResult = books.isGoodEnglishBookName(optionalB1); // debugLog(optionalB1, "isGoodEnglishBookName checkResult", checkResult); if (checkResult === undefined || checkResult === false) - addNoticePartial({ priority: 143, message: "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation }); + addNoticePartial({ priority: 143, message: "Unknown Bible book name in Bible link", details: totalLink, excerpt: optionalB1, location: ourLocation }); } } diff --git a/src/core/usfm-text-check.js b/src/core/usfm-text-check.js index 9ae6de9b..58ce639a 100644 --- a/src/core/usfm-text-check.js +++ b/src/core/usfm-text-check.js @@ -10,7 +10,7 @@ import { userLog, parameterAssert, logicAssert, dataAssert, ourParseInt } from ' import { removeDisabledNotices } from './disabled-notices'; -// const USFM_VALIDATOR_VERSION_STRING = '0.8.6'; +// const USFM_VALIDATOR_VERSION_STRING = '0.8.7'; const VALID_LINE_START_CHARACTERS = `([“‘`; // '{' gets added for STs @@ -989,7 +989,10 @@ export function checkUSFMText(languageCode, repoCode, bookID, filename, givenTex parameterAssert(twLinkText !== undefined, "checkUSFMText ourCheckNotesLinksToOutside: 'twLinkText' parameter should be defined"); parameterAssert(typeof twLinkText === 'string', `checkUSFMText ourCheckNotesLinksToOutside: 'twLinkText' parameter should be a string not a '${typeof twLinkText}': ${twLinkText}`); - const coTNlResultObject = await checkNotesLinksToOutside(languageCode, repoCode, bookID, C, V, 'TWLink', twLinkText, location, { ...checkingOptions, defaultLanguageCode: languageCode }); + // NOTE: This language problem will go away once we move to TSV TWLs + let adjustedLanguageCode = languageCode; + if (languageCode === 'el-x-koine' || languageCode === 'hbo') adjustedLanguageCode = 'en'; // Just a guess for x-tw + const coTNlResultObject = await checkNotesLinksToOutside(adjustedLanguageCode, repoCode, bookID, C, V, 'TWLink', twLinkText, location, { ...checkingOptions, defaultLanguageCode: languageCode }); // debugLog(`coTNlResultObject=${JSON.stringify(coTNlResultObject)}`); // Choose only ONE of the following diff --git a/src/demos/RenderProcessedResults.js b/src/demos/RenderProcessedResults.js index 9ba6d27f..469c550d 100644 --- a/src/demos/RenderProcessedResults.js +++ b/src/demos/RenderProcessedResults.js @@ -1,7 +1,7 @@ import React from 'react'; import { forwardRef } from 'react'; // eslint-disable-next-line no-unused-vars -import { parameterAssert, userLog, debugLog } from '../core/utilities'; +import { parameterAssert, userLog, debugLog, dataAssert } from '../core/utilities'; // NOTE: The following line is currently giving compile warnings -- a problem in a dependency it seems import MaterialTable from 'material-table'; @@ -42,7 +42,7 @@ const tableIcons = { }; -// const RENDER_PROCESSED_RESULTS_VERSION = '0.6.1'; +// const RENDER_PROCESSED_RESULTS_VERSION = '0.6.2'; export function RenderSuccesses({ username, results }) { @@ -70,17 +70,19 @@ export function RenderTotals({ rawNoticeListLength, results }) { } /** -* @description - Displays a given piece of text (which can include newline characters) -* @param {string} text - text to render as numbered lines -* @return {String} - rendered HTML for the numbered list of lines -*/ -export function RenderLines({ text }) { + * @description - Displays a given piece of text (which can include newline characters) + * @param {string} text - text to render as numbered lines + * @return {String} - rendered HTML for the numbered list of lines + */ +/* +export function RenderNumberedLines({ text }) { return
    {text.split('\n').map(function (line, index) { return
  1. {line}
    2. ; })}
; } +*/ const MAX_ARRAY_ITEMS_TO_DISPLAY = 8; // Or do we want this as a parameter? @@ -264,12 +266,20 @@ function RenderFileDetails({ username, repoName, branch, filename, lineNumber, r if (repoName && repoName.length) resultStart += ` in ${repoName} repository`; if (username && repoName && filename) { if (filename && filename.length) resultStart += ` in file ${filename}`; - try { - if (filename.endsWith('.tsv') || filename.endsWith('.md')) { // use blame so we can see the actual line! - const folder = repoName.endsWith('_obs') && filename !== 'README.md' && filename !== 'LICENSE.md' ? 'content/' : ''; + try { // use blame so we can see the actual line! + if (filename.endsWith('.tsv') || filename.endsWith('.md')) { + let folder = ''; + if (filename !== 'README.md' && filename !== 'LICENSE.md') { + if (repoName.endsWith('_obs')) folder = 'content/'; + else if (repoName.endsWith('_tw')) { + folder = 'bible/'; + dataAssert(filename.indexOf('/') > 0); // filename actually contains the subfolder + } + } fileLink = `https://git.door43.org/${username}/${repoName}/blame/branch/${branch}/${folder}${filename}`; - } else fileLink = `https://git.door43.org/${username}/${repoName}/src/branch/${branch}/${filename}`; - } catch { } + } else // not TSV or MD + fileLink = `https://git.door43.org/${username}/${repoName}/src/branch/${branch}/${filename}`; + } catch (someErr) { debugLog(`What was someErr here: ${someErr}`); } if (lineNumber) { resultStart += ' on '; if (fileLink && lineNumber) @@ -302,7 +312,7 @@ function RenderExcerpt({ excerpt, message }) { // debugLog(`Here2 RenderExcerpt(${excerpt}, ${message})`); const ix = excerpt.indexOf(']('); const displayPart = excerpt.substring(1, ix); // Start after the [ unril before the ]( - const linkPart = excerpt.substring(ix+2, excerpt.length-1); // Step past the ]( but don't include the final ) + const linkPart = excerpt.substring(ix + 2, excerpt.length - 1); // Step past the ]( but don't include the final ) const adjLinkPart = message === "Should http link be https" ? linkPart.replace('http:', 'https:') : linkPart; // debugLog(`RenderExcerpt from '${excerpt}' got ix=${ix}, displayPart='${displayPart}', linkPart='${linkPart}', adjLinkPart='${adjLinkPart}'`); return <>` around ►[{displayPart}]({linkPart})◄` diff --git a/src/demos/book-package-check/checkBookPackage.js b/src/demos/book-package-check/checkBookPackage.js index 858efd47..0f01c544 100644 --- a/src/demos/book-package-check/checkBookPackage.js +++ b/src/demos/book-package-check/checkBookPackage.js @@ -8,7 +8,7 @@ import { checkRepo } from '../repo-check/checkRepo'; import { userLog, functionLog, parameterAssert, logicAssert } from '../../core/utilities'; -// const BP_VALIDATOR_VERSION_STRING = '0.7.1'; +// const BP_VALIDATOR_VERSION_STRING = '0.7.2'; const STANDARD_MANIFEST_FILENAME = 'manifest.yaml'; @@ -615,7 +615,7 @@ async function checkTQMarkdownBook(username, languageCode, repoCode, repoName, b // We need to find and check all the markdown folders/files for this book const getFileListFromZip_ = checkingOptions && checkingOptions.getFileListFromZip ? checkingOptions.getFileListFromZip : getFileListFromZip; let checkedFileCount = 0, checkedFilenames = [], checkedFilenameExtensions = new Set(), totalCheckedSize = 0; - const pathList = await getFileListFromZip_({ username, repository: repoName, branch, optionalPrefix: `${bookID.toLowerCase()}/` }); + const pathList = await getFileListFromZip_({ username, repository: repoName, branchOrRelease: branch, optionalPrefix: `${bookID.toLowerCase()}/` }); if (!Array.isArray(pathList) || !pathList.length) { // console.error("checkTQrepo failed to load", username, repoName, branch); const details = `username=${username}`; diff --git a/src/demos/repo-check/RepoCheck.js b/src/demos/repo-check/RepoCheck.js index 1dc87678..93aa3cdb 100644 --- a/src/demos/repo-check/RepoCheck.js +++ b/src/demos/repo-check/RepoCheck.js @@ -4,10 +4,10 @@ import { processNoticesToErrorsWarnings, processNoticesToSevereMediumLow, proces import { RenderSuccesses, RenderSuccessesErrorsWarnings, RenderSuccessesSevereMediumLow, RenderSuccessesWarningsGradient, RenderTotals } from '../RenderProcessedResults'; import { clearCaches, clearCheckedArticleCache, preloadReposIfNecessary, ourParseInt } from '../../core'; import { checkRepo } from './checkRepo'; -import { userLog } from '../../core/utilities'; +import { logicAssert, userLog } from '../../core/utilities'; -// const REPO_VALIDATOR_VERSION_STRING = '0.2.4'; +// const REPO_VALIDATOR_VERSION_STRING = '0.2.5'; function RepoCheck(/*username, languageCode,*/ props) { @@ -85,12 +85,18 @@ function RepoCheck(/*username, languageCode,*/ props) { // debugLog(`RepoCheck languageCode='${languageCode}' repoCode='${repoCode}'`); // Load whole repos, especially if we are going to check files in manifests - const repoPreloadList = ['TW']; - if (repoCode !== 'UHB' && repoCode !== 'UGNT') repoPreloadList.push('TA'); // Original languages only have TW links - if (repoCode !== 'TA' && repoCode !== 'TW') repoPreloadList.push(repoCode); + // NOTE: We make TWO calls to preloadReposIfNecessary() + // because the branchOrRelease only applies to the repo being checked + // for all other repos, we just use `master` + const repoPreloadList = repoCode === 'TW' ? [] : ['TW']; + if (repoCode !== 'UHB' && repoCode !== 'UGNT' && repoCode !== 'TA') + repoPreloadList.push('TA'); // Original languages only have TW links + // if (repoCode !== 'TA' && repoCode !== 'TW') repoPreloadList.push(repoCode); if (repoCode.startsWith('OBS-') || repoCode === 'TWL') { repoPreloadList.unshift('UGNT'); repoPreloadList.unshift('UHB'); repoPreloadList.push('OBS'); } - setResultValue(

Preloading {repoPreloadList.length} repos for {username} {languageCode} ready for {repoName} repo check…

); - const successFlag = await preloadReposIfNecessary(username, languageCode, [], branchOrRelease, repoPreloadList); + setResultValue(

Preloading {repoCode} and {repoPreloadList.length} repos for {username} {languageCode} ready for {repoName} repo check…

); + logicAssert(repoPreloadList.indexOf(repoCode) === -1); + const successFlag = await preloadReposIfNecessary(username, languageCode, [], branchOrRelease, [repoCode]) + && preloadReposIfNecessary(username, languageCode, [], 'master', repoPreloadList); if (!successFlag) console.error(`RepoCheck error: Failed to pre-load all repos`) @@ -101,6 +107,7 @@ function RepoCheck(/*username, languageCode,*/ props) { try { let rawCRResults = {}; try { + // Empty string below is for location rawCRResults = await checkRepo(username, repoName, branchOrRelease, "", setResultValue, checkingOptions); } catch (checkRepoError) { rawCRResults = { successList: [], noticeList: [] }; diff --git a/src/demos/repo-check/checkRepo.js b/src/demos/repo-check/checkRepo.js index 63f33eb4..c77e6e4c 100644 --- a/src/demos/repo-check/checkRepo.js +++ b/src/demos/repo-check/checkRepo.js @@ -7,7 +7,7 @@ import { repositoryExistsOnDoor43, getFileListFromZip, cachedGetFile, cachedGetR import { functionLog, debugLog, logicAssert, parameterAssert } from '../../core/utilities'; -// const REPO_VALIDATOR_VERSION_STRING = '0.4.8'; +// const REPO_VALIDATOR_VERSION_STRING = '0.4.9'; /** @@ -25,7 +25,7 @@ export async function checkRepo(username, repoName, repoBranch, givenLocation, s successList: an array of strings to tell the use exactly what has been checked noticeList: an array of 9 (i.e., with extra bookOrFileCode parameter at end) notice components */ - // functionLog(`checkRepo(un='${username}', rN='${repoName}', rBr='${repoBranch}', ${givenLocation}, (fn), ${JSON.stringify(checkingOptions)})…`); + functionLog(`checkRepo(un='${username}', rN='${repoName}', rBr='${repoBranch}', ${givenLocation}, (fn), ${JSON.stringify(checkingOptions)})…`); parameterAssert(username !== undefined, "checkRepo: 'username' parameter should be defined"); parameterAssert(typeof username === 'string', `checkRepo: 'username' parameter should be a string not a '${typeof username}'`); parameterAssert(repoName !== undefined, "checkRepo: 'repoName' parameter should be defined"); @@ -189,7 +189,7 @@ export async function checkRepo(username, repoName, repoBranch, givenLocation, s // Let’s fetch the zipped repo since it should be much more efficient than individual fetches // functionLog(`checkRepo: fetch zip file for ${repoName}…`); const fetchRepositoryZipFile_ = (checkingOptions && checkingOptions.fetchRepositoryZipFile) ? checkingOptions.fetchRepositoryZipFile : cachedGetRepositoryZipFile; - const zipFetchSucceeded = await fetchRepositoryZipFile_({ username, repository: repoName, branch: repoBranch }); + const zipFetchSucceeded = await fetchRepositoryZipFile_({ username, repository: repoName, branch: repoBranch, branchOrRelease: repoBranch }); if (!zipFetchSucceeded) { console.error(`checkRepo: misfetched zip file for repo with ${zipFetchSucceeded}`); setResultValue(

Failed to fetching zipped files from {username}/{repoName} repository

); @@ -201,7 +201,7 @@ export async function checkRepo(username, repoName, repoBranch, givenLocation, s setResultValue(

Preprocessing file list from {username}/{repoName} repository…

); // const pathList = await getFileListFromFetchedTreemaps(username, repoName, branch); const getFileListFromZip_ = checkingOptions && checkingOptions.getFileListFromZip ? checkingOptions.getFileListFromZip : getFileListFromZip; - const pathList = await getFileListFromZip_({ username, repository: repoName, branch: repoBranch }); + const pathList = await getFileListFromZip_({ username, repository: repoName, branchOrRelease: repoBranch }); // debugLog(`Got pathlist (${pathList.length}) = ${pathList}`); From 43ee63f1a41560ce295880f34c8e2f5caca4b280 Mon Sep 17 00:00:00 2001 From: Robert Hunt Date: Fri, 21 May 2021 15:15:12 +1200 Subject: [PATCH 07/15] Finish integration of updated BCS package --- src/core/BCS-usfm-grammar-check.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/core/BCS-usfm-grammar-check.js b/src/core/BCS-usfm-grammar-check.js index 91da56ba..86af58c5 100644 --- a/src/core/BCS-usfm-grammar-check.js +++ b/src/core/BCS-usfm-grammar-check.js @@ -4,7 +4,7 @@ import { DEFAULT_EXCERPT_LENGTH } from './defaults' import { userLog, debugLog, parameterAssert } from './utilities'; -// const USFM_GRAMMAR_VALIDATOR_VERSION_STRING = '0.4.0'; +// const USFM_GRAMMAR_VALIDATOR_VERSION_STRING = '0.4.1'; export function runBCSGrammarCheck(strictnessString, fileText, filename, givenLocation, checkingOptions) { @@ -30,22 +30,22 @@ export function runBCSGrammarCheck(strictnessString, fileText, filename, givenLo // Now create the parser and run the check let parserToJSONResultObject, parseWarnings; try { - debugLog(`${new Date().getTime()/1000} Setting-up the USFMGrammar checker…`); + // debugLog(`${new Date().getTime() / 1000} Setting-up the USFMGrammar checker…`); const ourUsfmParser = new grammar.USFMParser(fileText, strictnessString === 'relaxed' ? grammar.LEVEL.RELAXED : null); // Returns a Boolean indicating whether the input USFM text satisfies the grammar or not. // This method is available in both default and relaxed modes. // const parserResult = ourUsfmParser.validate(); - debugLog(`${new Date().getTime()/1000} Running the USFMGrammar checker (may take several seconds)…`); + debugLog(`${new Date().getTime() / 1000} Running the USFMGrammar checker (may take several seconds)…`); parserToJSONResultObject = ourUsfmParser.toJSON() - debugLog(`${new Date().getTime()/1000} Got the USFMGrammar checker toJSON result: ${Object.keys(parserToJSONResultObject)}`); - debugLog(`${new Date().getTime()/1000} Got the USFMGrammar checker toJSON _messages: ${Object.keys(parserToJSONResultObject._messages)}`); - debugLog(`${new Date().getTime()/1000} Got the USFMGrammar checker: ${Object.keys(ourUsfmParser)}`); + // debugLog(`${new Date().getTime() / 1000} Got the USFMGrammar checker toJSON result: ${Object.keys(parserToJSONResultObject)}`); + // debugLog(`${new Date().getTime() / 1000} Got the USFMGrammar checker toJSON _messages: ${Object.keys(parserToJSONResultObject._messages)}`); + // debugLog(`${new Date().getTime() / 1000} Got the USFMGrammar checker: ${Object.keys(ourUsfmParser)}`); parseWarnings = parserToJSONResultObject._warnings ? parserToJSONResultObject._warnings : ourUsfmParser.warnings; - debugLog(`${new Date().getTime()/1000} Got the warnings from the USFMGrammar checker: (${parseWarnings.length}) ${parseWarnings}`); - } catch (parserError) { - debugLog(`${new Date().getTime()/1000} Got an exception when using the USFMGrammar checker: ${parserError}`); + debugLog(`${new Date().getTime() / 1000} Got the warnings from the USFMGrammar checker: (${parseWarnings.length}) ${parseWarnings}`); + } catch (parserError) { // This is how the Parser returns USFM errors, i.e., it stops after the first error + debugLog(`${new Date().getTime() / 1000} Got an exception when using the USFMGrammar checker: ${parserError}`); const ourErrorObject = { - priority: 333, message: "USFMGrammar checker failed", + priority: 840, message: "USFMGrammar check failed", details: parserError, filename, location: givenLocation From 0e515c39675d94ac4097b36c586a4af2c9b17987 Mon Sep 17 00:00:00 2001 From: Robert Hunt Date: Fri, 21 May 2021 15:16:04 +1200 Subject: [PATCH 08/15] Handle updated UHB footnote USFM --- src/core/usfm-text-check.js | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/src/core/usfm-text-check.js b/src/core/usfm-text-check.js index 58ce639a..d3528bd4 100644 --- a/src/core/usfm-text-check.js +++ b/src/core/usfm-text-check.js @@ -10,7 +10,7 @@ import { userLog, parameterAssert, logicAssert, dataAssert, ourParseInt } from ' import { removeDisabledNotices } from './disabled-notices'; -// const USFM_VALIDATOR_VERSION_STRING = '0.8.7'; +// const USFM_VALIDATOR_VERSION_STRING = '0.8.8'; const VALID_LINE_START_CHARACTERS = `([“‘`; // '{' gets added for STs @@ -716,7 +716,7 @@ export function checkUSFMText(languageCode, repoCode, bookID, filename, givenTex const ixZEnd = adjustedRest.indexOf('\\*'); // debugLog(` ${nextZIndex} and ${ixZEnd}`); if (ixZEnd >= 0) { - // dataAssert(ixZEnd > nextZIndex, `Exected closure at ${ixZEnd} to be AFTER \\zaln-s (${nextZIndex})`); + // dataAssert(ixZEnd > nextZIndex, `Expected closure at ${ixZEnd} to be AFTER \\zaln-s (${nextZIndex})`); adjustedRest = adjustedRest.substring(0, nextZIndex) + adjustedRest.substring(ixZEnd + 2, adjustedRest.length); // debugLog(` Now '${adjustedRest}'`); } else { @@ -738,7 +738,7 @@ export function checkUSFMText(languageCode, repoCode, bookID, filename, givenTex dataAssert(ixWordEnd > nextWIndex + 3, `Why2 is w| = ${ixWordEnd}? nextWIndex=${nextWIndex} ${languageCode} ${bookID} ${C}:${V} ${lineNumber}`); const ixWEnd = adjustedRest.indexOf('\\w*'); if (ixWEnd >= 0) { - dataAssert(ixWEnd > nextWIndex, `Exected closure at ${ixWEnd} to be AFTER \\w (${nextWIndex})`); + dataAssert(ixWEnd > nextWIndex, `Expected closure at ${ixWEnd} to be AFTER \\w (${nextWIndex})`); adjustedRest = adjustedRest.substring(0, nextWIndex) + adjustedRest.substring(nextWIndex + 3, ixWordEnd) + adjustedRest.substring(ixWEnd + 3, adjustedRest.length); // debugLog(`After removing w field, got '${adjustedRest}'`); } else { @@ -746,12 +746,33 @@ export function checkUSFMText(languageCode, repoCode, bookID, filename, givenTex break; } } + // Remove any other \+w fields in the line + while ((nextWIndex = adjustedRest.indexOf('\\+w ')) >= 0) { + const ixWordEnd = adjustedRest.indexOf('|'); + if (ixWordEnd < 0 && adjustedRest.indexOf('lemma="') >= 0) { + const characterIndex = nextWIndex + 6; // Presumably, a little bit into the word + const excerpt = (characterIndex > excerptHalfLength ? '…' : '') + adjustedRest.substring(characterIndex - excerptHalfLength, characterIndex + excerptHalfLengthPlus).replace(/ /g, '␣') + (characterIndex + excerptHalfLengthPlus < adjustedRest.length ? '…' : '') + addNoticePartial({ priority: 911, message: 'Missing | character in \\+w field', details, lineNumber, C, V, characterIndex, excerpt, location: lineLocation }); + adjustedRest = ''; // Avoid follow-on errors + break; + } + dataAssert(ixWordEnd > nextWIndex + 3, `Why2 is +w| = ${ixWordEnd}? nextWIndex=${nextWIndex} ${languageCode} ${bookID} ${C}:${V} ${lineNumber}`); + const ixWEnd = adjustedRest.indexOf('\\+w*'); + if (ixWEnd >= 0) { + dataAssert(ixWEnd > nextWIndex, `Expected closure at ${ixWEnd} to be AFTER \\+w (${nextWIndex})`); + adjustedRest = adjustedRest.substring(0, nextWIndex) + adjustedRest.substring(nextWIndex + 3, ixWordEnd) + adjustedRest.substring(ixWEnd + 3, adjustedRest.length); + // debugLog(`After removing w field, got '${adjustedRest}'`); + } else { + userLog(`\\+w seems unclosed: 'adjustedRest' from '${rest}'`); + break; + } + } // Remove any other \f fields in the line let nextFIndex; while ((nextFIndex = adjustedRest.indexOf('\\f + ')) >= 0) { const ixFEnd = adjustedRest.indexOf('\\f*'); if (ixFEnd >= 0) { - dataAssert(ixFEnd > nextWIndex, `Exected closure at ${ixFEnd} to be AFTER \\w (${nextFIndex})`); + dataAssert(ixFEnd > nextWIndex, `Expected closure at ${ixFEnd} to be AFTER \\w (${nextFIndex})`); adjustedRest = adjustedRest.substring(0, nextFIndex) + adjustedRest.substring(nextFIndex + 5, ixFEnd) + adjustedRest.substring(ixFEnd + 3, adjustedRest.length); // functionLog(`checkUSFMLineText(${lineNumber}, ${C}:${V}, ${marker}='${rest}', ${lineLocation}, ${JSON.stringify(checkingOptions)})…`); // debugLog(`After removing footnote: '${adjustedRest}'`); @@ -807,8 +828,11 @@ export function checkUSFMText(languageCode, repoCode, bookID, filename, givenTex // Put marker inside string so easy to do RegExp searches const adjustedRest = `\\${marker} ${rest}`; - if (adjustedRest.indexOf('="') !== -1) console.assert(adjustedRest.indexOf('\\w ') !== -1 || adjustedRest.indexOf('\\zaln-s ') !== -1 || adjustedRest.indexOf('\\k-s ') !== -1); + if (adjustedRest.indexOf('="') !== -1) + dataAssert(adjustedRest.indexOf('\\w ') !== -1 || adjustedRest.indexOf('\\+w ') !== -1 || adjustedRest.indexOf('\\zaln-s ') !== -1 || adjustedRest.indexOf('\\k-s ') !== -1, + `Something wrong in USFM line ${lineNumber} ${C}:${V}'${adjustedRest}' \\w=${adjustedRest.indexOf('\\w ')} \\+w=${adjustedRest.indexOf('\\+w ')} \\zaln-s=${adjustedRest.indexOf('\\zaln-s ')} \\k-s=${adjustedRest.indexOf('\\k-s ')}`); dataAssert(countOccurrences(adjustedRest, '\\w ') === countOccurrences(adjustedRest, '\\w*'), `checkUSFMLineAttributes expected all \\w fields to be closed in ${adjustedRest}`); + dataAssert(countOccurrences(adjustedRest, '\\+w ') === countOccurrences(adjustedRest, '\\+w*'), `checkUSFMLineAttributes expected all \\+w fields to be closed in ${adjustedRest}`); // dataAssert(countOccurrences(adjustedRest, '\\zaln-s ') === countOccurrences(adjustedRest, '\\zaln-s*'), `checkUSFMLineAttributes expected all \\zaln-s fields to be closed in ${adjustedRest}`); // dataAssert(countOccurrences(adjustedRest, '\\k-s ') === countOccurrences(adjustedRest, '\\k-s*'), `checkUSFMLineAttributes expected all \\k-s fields to be closed in ${adjustedRest}`); From cbf4700c796e3f0a7886d459d9d48e5a39d3d79a Mon Sep 17 00:00:00 2001 From: Robert Hunt Date: Fri, 21 May 2021 20:42:02 +1200 Subject: [PATCH 09/15] WIP on checking origL quotes better --- src/core/orig-quote-check.js | 222 +++++++++++++++++++++++------------ 1 file changed, 149 insertions(+), 73 deletions(-) diff --git a/src/core/orig-quote-check.js b/src/core/orig-quote-check.js index 0b445fe5..77b0c555 100644 --- a/src/core/orig-quote-check.js +++ b/src/core/orig-quote-check.js @@ -1,10 +1,11 @@ import * as books from '../core/books/books'; import { DEFAULT_EXCERPT_LENGTH, REPO_CODES_LIST } from './defaults' import { cachedGetFile } from '../core/getApi'; -import { debugLog, parameterAssert, ourParseInt } from './utilities'; +// eslint-disable-next-line no-unused-vars +import { functionLog, debugLog, parameterAssert, logicAssert, dataAssert, ourParseInt } from './utilities'; -// const QUOTE_VALIDATOR_VERSION_STRING = '0.9.1'; +// const QUOTE_VALIDATOR_VERSION_STRING = '0.9.2'; /** @@ -92,7 +93,7 @@ export async function checkOriginalLanguageQuoteAndOccurrence(languageCode, repo async function getOriginalPassage(bookID, C, V, checkingOptions) { // TODO: Cache these ??? - // debugLog(`getOriginalPassage(${bookID}, ${C}, ${V})…`); + // functionLog(`getOriginalPassage(${bookID}, ${C}, ${V})…`); let username; try { username = checkingOptions?.originalLanguageRepoUsername; @@ -228,6 +229,128 @@ export async function checkOriginalLanguageQuoteAndOccurrence(languageCode, repo // end of getOriginalPassage function + /** + * + * @param {string} foundQuoteSegment -- an origQuote, or a segment of an origQuote, that exists in the verseText + * @param {string} partDescription -- empty string if first parameter is the entire origQuote else a descriptive word (like "beginning") + * @param {string} occurrenceString -- from the source file + * @param {string} partialVerseText -- relevant section of origL verse text + * @param {string} fullVerseText -- origL verse text + * @param {Object} location + * @description Checks that the segment (although found so we know it's in the verse) starts and ends at word breaks + */ + function checkFoundQuoteSegment(foundQuoteSegment, partDescription, occurrenceString, partialVerseText, fullVerseText, location) { + // if (partDescription) functionLog(`checkFoundQuoteSegment(${foundQuoteSegment}, ${partDescription}, ${verseText}, ${location}) ${C}:${V}…`); + parameterAssert(foundQuoteSegment !== undefined, "checkFoundQuoteSegment: 'foundQuoteSegment' parameter should be defined"); + parameterAssert(typeof foundQuoteSegment === 'string', `checkFoundQuoteSegment: 'foundQuoteSegment' parameter should be a string not a '${typeof foundQuoteSegment}'`); + parameterAssert(partDescription !== undefined, "checkFoundQuoteSegment: 'partDescription' parameter should be defined"); + parameterAssert(typeof partDescription === 'string', `checkFoundQuoteSegment: 'partDescription' parameter should be a string not a '${typeof partDescription}'`); + parameterAssert(occurrenceString !== undefined, "checkFoundQuoteSegment: 'occurrenceString' parameter should be defined"); + parameterAssert(typeof occurrenceString === 'string', `checkFoundQuoteSegment: 'occurrenceString' parameter should be a string not a '${typeof occurrenceString}'`); + parameterAssert(partialVerseText !== undefined, "checkFoundQuoteSegment: 'partialVerseText' parameter should be defined"); + parameterAssert(typeof partialVerseText === 'string', `checkFoundQuoteSegment: 'partialVerseText' parameter should be a string not a '${typeof partialVerseText}'`); + parameterAssert(fullVerseText !== undefined, "checkFoundQuoteSegment: 'fullVerseText' parameter should be defined"); + parameterAssert(typeof fullVerseText === 'string', `checkFoundQuoteSegment: 'fullVerseText' parameter should be a string not a '${typeof fullVerseText}'`); + parameterAssert(fullVerseText.length >= partialVerseText.length, `checkFoundQuoteSegment: 'partialVerseText' should not be longer`); + parameterAssert(location !== undefined, "checkFoundQuoteSegment: 'location' parameter should be defined"); + parameterAssert(typeof location === 'string', `checkFoundQuoteSegment: 'location' parameter should be a string not a '${typeof location}'`); + + let details = `passage ►${fullVerseText}◄`; + if (partDescription.length) details = `${partDescription} part of quote = "${foundQuoteSegment}" -- ${details}`; + + // TODO: This algorithm is inadequate if a word is inside another prior word, e.g., searching for δὲ in οὐδὲν δὲ συνκεκαλυμμένον ἐστὶν + let remainingVerseBits = partialVerseText.split(foundQuoteSegment); + if (remainingVerseBits.length > 2) // Join the extra bits back up + remainingVerseBits = [remainingVerseBits[0], remainingVerseBits.slice(1).join(discontiguousDivider)]; + logicAssert(remainingVerseBits.length === 2, `remaining bits are ${remainingVerseBits.length}`); + + // Note: There's some Hebrew (RTL) characters at the beginning of the following regex + // Note: Straight quotes are included here (even though unwanted) as other code warns about them + // Note: We don't give errors for leading or trailing spaces here, coz that's done elsewhere + const precedingChar = remainingVerseBits[0].slice(-1); + // debugLog(`Previous char before ${C}:${V} '${foundQuoteSegment}' is '${precedingChar}'`); + // const precedingRegex = new RegExp('[ ־*[("\'“‘]', 'g'); + if (foundQuoteSegment.slice(0) !== ' ' && remainingVerseBits[0] && precedingChar && ' ־*[("\'“‘—'.indexOf(precedingChar) === -1) { + let precederDescription; + if (precedingChar === '\u2060') precederDescription = 'WordJoiner'; + else if (precedingChar === '\u200D') precederDescription = 'ZeroWidth-WordJoiner'; + else precederDescription = `${precedingChar}=D${precedingChar.charCodeAt(0)}/H${precedingChar.charCodeAt(0).toString(16)}`; + debugLog(`Seems '${foundQuoteSegment}' might not start at the beginning of a word—it’s preceded by '${precederDescription}' in '${fullVerseText}'`); + const excerpt = `(${precederDescription})${foundQuoteSegment.substring(0, excerptLength - 3)}${(foundQuoteSegment.length > excerptLength - 3 ? '…' : '')}${occurrenceString.length? ` occurrence=${occurrenceString}`:''}`; + addNotice({ priority: 909, message: "Seems original language quote might not start at the beginning of a word", details, characterIndex: 0, excerpt, location }); + } + // Note: There's some Hebrew (RTL) characters at the beginning of the following regex + const followingChar = remainingVerseBits[1][0]; + // debugLog(`Next char after ${C}:${V} '${foundQuoteSegment}' is '${followingChar}'`); + // const followingRegex = new RegExp('[ ׃־.,:;?!–)]', 'g'); + if (foundQuoteSegment.slice(-1) !== ' ' && remainingVerseBits[1] && followingChar && ' ׃־.,:;?!–—)'.indexOf(followingChar) === -1) { + // No problems if quote is followed by expected terminator-type punctuation + const badCharString = `'${followingChar}'=D${followingChar.charCodeAt(0)}/H${followingChar.charCodeAt(0).toString(16)}`; + debugLog(`Seems '${foundQuoteSegment}' might not finish at the end of a word—it’s followed by ${badCharString} in '${fullVerseText}'`); + const excerpt = `${(foundQuoteSegment.length > excerptLength - 3 ? '…' : '')}${foundQuoteSegment.substring(foundQuoteSegment.length - excerptLength + 3, foundQuoteSegment.length)}(${followingChar}=D${remainingVerseBits[1].charCodeAt(0)}/H${remainingVerseBits[1].charCodeAt(0).toString(16)})${occurrenceString.length? ` occurrence=${occurrenceString}`:''}`; + addNotice({ priority: 908, message: "Seems original language quote might not finish at the end of a word", details, characterIndex: foundQuoteSegment.length, excerpt, location }); + } + } + // end of checkFoundQuoteSegment function + + + /** + * + * @param {string} notFoundQuoteSegment -- an origQuote, or a segment of an origQuote, that exists in the verseText + * @param {string} partDescription -- empty string if first parameter is the entire origQuote else a descriptive word (like "beginning") + * @param {string} fullVerseText -- origL verse text + * @param {Object} location + * @description Checks the segment that although found (so it's in the verse) starts and ends at word breaks + */ + function checkNotFoundQuoteSegment(notFoundQuoteSegment, partDescription, occurrenceString, fullVerseText, location) { + if (partDescription) functionLog(`checkNotFoundQuoteSegment(${notFoundQuoteSegment}, ${partDescription}, ${fullVerseText}, ${location}) ${C}:${V}…`); + parameterAssert(notFoundQuoteSegment !== undefined, "checkNotFoundQuoteSegment: 'notFoundQuoteSegment' parameter should be defined"); + parameterAssert(typeof notFoundQuoteSegment === 'string', `checkNotFoundQuoteSegment: 'notFoundQuoteSegment' parameter should be a string not a '${typeof notFoundQuoteSegment}'`); + parameterAssert(partDescription !== undefined, "checkNotFoundQuoteSegment: 'partDescription' parameter should be defined"); + parameterAssert(typeof partDescription === 'string', `checkNotFoundQuoteSegment: 'partDescription' parameter should be a string not a '${typeof partDescription}'`); + parameterAssert(fullVerseText !== undefined, "checkNotFoundQuoteSegment: 'fullVerseText' parameter should be defined"); + parameterAssert(typeof fullVerseText === 'string', `checkNotFoundQuoteSegment: 'fullVerseText' parameter should be a string not a '${typeof fullVerseText}'`); + parameterAssert(location !== undefined, "checkNotFoundQuoteSegment: 'location' parameter should be defined"); + parameterAssert(typeof location === 'string', `checkNotFoundQuoteSegment: 'location' parameter should be a string not a '${typeof location}'`); + + let excerpt = partDescription ? `${partDescription ? '(' + partDescription + ' quote portion)' : ''} '${notFoundQuoteSegment}'` : ''; + + const noBreakSpaceText = notFoundQuoteSegment.indexOf('\u00A0') >= 0 ? "quote which contains No-Break Space shown as '⍽'" : ""; + if (noBreakSpaceText) notFoundQuoteSegment = notFoundQuoteSegment.replace(/\u00A0/g, '⍽'); + // debugLog(`722 fieldText='${fieldText}'${extraText}`); + // debugLog(`722 verseText='${verseText}'`); + if (notFoundQuoteSegment[0] === ' ') { + if (!excerpt) excerpt = notFoundQuoteSegment.substring(0, excerptLength) + (notFoundQuoteSegment.length > excerptLength ? '…' : ''); + addNotice({ priority: 916, message: "Unable to find original language quote in verse text", details: "quote which starts with a space" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation }); + } else if (notFoundQuoteSegment.endsWith(' ')) { + if (!excerpt) excerpt = (notFoundQuoteSegment.length > excerptLength ? '…' : '') + notFoundQuoteSegment.substring(notFoundQuoteSegment.length - excerptLength, notFoundQuoteSegment.length); + addNotice({ priority: 916, message: "Unable to find original language quote in verse text", details: "quote which ends with a space" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation }); + } else if (notFoundQuoteSegment[0] === '\u2060') { // Word joiner + if (!excerpt) excerpt = notFoundQuoteSegment.substring(0, excerptLength) + (notFoundQuoteSegment.length > excerptLength ? '…' : ''); + addNotice({ priority: 916, message: "Unable to find original language quote in verse text", details: "quote which starts with 'word joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation }); + } else if (notFoundQuoteSegment.endsWith('\u2060')) { // Word joiner + if (!excerpt) excerpt = (notFoundQuoteSegment.length > excerptLength ? '…' : '') + notFoundQuoteSegment.substring(notFoundQuoteSegment.length - excerptLength, notFoundQuoteSegment.length); + addNotice({ priority: 916, message: "Unable to find original language quote in verse text", details: "quote which ends with 'word joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation }); + } else if (notFoundQuoteSegment[0] === '\u200B') { // Zero-width space + if (!excerpt) excerpt = notFoundQuoteSegment.substring(0, excerptLength) + (notFoundQuoteSegment.length > excerptLength ? '…' : ''); + addNotice({ priority: 916, message: "Unable to find original language quote in verse text", details: "quote which starts with 'zero-width space'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation }); + } else if (notFoundQuoteSegment.endsWith('\u200B')) { // Zero-width space + if (!excerpt) excerpt = (notFoundQuoteSegment.length > excerptLength ? '…' : '') + notFoundQuoteSegment.substring(notFoundQuoteSegment.length - excerptLength, notFoundQuoteSegment.length); + addNotice({ priority: 916, message: "Unable to find original language quote in verse text", details: "quote which ends with 'zero-width space'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation }); + } else if (notFoundQuoteSegment[0] === '\u200D') { // Zero-width joiner + if (!excerpt) excerpt = notFoundQuoteSegment.substring(0, excerptLength) + (notFoundQuoteSegment.length > excerptLength ? '…' : ''); + addNotice({ priority: 916, message: "Unable to find original language quote in verse text", details: "quote which starts with 'zero-width joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation }); + } else if (notFoundQuoteSegment.endsWith('\u200D')) { // Zero-width joiner + if (!excerpt) excerpt = (notFoundQuoteSegment.length > excerptLength ? '…' : '') + notFoundQuoteSegment.substring(notFoundQuoteSegment.length - excerptLength, notFoundQuoteSegment.length); + addNotice({ priority: 916, message: "Unable to find original language quote in verse text", details: "quote which ends with 'zero-width joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation }); + } else { + if (!excerpt) excerpt = notFoundQuoteSegment.length <= excerptLength ? notFoundQuoteSegment : (notFoundQuoteSegment.substring(0, excerptHalfLength) + (notFoundQuoteSegment.length > 2 * excerptHalfLength ? '…' : '') + notFoundQuoteSegment.substring(notFoundQuoteSegment.length - excerptHalfLength, notFoundQuoteSegment.length)); + addNotice({ priority: 916, message: "Unable to find original language quote in verse text", details: noBreakSpaceText ? noBreakSpaceText : `passage ►${fullVerseText}◄`, excerpt, location: ourLocation }); + } + } + // end of checkNotFoundQuoteSegment function + + // Main code for checkOriginalLanguageQuoteAndOccurrence let excerptLength; try { @@ -244,7 +367,8 @@ export async function checkOriginalLanguageQuoteAndOccurrence(languageCode, repo // debugLog(`Using excerptHalfLength=${excerptHalfLength}`, `excerptHalfLengthPlus=${excerptHalfLengthPlus}`); let occurrence = 1; - try { occurrence = ourParseInt(occurrenceString); } catch { } // errors in this field are noted elsewhere + try { occurrence = ourParseInt(occurrenceString); } + catch { dataAssert(false, `NOTE: We got occurrence=${occurrence} from ${C}:${V} '${occurrenceString}'`); } // errors in this field are noted elsewhere // if fieldText.lstrip() !== fieldText: // addNotice({priority:0, message:`Unexpected whitespace at start of {TNid} '{fieldText}'") @@ -307,108 +431,60 @@ export async function checkOriginalLanguageQuoteAndOccurrence(languageCode, repo if (occurrence !== 1) { addNotice({ priority: 50, message: "Is this quote/occurrence correct???", details: `Occurrence=${occurrence}`, excerpt: fieldText, location: ourLocation }); } + // TODO: Are we checking the correct occurrence below ??? const numQuoteBits = quoteBits.length; if (numQuoteBits >= 2) { let quoteIndex = -1; // These parts have to be in order, i.e., found in the verse one AFTER the other for (let bitIndex = 0; bitIndex < numQuoteBits; bitIndex++) { // debugLog(`Checking quote part ${bitIndex} '${quoteBits[bitIndex]}' in '${verseText.substring(quoteIndex)}' from '${verseText}'`) + let partDescription; + if (numQuoteBits === 1) partDescription = ''; + else if (bitIndex === 0) partDescription = 'beginning'; + else if (bitIndex === numQuoteBits - 1) partDescription = 'end'; + else partDescription = `middle${numQuoteBits > 3 ? bitIndex : ''}`; if ((quoteIndex = verseText.indexOf(quoteBits[bitIndex], quoteIndex + 1)) < 0) { // this is what we really want to catch // If the quote has multiple parts, create a description of the current part - let partDescription; - if (numQuoteBits === 1) partDescription = ''; - else if (bitIndex === 0) partDescription = 'beginning'; - else if (bitIndex === numQuoteBits - 1) partDescription = 'end'; - else partDescription = `middle${numQuoteBits > 3 ? bitIndex : ''}`; const excerpt = `${partDescription ? '(' + partDescription + ' quote portion)' : ''} '${quoteBits[bitIndex]}'`; if (verseText.indexOf(quoteBits[bitIndex]) >= 0) { - console.assert(bitIndex > 0, "This shouldn't happen for bitIndex of zero!"); + logicAssert(bitIndex > 0, "This shouldn't happen for bitIndex of zero!"); // debugLog(`914, Unable to find '${fieldText}' ${numQuoteBits === 1 ? '' : `'${quoteBits[bitIndex]}' `}${partDescription ? '(' + partDescription + ') ' : ''}in '${verseText}'`); addNotice({ priority: 914, message: "Unable to find original language quote portion in the right place in the verse text", details: `passage ►${verseText}◄`, excerpt, location: ourLocation }); } else { // debugLog(`915, Unable to find '${fieldText}' ${numQuoteBits === 1 ? '' : `'${quoteBits[bitIndex]}' `}${partDescription ? '(' + partDescription + ') ' : ''}in '${verseText}'`); - addNotice({ priority: 915, message: "Unable to find original language quote portion in verse text", details: `passage ►${verseText}◄`, excerpt, location: ourLocation }); + checkNotFoundQuoteSegment(fieldText, partDescription, occurrenceString, verseText, ourLocation); + // addNotice({ priority: 915, message: "Unable to find original language quote portion in verse text", details: `passage ►${verseText}◄`, excerpt, location: ourLocation }); } + } else { // We found this bit + // debugLog(`Found ${C}:${V} origQuote portion ${bitIndex} '${quoteBits[bitIndex]}' at ${quoteIndex} (num text chars = ${verseText.length})`); + const verseTextBits = verseText.split(quoteBits[bitIndex]); + checkFoundQuoteSegment(quoteBits[bitIndex], partDescription, occurrenceString, `${verseTextBits[occurrence-1]}${quoteBits[bitIndex]}${verseTextBits[occurrence]}`, verseText, ourLocation); } - // else debugLog(`Found quote ${bitIndex} at ${quoteIndex} (num text chars = ${verseText.length})`); } } else // < 2 - addNotice({ priority: 375, message: "Divider without surrounding snippet", location: ourLocation }); + addNotice({ priority: 815, message: "Divider without surrounding snippet", location: ourLocation }); } else { // Only a single quote (no discontiguousDivider) if (verseText.indexOf(fieldText) >= 0) { - let remainingBits = verseText.split(fieldText); if (occurrence > 1) { // functionLog(`checkOriginalLanguageQuoteAndOccurrence is checking for ${occurrence} occurrences of ${fieldText}`); - const actualNumOccurrences = remainingBits.length - 1; + const verseTextBits = verseText.split(fieldText); + const actualNumOccurrences = verseTextBits.length - 1; if (occurrence > actualNumOccurrences) { // There's not enough of them const actualOccurrencesText = actualNumOccurrences === 0 ? 'no' : `only ${actualNumOccurrences}`; const excerpt = fieldText.substring(0, excerptHalfLength) + (fieldText.length > 2 * excerptHalfLength ? '…' : '') + fieldText.substring(fieldText.length - excerptHalfLength, fieldText.length); addNotice({ priority: 917, message: "Unable to find duplicate original language quote in verse text", details: `occurrence=${occurrenceString} but ${actualOccurrencesText} occurrence${actualNumOccurrences === 1 ? '' : 's'} found, passage ►${verseText}◄`, excerpt, location: ourLocation }); + } else { + checkFoundQuoteSegment(fieldText, '', occurrenceString, `${verseTextBits[occurrence-1]}${fieldText}${verseTextBits[occurrence]}`, verseText, ourLocation); } } else { // We only need to check for one occurrence + logicAssert(occurrence === 1 || occurrence === -1, `Expected ${C}:${V} occurrence to be 1 or -1 not ${occurrence} from '${occurrenceString}' for ${C}:${V} '${fieldText}'`); // Double check that it doesn’t start/stop in the middle of a word // debugLog(`Here with fieldText=${fieldText} and verseText=${verseText}`); // debugLog(`remainingBits=${JSON.stringify(remainingBits)}`); - if (remainingBits.length > 2) // Join the extra bits back up - remainingBits = [remainingBits[0], remainingBits.slice(1).join(discontiguousDivider)]; - parameterAssert(remainingBits.length === 2, `remaining bits are ${remainingBits.length}`); - // Note: There's some Hebrew (RTL) characters at the beginning of the following regex - // Note: Straight quotes are included here (even though unwanted) as other code warns about them - let offendingChar; - if (fieldText.slice(0) !== ' ' && remainingBits[0] && (offendingChar = remainingBits[0].slice(-1)).search(/[^־A-Za-z\s*[("'“‘]/) !== -1) { - // const offendingChar = remainingBits[0].slice(-1); - // const badCharString = ` by '{offendingChar}' {unicodedata.name(offendingChar)}={hex(ord(offendingChar))}`; - // debugLog(`Seems '${fieldText}' might not start at the beginning of a word—it’s preceded ${badCharString} in '${verseText}'`); - let precederDescription; - if (offendingChar === '\u2060') precederDescription = 'WordJoiner'; - else if (offendingChar === '\u200D') precederDescription = 'ZeroWidth-WordJoiner'; - else precederDescription = `${offendingChar}=D${offendingChar.charCodeAt()}/H${offendingChar.charCodeAt().toString(16)}`; - const excerpt = `(${precederDescription})` + fieldText.substring(0, excerptLength - 3) + (fieldText.length > excerptLength - 3 ? '…' : ''); - addNotice({ priority: 909, message: "Seems original language quote might not start at the beginning of a word", details: `passage ►${verseText}◄`, characterIndex: 0, excerpt, location: ourLocation }); - } - // Note: There's some Hebrew (RTL) characters at the beginning of the following regex - if (fieldText.slice(-1) !== ' ' && remainingBits[1] && remainingBits[1][0].search(/[^׃־A-Za-z\s.,:;?!–)]…/) !== -1) { - // No problems if quote is followed by expected terminator-type punctuation - // const offendingChar = remainingBits[1][0]; - // const badCharString = ` by '${offendingChar}' {unicodedata.name(offendingChar)}={hex(ord(offendingChar))}`; - // debugLog(`Seems '${fieldText}' might not finish at the end of a word—it’s followed ${badCharString} in '${verseText}'`); - const excerpt = (fieldText.length > excerptLength - 3 ? '…' : '') + fieldText.substring(fieldText.length - excerptLength + 3, fieldText.length) + `(${remainingBits[1][0]}=D${remainingBits[1].charCodeAt(0)}/H${remainingBits[1].charCodeAt(0).toString(16)})`; - addNotice({ priority: 908, message: "Seems original language quote might not finish at the end of a word", details: `passage ►${verseText}◄`, characterIndex: fieldText.length, excerpt, location: ourLocation }); - } + checkFoundQuoteSegment(fieldText, '', occurrenceString, verseText, verseText, ourLocation); } } else { // can’t find the given text // debugLog(`Unable to find '${fieldText}' in '${verseText}'`); - const noBreakSpaceText = fieldText.indexOf('\u00A0') >= 0 ? "quote which contains No-Break Space shown as '⍽'" : ""; - if (noBreakSpaceText) fieldText = fieldText.replace(/\u00A0/g, '⍽'); - // debugLog(`722 fieldText='${fieldText}'${extraText}`); - // debugLog(`722 verseText='${verseText}'`); - if (fieldText[0] === ' ') { - const excerpt = fieldText.substring(0, excerptLength) + (fieldText.length > excerptLength ? '…' : ''); - addNotice({ priority: 916, message: "Unable to find original language quote in verse text", details: "quote which starts with a space" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation }); - } else if (fieldText.endsWith(' ')) { - const excerpt = (fieldText.length > excerptLength ? '…' : '') + fieldText.substring(fieldText.length - excerptLength, fieldText.length); - addNotice({ priority: 916, message: "Unable to find original language quote in verse text", details: "quote which ends with a space" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation }); - } else if (fieldText[0] === '\u2060') { // Word joiner - const excerpt = fieldText.substring(0, excerptLength) + (fieldText.length > excerptLength ? '…' : ''); - addNotice({ priority: 916, message: "Unable to find original language quote in verse text", details: "quote which starts with 'word joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation }); - } else if (fieldText.endsWith('\u2060')) { // Word joiner - const excerpt = (fieldText.length > excerptLength ? '…' : '') + fieldText.substring(fieldText.length - excerptLength, fieldText.length); - addNotice({ priority: 916, message: "Unable to find original language quote in verse text", details: "quote which ends with 'word joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation }); - } else if (fieldText[0] === '\u200B') { // Zero-width space - const excerpt = fieldText.substring(0, excerptLength) + (fieldText.length > excerptLength ? '…' : ''); - addNotice({ priority: 916, message: "Unable to find original language quote in verse text", details: "quote which starts with 'zero-width space'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation }); - } else if (fieldText.endsWith('\u200B')) { // Zero-width space - const excerpt = (fieldText.length > excerptLength ? '…' : '') + fieldText.substring(fieldText.length - excerptLength, fieldText.length); - addNotice({ priority: 916, message: "Unable to find original language quote in verse text", details: "quote which ends with 'zero-width space'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation }); - } else if (fieldText[0] === '\u200D') { // Zero-width joiner - const excerpt = fieldText.substring(0, excerptLength) + (fieldText.length > excerptLength ? '…' : ''); - addNotice({ priority: 916, message: "Unable to find original language quote in verse text", details: "quote which starts with 'zero-width joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation }); - } else if (fieldText.endsWith('\u200D')) { // Zero-width joiner - const excerpt = (fieldText.length > excerptLength ? '…' : '') + fieldText.substring(fieldText.length - excerptLength, fieldText.length); - addNotice({ priority: 916, message: "Unable to find original language quote in verse text", details: "quote which ends with 'zero-width joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation }); - } else { - const excerpt = fieldText.length <= excerptLength ? fieldText : (fieldText.substring(0, excerptHalfLength) + (fieldText.length > 2 * excerptHalfLength ? '…' : '') + fieldText.substring(fieldText.length - excerptHalfLength, fieldText.length)); - addNotice({ priority: 916, message: "Unable to find original language quote in verse text", details: noBreakSpaceText ? noBreakSpaceText : `passage ►${verseText}◄`, excerpt, location: ourLocation }); - } + checkNotFoundQuoteSegment(fieldText, '', occurrenceString, verseText, ourLocation); } } From c75a21abc6fb0ab11aad3d00cb03ba737bdc9d9f Mon Sep 17 00:00:00 2001 From: Robert Hunt Date: Fri, 21 May 2021 20:43:15 +1200 Subject: [PATCH 10/15] Update embedded markers inside footnotes --- .../unfoldingWord/hbo_uhb/01-GEN.usfm | 30 +-- .../unfoldingWord/hbo_uhb/02-EXO.usfm | 24 +-- .../unfoldingWord/hbo_uhb/03-LEV.usfm | 10 +- .../unfoldingWord/hbo_uhb/04-NUM.usfm | 18 +- .../unfoldingWord/hbo_uhb/05-DEU.usfm | 48 ++--- .../unfoldingWord/hbo_uhb/06-JOS.usfm | 64 +++---- .../unfoldingWord/hbo_uhb/07-JDG.usfm | 40 ++-- .../unfoldingWord/hbo_uhb/08-RUT.usfm | 26 +-- .../unfoldingWord/hbo_uhb/09-1SA.usfm | 130 ++++++------- .../unfoldingWord/hbo_uhb/10-2SA.usfm | 174 +++++++++--------- .../unfoldingWord/hbo_uhb/11-1KI.usfm | 88 ++++----- .../unfoldingWord/hbo_uhb/12-2KI.usfm | 140 +++++++------- .../unfoldingWord/hbo_uhb/13-1CH.usfm | 82 ++++----- .../unfoldingWord/hbo_uhb/14-2CH.usfm | 78 ++++---- .../unfoldingWord/hbo_uhb/15-EZR.usfm | 72 ++++---- .../unfoldingWord/hbo_uhb/16-NEH.usfm | 48 ++--- .../unfoldingWord/hbo_uhb/17-EST.usfm | 26 +-- .../unfoldingWord/hbo_uhb/18-JOB.usfm | 100 +++++----- .../unfoldingWord/hbo_uhb/19-PSA.usfm | 130 ++++++------- .../unfoldingWord/hbo_uhb/20-PRO.usfm | 140 +++++++------- .../unfoldingWord/hbo_uhb/21-ECC.usfm | 22 +-- .../unfoldingWord/hbo_uhb/22-SNG.usfm | 8 +- .../unfoldingWord/hbo_uhb/23-ISA.usfm | 102 +++++----- .../unfoldingWord/hbo_uhb/25-LAM.usfm | 42 ++--- .../unfoldingWord/hbo_uhb/26-EZK.usfm | 170 ++++++++--------- .../unfoldingWord/hbo_uhb/28-HOS.usfm | 10 +- .../unfoldingWord/hbo_uhb/29-JOL.usfm | 2 +- .../unfoldingWord/hbo_uhb/30-AMO.usfm | 6 +- .../unfoldingWord/hbo_uhb/31-OBA.usfm | 2 +- .../unfoldingWord/hbo_uhb/33-MIC.usfm | 8 +- .../unfoldingWord/hbo_uhb/34-NAM.usfm | 8 +- .../unfoldingWord/hbo_uhb/35-HAB.usfm | 2 +- .../unfoldingWord/hbo_uhb/36-ZEP.usfm | 4 +- .../unfoldingWord/hbo_uhb/37-HAG.usfm | 2 +- .../unfoldingWord/hbo_uhb/38-ZEC.usfm | 14 +- 35 files changed, 935 insertions(+), 935 deletions(-) diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/01-GEN.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/01-GEN.usfm index 6b7490a9..61083d4f 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/01-GEN.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/01-GEN.usfm @@ -2695,7 +2695,7 @@ \w הָ⁠רֹמֵ֥שׂ|lemma="רָמַשׂ" strong="d:H7430" x-morph="He,Td:Vqrmsa"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w הָ⁠אָ֖רֶץ|lemma="אֶרֶץ" strong="d:H0776" x-morph="He,Td:Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w* \w הוצא|lemma="יָצָא" strong="H3318" x-morph="He,Vhv2ms" x-tw="rc://*/tw/dict/bible/other/know"\w* -\f + \ft Q \w הַיְצֵ֣א|lemma="יָצָא" strong="H3318" x-morph="He,Vhv2ms"\w*\f* +\f + \ft Q \+w הַיְצֵ֣א|lemma="יָצָא" strong="H3318" x-morph="He,Vhv2ms"\+w*\f* \w אִתָּ֑⁠ךְ|lemma="אֵת" strong="H0854" x-morph="He,R:Sp2fs"\w* \w וְ⁠שָֽׁרְצ֣וּ|lemma="שָׁרַץ" strong="c:H8317" x-morph="He,C:Vqq3cp"\w* \w בָ⁠אָ֔רֶץ|lemma="אֶרֶץ" strong="b:H0776" x-morph="He,Rd:Ncbsa"\w* @@ -4144,7 +4144,7 @@ \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w הָ֨יָה|lemma="הָיָה" strong="H1961" x-morph="He,Vqp3ms"\w* \w שָׁ֤ם|lemma="שָׁם" strong="H8033" x-morph="He,D"\w* \w אָֽהֳלוֹ֙|lemma="אֹהֶל" strong="H0168" x-morph="He,Ncmsc:Sp3ms"\w* -\f + \ft K \w אהל⁠ה|lemma="אֹהֶל" strong="H0168" x-morph="He,Ncmsc:Sp3fs"\w*\f* +\f + \ft K \+w אהל⁠ה|lemma="אֹהֶל" strong="H0168" x-morph="He,Ncmsc:Sp3fs"\+w*\f* \w בַּ⁠תְּחִלָּ֔ה|lemma="תְּחִלָּה" strong="b:H8462" x-morph="He,Rd:Ncfsa"\w* \w בֵּ֥ין|lemma="בֵּין" strong="H0996" x-morph="He,R"\w* \w בֵּֽית|lemma="בֵּית־אֵל" strong="H1008" x-morph="He,Np"\w*־\w אֵ֖ל|lemma="בֵּית־אֵל" strong="H1008" x-morph="He,Np"\w* @@ -4380,7 +4380,7 @@ \w וְ⁠שֶׁמְאֵ֨בֶר֙|lemma="שֶׁמְאֵבֶר" strong="c:H8038" x-morph="He,C:Np"\w* \w מֶ֣לֶךְ|lemma="מֶלֶךְ" strong="H4428" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/king"\w* \w צְבוֹיִ֔ים|lemma="צְבֹאִים" strong="H6636" x-morph="He,Np"\w* -\f + \ft K \w צביים|lemma="צְבֹאִים" strong="H6636" x-morph="He,Np"\w*\f* +\f + \ft K \+w צביים|lemma="צְבֹאִים" strong="H6636" x-morph="He,Np"\+w*\f* \w וּ⁠מֶ֥לֶךְ|lemma="מֶלֶךְ" strong="c:H4428" x-morph="He,C:Ncmsc"\w* \w בֶּ֖לַע|lemma="בֶּלַע" strong="H1106b" x-morph="He,Np"\w* \w הִיא|lemma="הוּא" strong="H1931" x-morph="He,Pp3fs"\w*־\w צֹֽעַר|lemma="צֹעַר" strong="H6820" x-morph="He,Np"\w*׃ @@ -4459,7 +4459,7 @@ \w אַדְמָה֙|lemma="אַדְמָה" strong="H0126" x-morph="He,Np"\w* \w וּ⁠מֶ֣לֶךְ|lemma="מֶלֶךְ" strong="c:H4428" x-morph="He,C:Ncmsc"\w* \w צְבוֹיִ֔ם|lemma="צְבֹאִים" strong="H6636" x-morph="He,Np"\w* -\f + \ft K \w צביים|lemma="צְבֹאִים" strong="H6636" x-morph="He,Np"\w*\f* +\f + \ft K \+w צביים|lemma="צְבֹאִים" strong="H6636" x-morph="He,Np"\+w*\f* \w וּ⁠מֶ֥לֶךְ|lemma="מֶלֶךְ" strong="c:H4428" x-morph="He,C:Ncmsc"\w* \w בֶּ֖לַע|lemma="בֶּלַע" strong="H1106b" x-morph="He,Np"\w* \w הִוא|lemma="הוּא" strong="H1931" x-morph="He,Pp3fs"\w*־\w צֹ֑עַר|lemma="צֹעַר" strong="H6820" x-morph="He,Np"\w* @@ -8350,7 +8350,7 @@ \v 33 \w ו⁠יישם|lemma="יָשַׂם" strong="c:H3455" x-morph="He,C:VQw3ms"\w* -\f + \ft Q \w וַיּוּשַׂ֤ם|lemma="יָשַׂם" strong="c:H3455" x-morph="He,C:VHw3ms"\w*\f* +\f + \ft Q \+w וַיּוּשַׂ֤ם|lemma="יָשַׂם" strong="c:H3455" x-morph="He,C:VHw3ms"\+w*\f* \w לְ⁠פָנָי⁠ו֙|lemma="פָּנִים" strong="l:H6440" x-morph="He,R:Ncbpc:Sp3ms"\w* \w לֶ⁠אֱכֹ֔ל|lemma="אָכַל" strong="l:H0398" x-morph="He,R:Vqc"\w* \w וַ⁠יֹּ֨אמֶר֙|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* @@ -9094,7 +9094,7 @@ \w לָ֗⁠הּ|lemma="" strong="l" x-morph="He,R:Sp3fs"\w* \w שְׁנֵ֤י|lemma="שְׁנַיִם" strong="H8147" x-morph="He,Acmdc"\w* \w גוֹיִם֙|lemma="גּוֹי" strong="H1471a" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/other/nation"\w* -\f + \ft K \w גיים|lemma="גּוֹי" strong="H1471a" x-morph="He,Ncmpa"\w*\f* +\f + \ft K \+w גיים|lemma="גּוֹי" strong="H1471a" x-morph="He,Ncmpa"\+w*\f* \w בְּ⁠בִטְנֵ֔⁠ךְ|lemma="בֶּטֶן" strong="b:H0990" x-morph="He,R:Ncfsc:Sp2fs"\w* \w וּ⁠שְׁנֵ֣י|lemma="שְׁנַיִם" strong="c:H8147" x-morph="He,C:Acmdc"\w* \w לְאֻמִּ֔ים|lemma="לְאֹם" strong="H3816" x-morph="He,Ncmpa"\w* @@ -9768,7 +9768,7 @@ \w וְ⁠צ֥וּדָ⁠ה|lemma="צוּד" strong="c:H6679a" x-morph="He,C:Vqv2ms:Sh"\w* \w לִּ֖⁠י|lemma="" strong="l" x-morph="He,R:Sp1cs"\w* \w צידה|lemma="צֵידָה" strong="H6720" x-morph="He,Ncfsa"\w*׃ -\f + \ft Q \w צָֽיִד|lemma="צֵידָה" strong="H6720" x-morph="He,Ncmsa"\w*\f* +\f + \ft Q \+w צָֽיִד|lemma="צֵידָה" strong="H6720" x-morph="He,Ncmsa"\+w*\f* \v 4 \w וַ⁠עֲשֵׂה|lemma="עָשָׂה" strong="c:H6213a" x-morph="He,C:Vqv2ms"\w*־\w לִ֨⁠י|lemma="" strong="l" x-morph="He,R:Sp1cs"\w* @@ -10100,7 +10100,7 @@ \w יַֽעַבְד֣וּ⁠ךָ|lemma="עָבַד" strong="H5647" x-morph="He,Vqj3mp:Sp2ms" x-tw="rc://*/tw/dict/bible/other/servant"\w* \w עַמִּ֗ים|lemma="עַם" strong="H5971a" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* \w וְיִֽשְׁתַּחֲו֤וּ|lemma="שָׁחָה" strong="c:H7812" x-morph="He,C:Vvj3mp" x-tw="rc://*/tw/dict/bible/kt/worship"\w* -\f + \ft K \w ו⁠ישתחו|lemma="שָׁחָה" strong="c:H7812" x-morph="He,C:Vvj3ms"\w*\f* +\f + \ft K \+w ו⁠ישתחו|lemma="שָׁחָה" strong="c:H7812" x-morph="He,C:Vvj3ms"\+w*\f* \w לְ⁠ךָ֙|lemma="" strong="l" x-morph="He,R:Sp2ms"\w* \w לְאֻמִּ֔ים|lemma="לְאֹם" strong="H3816" x-morph="He,Ncmpa"\w* \w הֱוֵ֤ה|lemma="הָוָא" strong="H1933b" x-morph="He,Vqv2ms"\w* @@ -14141,7 +14141,7 @@ \w וְ⁠אָהֳלִֽיבָמָה֙|lemma="אׇהֳלִיבָמָה" strong="c:H0173" x-morph="He,C:Np"\w* \w יָֽלְדָ֔ה|lemma="יָלַד" strong="H3205" x-morph="He,Vqp3fs"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w יעיש|lemma="יְעִישׁ" strong="H3274" x-morph="He,Np"\w* -\f + \ft Q \w יְע֥וּשׁ|lemma="יְעִישׁ" strong="H3266" x-morph="He,Np"\w*\f* +\f + \ft Q \+w יְע֥וּשׁ|lemma="יְעִישׁ" strong="H3266" x-morph="He,Np"\+w*\f* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w יַעְלָ֖ם|lemma="יַעְלָם" strong="H3281" x-morph="He,Np"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w קֹ֑רַח|lemma="קֹרַח" strong="H7141" x-morph="He,Np"\w* \w אֵ֚לֶּה|lemma="אֵלֶּה" strong="H0428" x-morph="He,Pdxcp"\w* @@ -14272,7 +14272,7 @@ \w וַ⁠תֵּ֣לֶד|lemma="יָלַד" strong="c:H3205" x-morph="He,C:Vqw3fs"\w* \w לְ⁠עֵשָׂ֔ו|lemma="עֵשָׂו" strong="l:H6215" x-morph="He,R:Np"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w יעיש|lemma="יְעִישׁ" strong="H3274" x-morph="He,Np"\w* -\f + \ft Q \w יְע֥וּשׁ|lemma="יְעִישׁ" strong="H3266" x-morph="He,Np"\w*\f* +\f + \ft Q \+w יְע֥וּשׁ|lemma="יְעִישׁ" strong="H3266" x-morph="He,Np"\+w*\f* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w יַעְלָ֖ם|lemma="יַעְלָם" strong="H3281" x-morph="He,Np"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w קֹֽרַח|lemma="קֹרַח" strong="H7141" x-morph="He,Np"\w*׃ @@ -15829,7 +15829,7 @@ \w הַ⁠סֹּ֔הַר|lemma="סֹהַר" strong="d:H5470" x-morph="He,Td:Ncmsa"\w* \w מְק֕וֹם|lemma="מָקוֹם" strong="H4725" x-morph="He,Ncmsc"\w* \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w אסורי|lemma="אָסַר" strong="H0631" x-morph="He,Vqsmpc" x-tw="rc://*/tw/dict/bible/other/gird"\w* -\f + \ft Q \w אֲסִירֵ֥י|lemma="אָסַר" strong="H0615" x-morph="He,Ncmpc"\w*\f* +\f + \ft Q \+w אֲסִירֵ֥י|lemma="אָסַר" strong="H0615" x-morph="He,Ncmpc"\+w*\f* \w הַ⁠מֶּ֖לֶךְ|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* \w אֲסוּרִ֑ים|lemma="אָסַר" strong="H0631" x-morph="He,Vqsmpa" x-tw="rc://*/tw/dict/bible/other/gird"\w* \w וַֽ⁠יְהִי|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqw3ms"\w*־\w שָׁ֖ם|lemma="שָׁם" strong="H8033" x-morph="He,D"\w* @@ -17925,7 +17925,7 @@ \w חָ֑י|lemma="חַי" strong="H2416a" x-morph="He,Aamsa" x-tw="rc://*/tw/dict/bible/kt/life"\w* \w וַֽ⁠יִּקְּד֖וּ|lemma="קָדַד" strong="c:H6915" x-morph="He,C:Vqw3mp" x-tw="rc://*/tw/dict/bible/other/bow"\w* \w וַיִּֽשְׁתַּחֲוּֽוּ|lemma="שָׁחָה" strong="c:H7812" x-morph="He,C:Vvw3mp" x-tw="rc://*/tw/dict/bible/kt/worship"\w*׃ -\f + \ft K \w ו⁠ישתחו|lemma="שָׁחָה" strong="c:H7812" x-morph="He,C:Vvw3ms"\w*\f* +\f + \ft K \+w ו⁠ישתחו|lemma="שָׁחָה" strong="c:H7812" x-morph="He,C:Vvw3ms"\+w*\f* \v 29 \w וַ⁠יִּשָּׂ֣א|lemma="נָשָׂא" strong="c:H5375" x-morph="He,C:Vqw3ms"\w* @@ -20276,7 +20276,7 @@ \w עַ֚ד|lemma="עַד" strong="H5704" x-morph="He,R"\w* \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w יָבֹ֣א|lemma="בּוֹא" strong="H0935" x-morph="He,Vqi3ms"\w* \w שִׁיל֔וֹ|lemma="שִׁילֹה" strong="H7886" x-morph="He,Np"\w* -\f + \ft K \w שילה|lemma="שִׁילֹה" strong="H7886" x-morph="He,Np"\w*\f* +\f + \ft K \+w שילה|lemma="שִׁילֹה" strong="H7886" x-morph="He,Np"\+w*\f* \w וְ⁠ל֖⁠וֹ|lemma="" strong="c:l" x-morph="He,C:R:Sp3ms"\w* \w יִקְּהַ֥ת|lemma="יִקָּהָה" strong="H3349" x-morph="He,Ncfsc"\w* \w עַמִּֽים|lemma="עַם" strong="H5971a" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w*׃ @@ -20285,7 +20285,7 @@ \w אֹסְרִ֤י|lemma="אָסַר" strong="H0631" x-morph="He,Vqrmsc" x-tw="rc://*/tw/dict/bible/other/gird"\w* \w לַ⁠גֶּ֨פֶן֙|lemma="גֶּפֶן" strong="l:H1612" x-morph="He,Rd:Ncbsa"\w* \w עִיר֔וֹ|lemma="עַיִר" strong="H5895" x-morph="He,Ncmsc:Sp3ms"\w* -\f + \ft K \w עיר⁠ה|lemma="עַיִר" strong="H5895" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w עיר⁠ה|lemma="עַיִר" strong="H5895" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w וְ⁠לַ⁠שֹּׂרֵקָ֖ה|lemma="שֹׂרֵק" strong="c:l:H8321b" x-morph="He,C:Rd:Ncfsa"\w* \w בְּנִ֣י|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w אֲתֹנ֑⁠וֹ|lemma="אָתוֹן" strong="H0860" x-morph="He,Ncfsc:Sp3ms"\w* @@ -20294,7 +20294,7 @@ \w לְבֻשׁ֔⁠וֹ|lemma="לְבוּשׁ" strong="H3830" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/robe"\w* \w וּ⁠בְ⁠דַם|lemma="דָּם" strong="c:b:H1818" x-morph="He,C:R:Ncmsc"\w*־\w עֲנָבִ֖ים|lemma="עֵנָב" strong="H6025" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/other/grape"\w* \w סוּתֽוֹ|lemma="סוּת" strong="H5497" x-morph="He,Ncmsc:Sp3ms"\w*׃ -\f + \ft K \w סות⁠ה|lemma="סוּת" strong="H5497" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w סות⁠ה|lemma="סוּת" strong="H5497" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \v 12 \w חַכְלִילִ֥י|lemma="חַכְלִיל" strong="H2447" x-morph="He,Aamsc"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/02-EXO.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/02-EXO.usfm index 96435e01..70126f1e 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/02-EXO.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/02-EXO.usfm @@ -6083,7 +6083,7 @@ \v 2 \w וַיִּלּ֜וֹנוּ|lemma="לוּן" strong="c:H3885b" x-morph="He,C:VNw3mp"\w* -\f + \ft K \w ו⁠ילינו|lemma="לוּן" strong="c:H3885b" x-morph="He,C:Vhw3mp"\w*\f* +\f + \ft K \+w ו⁠ילינו|lemma="לוּן" strong="c:H3885b" x-morph="He,C:Vhw3mp"\+w*\f* \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w עֲדַ֧ת|lemma="עֵדָה" strong="H5712" x-morph="He,Ncfsc"\w* \w בְּנֵי|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w יִשְׂרָאֵ֛ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w מֹשֶׁ֥ה|lemma="מֹשֶׁה" strong="H4872" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/moses"\w* @@ -6176,7 +6176,7 @@ \w מָ֔ה|lemma="מָה" strong="H4100" x-morph="He,Ti"\w* \w כִּ֥י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* \w תלונו|lemma="לוּן" strong="H3885b" x-morph="He,VNi2mp"\w* -\f + \ft Q \w תַלִּ֖ינוּ|lemma="לוּן" strong="H3885b" x-morph="He,Vhi2mp"\w*\f* +\f + \ft Q \+w תַלִּ֖ינוּ|lemma="לוּן" strong="H3885b" x-morph="He,Vhi2mp"\+w*\f* \w עָלֵֽי⁠נוּ|lemma="עַל" strong="H5921a" x-morph="He,R:Sp1cp"\w*׃ \v 8 @@ -8026,7 +8026,7 @@ \w לְ⁠עַ֥ם|lemma="עַם" strong="l:H5971a" x-morph="He,R:Ncmsa" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* \w נָכְרִ֛י|lemma="נׇכְרִי" strong="H5237" x-morph="He,Aamsa" x-tw="rc://*/tw/dict/bible/other/foreigner"\w* \w ל֥וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w*־\w יִמְשֹׁ֥ל|lemma="מָשַׁל" strong="H4910" x-morph="He,Vqi3ms" x-tw="rc://*/tw/dict/bible/kt/dominion"\w* -\f + \ft K \w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*\f* +\f + \ft K \+w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\+w*\f* \w לְ⁠מָכְרָ֖⁠הּ|lemma="מָכַר" strong="l:H4376" x-morph="He,R:Vqc:Sp3fs"\w* \w בְּ⁠בִגְד⁠וֹ|lemma="בָּגַד" strong="b:H0898" x-morph="He,R:Vqc:Sp3ms"\w*־\w בָֽ⁠הּ|lemma="" strong="b" x-morph="He,R:Sp3fs"\w*׃ @@ -8441,7 +8441,7 @@ \w אוֹ|lemma="אוֹ" strong="H0176a" x-morph="He,C"\w*־\w כֶ֔רֶם|lemma="כֶּרֶם" strong="H3754" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/other/vineyard"\w* \w וְ⁠שִׁלַּח֙|lemma="שָׁלַח" strong="c:H7971" x-morph="He,C:Vpp3ms"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w בְּעִיר֔וֹ|lemma="בְּעִיר" strong="H1165" x-morph="He,Ncmsc:Sp3ms"\w* -\f + \ft K \w בעיר⁠ה|lemma="בְּעִיר" strong="H1165" x-morph="He,Ncmsc:Sp3fs"\w*\f* +\f + \ft K \+w בעיר⁠ה|lemma="בְּעִיר" strong="H1165" x-morph="He,Ncmsc:Sp3fs"\+w*\f* \w וּ⁠בִעֵ֖ר|lemma="בָּעַר" strong="c:H1197b" x-morph="He,C:Vpq3ms"\w* \w בִּ⁠שְׂדֵ֣ה|lemma="שָׂדֶה" strong="b:H7704b" x-morph="He,R:Ncmsc"\w* \w אַחֵ֑ר|lemma="אַחֵר" strong="H0312" x-morph="He,Aamsa"\w* @@ -8718,7 +8718,7 @@ \w כִּ֣י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* \w הִ֤וא|lemma="הוּא" strong="H1931" x-morph="He,Pp3fs"\w* \w כְסוּתוֹ֙|lemma="כְּסוּת" strong="H3682" x-morph="He,Ncfsc:Sp3ms"\w* -\f + \ft K \w כסות⁠ה|lemma="כְּסוּת" strong="H3682" x-morph="He,Ncfsc:Sp3fs"\w*\f* +\f + \ft K \+w כסות⁠ה|lemma="כְּסוּת" strong="H3682" x-morph="He,Ncfsc:Sp3fs"\+w*\f* \w לְ⁠בַדָּ֔⁠הּ|lemma="בַּד" strong="l:H0905" x-morph="He,R:Ncmsc:Sp3fs"\w* \w הִ֥וא|lemma="הוּא" strong="H1931" x-morph="He,Pp3fs"\w* \w שִׂמְלָת֖⁠וֹ|lemma="שִׂמְלָה" strong="H8071" x-morph="He,Ncfsc:Sp3ms"\w* @@ -10589,7 +10589,7 @@ \w מֵ֣אָה|lemma="מֵאָה" strong="H3967" x-morph="He,Acbsa"\w* \w אֹ֑רֶךְ|lemma="אֹרֶךְ" strong="H0753" x-morph="He,Ncmsa"\w* \w וְעַמּוּדָ֣יו|lemma="עַמּוּד" strong="c:H5982" x-morph="He,C:Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/pillar"\w* -\f + \ft K \w ו⁠עמד⁠ו|lemma="עַמּוּד" strong="c:H5982" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠עמד⁠ו|lemma="עַמּוּד" strong="c:H5982" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w עֶשְׂרִ֗ים|lemma="עֶשְׂרִים" strong="H6242" x-morph="He,Acbpa"\w* \w וְ⁠אַדְנֵי⁠הֶ֤ם|lemma="אֶדֶן" strong="c:H0134" x-morph="He,C:Ncmpc:Sp3mp"\w* \w עֶשְׂרִים֙|lemma="עֶשְׂרִים" strong="H6242" x-morph="He,Acbpa"\w* @@ -11102,7 +11102,7 @@ \w וְ⁠יִרְכְּס֣וּ|lemma="רָכַס" strong="c:H7405" x-morph="He,C:Vqi3mp"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ֠⁠חֹשֶׁן|lemma="חֹשֶׁן" strong="d:H2833" x-morph="He,Td:Ncmsa"\w* \w מ⁠טבעת⁠ו|lemma="טַבַּעַת" strong="m:H2885" x-morph="He,R:Ncfpc:Sp3ms"\w* -\f + \ft Q \w מִֽטַּבְּעֹתָ֞יו|lemma="טַבַּעַת" strong="m:H2885" x-morph="He,R:Ncfpc:Sp3ms"\w*\f* +\f + \ft Q \+w מִֽטַּבְּעֹתָ֞יו|lemma="טַבַּעַת" strong="m:H2885" x-morph="He,R:Ncfpc:Sp3ms"\+w*\f* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w טַבְּעֹ֤ת|lemma="טַבַּעַת" strong="H2885" x-morph="He,Ncfpc"\w* \w הָ⁠אֵפֹד֙|lemma="אֵפוֹד" strong="d:H0646" x-morph="He,Td:Ncmsa"\w* \w בִּ⁠פְתִ֣יל|lemma="פָּתִיל" strong="b:H6616" x-morph="He,R:Ncmsc"\w* @@ -12996,7 +12996,7 @@ \w מֹשֶׁ֗ה|lemma="מֹשֶׁה" strong="H4872" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/moses"\w* \w וַ⁠יַּשְׁלֵ֤ךְ|lemma="שָׁלַךְ" strong="c:H7993" x-morph="He,C:Vhw3ms"\w* \w מ⁠יד⁠ו|lemma="יָד" strong="m:H3027" x-morph="He,R:Ncbsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/hand"\w* -\f + \ft Q \w מִיָּדָיו֙|lemma="יָד" strong="m:H3027" x-morph="He,R:Ncbdc:Sp3ms"\w*\f* +\f + \ft Q \+w מִיָּדָיו֙|lemma="יָד" strong="m:H3027" x-morph="He,R:Ncbdc:Sp3ms"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ⁠לֻּחֹ֔ת|lemma="לוּחַ" strong="d:H3871" x-morph="He,Td:Ncmpa"\w* \w וַ⁠יְשַׁבֵּ֥ר|lemma="שָׁבַר" strong="c:H7665" x-morph="He,C:Vpw3ms"\w* \w אֹתָ֖⁠ם|lemma="אֵת" strong="H0853" x-morph="He,To:Sp3mp"\w* @@ -14229,7 +14229,7 @@ \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w קְרָסָי⁠ו֙|lemma="קֶרֶס" strong="H7165" x-morph="He,Ncmpc:Sp3ms"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w קְרָשָׁ֔י⁠ו|lemma="קֶרֶשׁ" strong="H7175" x-morph="He,Ncmpc:Sp3ms"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w בְּרִיחָ֖יו|lemma="בְּרִיחַ" strong="H1280" x-morph="He,Ncmpc:Sp3ms"\w* -\f + \ft K \w בריחו|lemma="בְּרִיחַ" strong="H1280" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w בריחו|lemma="בְּרִיחַ" strong="H1280" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w עַמֻּדָ֖י⁠ו|lemma="עַמּוּד" strong="H5982" x-morph="He,Ncmpc:Sp3ms"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w אֲדָנָֽי⁠ו|lemma="אֶדֶן" strong="H0134" x-morph="He,Ncmpc:Sp3ms"\w*׃ @@ -15177,7 +15177,7 @@ \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ⁠כְּרֻבִ֖ים|lemma="כְּרוּב" strong="d:H3742" x-morph="He,Td:Ncmpa"\w* \w מִ⁠שְּׁנֵ֥י|lemma="שְׁנַיִם" strong="m:H8147" x-morph="He,R:Acmdc"\w* \w קצוות⁠ו|lemma="קְצָת" strong="H7117" x-morph="He,Ncfpc:Sp3ms"\w*׃ -\f + \ft Q \w קְצוֹתָֽיו|lemma="קְצָת" strong="H7098" x-morph="He,Ncbpc:Sp3ms"\w*\f* +\f + \ft Q \+w קְצוֹתָֽיו|lemma="קְצָת" strong="H7098" x-morph="He,Ncbpc:Sp3ms"\+w*\f* \v 9 \w וַ⁠יִּהְי֣וּ|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqw3mp"\w* @@ -15957,7 +15957,7 @@ \w חֹבְרֹ֑ת|lemma="חָבַר" strong="H2266" x-morph="He,Vqrfpa"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w שְׁנֵ֥י|lemma="שְׁנַיִם" strong="H8147" x-morph="He,Acmdc"\w* \w קצוות⁠ו|lemma="קְצָת" strong="H7117" x-morph="He,Ncfpc:Sp3ms"\w* -\f + \ft Q \w קְצוֹתָ֖יו|lemma="קְצָת" strong="H7098" x-morph="He,Ncbpc:Sp3ms"\w*\f* +\f + \ft Q \+w קְצוֹתָ֖יו|lemma="קְצָת" strong="H7098" x-morph="He,Ncbpc:Sp3ms"\+w*\f* \w חֻבָּֽר|lemma="חָבַר" strong="H2266" x-morph="He,VPp3ms"\w*׃ \v 5 @@ -16341,7 +16341,7 @@ \w קְרָסָ֣י⁠ו|lemma="קֶרֶס" strong="H7165" x-morph="He,Ncmpc:Sp3ms"\w* \w קְרָשָׁ֔י⁠ו|lemma="קֶרֶשׁ" strong="H7175" x-morph="He,Ncmpc:Sp3ms"\w* \w בְּרִיחָ֖יו|lemma="בְּרִיחַ" strong="H1280" x-morph="He,Ncmpc:Sp3ms"\w* -\f + \ft K \w בריחו|lemma="בְּרִיחַ" strong="H1280" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w בריחו|lemma="בְּרִיחַ" strong="H1280" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w וְ⁠עַמֻּדָ֥י⁠ו|lemma="עַמּוּד" strong="c:H5982" x-morph="He,C:Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/pillar"\w* \w וַ⁠אֲדָנָֽי⁠ו|lemma="אֶדֶן" strong="c:H0134" x-morph="He,C:Ncmpc:Sp3ms"\w*׃ diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/03-LEV.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/03-LEV.usfm index 0ecaf918..82c95e36 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/03-LEV.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/03-LEV.usfm @@ -3273,7 +3273,7 @@ \w וַ⁠יִּשָּׂ֨א|lemma="נָשָׂא" strong="c:H5375" x-morph="He,C:Vqw3ms"\w* \w אַהֲרֹ֧ן|lemma="אַהֲרוֹן" strong="H0175" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/aaron"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w יד⁠ו|lemma="יָד" strong="H3027" x-morph="He,Ncbsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/hand"\w* -\f + \ft Q \w יָדָ֛יו|lemma="יָד" strong="H3027" x-morph="He,Ncbdc:Sp3ms"\w*\f* +\f + \ft Q \+w יָדָ֛יו|lemma="יָד" strong="H3027" x-morph="He,Ncbdc:Sp3ms"\+w*\f* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w הָ⁠עָ֖ם|lemma="עַם" strong="d:H5971a" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* \w וַֽ⁠יְבָרְכֵ֑⁠ם|lemma="בָּרַךְ" strong="c:H1288" x-morph="He,C:Vpw3ms:Sp3mp" x-tw="rc://*/tw/dict/bible/kt/bless"\w* \w וַ⁠יֵּ֗רֶד|lemma="יָרַד" strong="c:H3381" x-morph="He,C:Vqw3ms"\w* @@ -3871,7 +3871,7 @@ \w הַ⁠הֹלֵ֖ךְ|lemma="הָלַךְ" strong="d:H1980" x-morph="He,Td:Vqrmsa"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w אַרְבַּ֑ע|lemma="אַרְבַּע" strong="H0702" x-morph="He,Acfsa"\w* \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w ל֤וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* -\f + \ft K \w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*\f* +\f + \ft K \+w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\+w*\f* \w כְרָעַ֨יִם֙|lemma="כָּרָע" strong="H3767" x-morph="He,Ncbda"\w* \w מִ⁠מַּ֣עַל|lemma="מַעַל" strong="m:H4605" x-morph="He,R:D"\w* \w לְ⁠רַגְלָ֔י⁠ו|lemma="רֶגֶל" strong="l:H7272" x-morph="He,R:Ncfdc:Sp3ms"\w* @@ -6769,7 +6769,7 @@ \w אַהֲרֹ֜ן|lemma="אַהֲרוֹן" strong="H0175" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/aaron"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w שְׁתֵּ֣י|lemma="שְׁנַיִם" strong="H8147" x-morph="He,Acfdc"\w* \w יָדָ֗יו|lemma="יָד" strong="H3027" x-morph="He,Ncbdc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/hand"\w* -\f + \ft K \w יד⁠ו|lemma="יָד" strong="H3027" x-morph="He,Ncbsc:Sp3ms"\w*\f* +\f + \ft K \+w יד⁠ו|lemma="יָד" strong="H3027" x-morph="He,Ncbsc:Sp3ms"\+w*\f* \w עַ֨ל|lemma="עַל" strong="H5921a" x-morph="He,R"\w* \w רֹ֣אשׁ|lemma="רֹאשׁ" strong="H7218a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/head"\w* \w הַ⁠שָּׂעִיר֮|lemma="שָׂעִיר" strong="d:H8163b" x-morph="He,Td:Ncmsa"\w* @@ -8515,7 +8515,7 @@ \v 5 \w לֹֽא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w יִקְרְח֤וּ|lemma="קָרַח" strong="H7139" x-morph="He,Vqi3mp"\w* -\f + \ft K \w יקרחה|lemma="קָרַח" strong="H7139" x-morph="He,Vqi3fs"\w*\f* +\f + \ft K \+w יקרחה|lemma="קָרַח" strong="H7139" x-morph="He,Vqi3fs"\+w*\f* \w קָרְחָה֙|lemma="קׇרְחָה" strong="H7144" x-morph="He,Ncfsa"\w* \w בְּ⁠רֹאשָׁ֔⁠ם|lemma="רֹאשׁ" strong="b:H7218a" x-morph="He,R:Ncmsc:Sp3mp" x-tw="rc://*/tw/dict/bible/other/head"\w* \w וּ⁠פְאַ֥ת|lemma="פֵּאָה" strong="c:H6285" x-morph="He,C:Ncfsc"\w* @@ -10529,7 +10529,7 @@ \w הַ⁠בַּ֨יִת|lemma="בַּיִת" strong="d:H1004b" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/house"\w* \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w בָּ⁠עִ֜יר|lemma="עִיר" strong="b:H5892b" x-morph="He,Rd:Ncfsa"\w* \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w ל֣וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* -\f + \ft K \w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*\f* +\f + \ft K \+w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\+w*\f* \w חֹמָ֗ה|lemma="חוֹמָה" strong="H2346" x-morph="He,Ncfsa"\w* \w לַ⁠צְּמִיתֻ֛ת|lemma="צְמִיתֻת" strong="l:H6783" x-morph="He,Rd:Ncfsa"\w* \w לַ⁠קֹּנֶ֥ה|lemma="קָנָה" strong="l:H7069" x-morph="He,Rd:Vqrmsa"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/04-NUM.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/04-NUM.usfm index 7b63459d..aa7075e6 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/04-NUM.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/04-NUM.usfm @@ -135,7 +135,7 @@ \v 16 \w אֵ֚לֶּה|lemma="אֵלֶּה" strong="H0428" x-morph="He,Pdxcp"\w* \w קריאי|lemma="קָרִיא" strong="H7148" x-morph="He,Aampc"\w* -\f + \ft Q \w קְרוּאֵ֣י|lemma="קָרִיא" strong="H7121" x-morph="He,Vqsmpc"\w*\f* +\f + \ft Q \+w קְרוּאֵ֣י|lemma="קָרִיא" strong="H7121" x-morph="He,Vqsmpc"\+w*\f* \w הָ⁠עֵדָ֔ה|lemma="עֵדָה" strong="d:H5712" x-morph="He,Td:Ncfsa"\w* \w נְשִׂיאֵ֖י|lemma="נָשִׂיא" strong="H5387a" x-morph="He,Ncmpc"\w* \w מַטּ֣וֹת|lemma="מַטֶּה" strong="H4294" x-morph="He,Ncmpc"\w* @@ -5960,7 +5960,7 @@ \w וְ⁠הָ⁠אִ֥ישׁ|lemma="אִישׁ" strong="c:d:H0376" x-morph="He,C:Td:Ncmsa"\w* \w מֹשֶׁ֖ה|lemma="מֹשֶׁה" strong="H4872" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/moses"\w* \w ענו|lemma="עָנָו" strong="H6035" x-morph="He,Aamsa"\w* -\f + \ft Q \w עָנָ֣יו|lemma="עָנָו" strong="H6040" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft Q \+w עָנָ֣יו|lemma="עָנָו" strong="H6040" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w מְאֹ֑ד|lemma="מְאֹד" strong="H3966" x-morph="He,D"\w* \w מִ⁠כֹּל֙|lemma="כֹּל" strong="m:H3605" x-morph="He,R:Ncmsc"\w* \w הָֽ⁠אָדָ֔ם|lemma="אָדָם" strong="d:H0120" x-morph="He,Td:Ncmsa"\w* @@ -7028,7 +7028,7 @@ \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הָ⁠אָ֑רֶץ|lemma="אֶרֶץ" strong="d:H0776" x-morph="He,Td:Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w* \w וַ⁠יָּשֻׁ֗בוּ|lemma="שׁוּב" strong="c:H7725" x-morph="He,C:Vqw3mp" x-tw="rc://*/tw/dict/bible/other/return"\w* \w וַיַּלִּ֤ינוּ|lemma="לוּן" strong="c:H3885b" x-morph="He,C:Vhw3mp"\w* -\f + \ft K \w ו⁠ילונו|lemma="לוּן" strong="c:H3885b" x-morph="He,C:VNw3mp"\w*\f* +\f + \ft K \+w ו⁠ילונו|lemma="לוּן" strong="c:H3885b" x-morph="He,C:VNw3mp"\+w*\f* \w עָלָי⁠ו֙|lemma="עַל" strong="H5921a" x-morph="He,R:Sp3ms"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w הָ֣⁠עֵדָ֔ה|lemma="עֵדָה" strong="d:H5712" x-morph="He,Td:Ncfsa"\w* \w לְ⁠הוֹצִ֥יא|lemma="יָצָא" strong="l:H3318" x-morph="He,R:Vhc"\w* @@ -7818,7 +7818,7 @@ \w מַה|lemma="מָה" strong="H4100" x-morph="He,Ti"\w*־\w ה֔וּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w* \w כִּ֥י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* \w תלונו|lemma="לוּן" strong="H3885b" x-morph="He,VNi2mp"\w* -\f + \ft Q \w תַלִּ֖ינוּ|lemma="לוּן" strong="H3885b" x-morph="He,Vhi2mp"\w*\f* +\f + \ft Q \+w תַלִּ֖ינוּ|lemma="לוּן" strong="H3885b" x-morph="He,Vhi2mp"\+w*\f* \w עָלָֽי⁠ו|lemma="עַל" strong="H5921a" x-morph="He,R:Sp3ms"\w*׃ \v 12 @@ -10248,7 +10248,7 @@ \w וַֽ⁠יִּלְכְּד֖וּ|lemma="לָכַד" strong="c:H3920" x-morph="He,C:Vqw3mp"\w* \w בְּנֹתֶ֑י⁠הָ|lemma="בַּת" strong="H1323" x-morph="He,Ncfpc:Sp3fs"\w* \w וַיּ֖וֹרֶשׁ|lemma="יָרַשׁ" strong="c:H3423" x-morph="He,C:Vhw3ms" x-tw="rc://*/tw/dict/bible/kt/inherit"\w* -\f + \ft K \w ו⁠יירש|lemma="יָרַשׁ" strong="c:H3423" x-morph="He,C:Vhw3ms"\w*\f* +\f + \ft K \+w ו⁠יירש|lemma="יָרַשׁ" strong="c:H3423" x-morph="He,C:Vhw3ms"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הָ⁠אֱמֹרִ֥י|lemma="אֱמֹרִי" strong="d:H0567" x-morph="He,Td:Ngmsa" x-tw="rc://*/tw/dict/bible/names/amorite"\w* \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w שָֽׁם|lemma="שָׁם" strong="H8033" x-morph="He,D"\w*׃ @@ -11116,7 +11116,7 @@ \w אֵלָ֜י⁠ו|lemma="אֵל" strong="H0413" x-morph="He,R:Sp3ms"\w* \w בָּלָ֗ק|lemma="בָּלָק" strong="H1111" x-morph="He,Np"\w* \w לך|lemma="יָלַךְ" strong="H3212" x-morph="He,Vqv2ms" x-tw="rc://*/tw/dict/bible/other/walk"\w*־\w נָּ֨א|lemma="נָא" strong="H4994" x-morph="He,Te"\w* -\f + \ft Q \w לך|lemma="יָלַךְ" strong="H3212" x-morph="He,Vqv2ms:Sh"\w*\f* +\f + \ft Q \+w לך|lemma="יָלַךְ" strong="H3212" x-morph="He,Vqv2ms:Sh"\+w*\f* \w אִתִּ֜⁠י|lemma="אֵת" strong="H0854" x-morph="He,R:Sp1cs"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w מָק֤וֹם|lemma="מָקוֹם" strong="H4725" x-morph="He,Ncmsa"\w* \w אַחֵר֙|lemma="אַחֵר" strong="H0312" x-morph="He,Aamsa"\w* @@ -12007,7 +12007,7 @@ \w הֽוּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w*־\w דָתָ֨ן|lemma="דָּתָן" strong="H1885" x-morph="He,Np"\w* \w וַ⁠אֲבִירָ֜ם|lemma="אֲבִירָם" strong="c:H0048" x-morph="He,C:Np"\w* \w קרואי|lemma="קָרָא" strong="H7121" x-morph="He,Vqsmpc" x-tw="rc://*/tw/dict/bible/other/cry" x-tw="rc://*/tw/dict/bible/kt/call"\w* -\f + \ft Q \w קְרִיאֵ֣י|lemma="קָרָא" strong="H7148" x-morph="He,Aampc"\w*\f* +\f + \ft Q \+w קְרִיאֵ֣י|lemma="קָרָא" strong="H7148" x-morph="He,Aampc"\+w*\f* \w הָ⁠עֵדָ֗ה|lemma="עֵדָה" strong="d:H5712" x-morph="He,Td:Ncfsa"\w* \w אֲשֶׁ֨ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w הִצּ֜וּ|lemma="נָצָה" strong="H5327a" x-morph="He,Vhp3cp"\w* @@ -14854,7 +14854,7 @@ \v 7 \w וְ⁠לָ֣⁠מָּה|lemma="מָה" strong="c:l:H4100" x-morph="He,C:R:Ti"\w* \w תְנִיא֔וּן|lemma="נוּא" strong="H5106" x-morph="He,Vhi2mp:Sn"\w* -\f + \ft K \w תנואו⁠ן|lemma="נוּא" strong="H5106" x-morph="He,Vqi2mp:Sn"\w*\f* +\f + \ft K \+w תנואו⁠ן|lemma="נוּא" strong="H5106" x-morph="He,Vqi2mp:Sn"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w לֵ֖ב|lemma="לֵב" strong="H3820a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/heart"\w* \w בְּנֵ֣י|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w יִשְׂרָאֵ֑ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* @@ -15908,7 +15908,7 @@ \w וְ⁠עָ֣בַר|lemma="עָבַר" strong="c:H5674a" x-morph="He,C:Vqq3ms" x-tw="rc://*/tw/dict/bible/other/preach"\w* \w צִ֔נָ⁠ה|lemma="צִן" strong="H6790" x-morph="He,Np:Sd"\w* \w וְהָיוּ֙|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3cp"\w* -\f + \ft K \w ו⁠היה|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3ms"\w*\f* +\f + \ft K \+w ו⁠היה|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3ms"\+w*\f* \w תּֽוֹצְאֹתָ֔י⁠ו|lemma="תּוֹצָאָה" strong="H8444" x-morph="He,Ncfpc:Sp3ms"\w* \w מִ⁠נֶּ֖גֶב|lemma="נֶגֶב" strong="m:H5045" x-morph="He,R:Ncmsa"\w* \w לְ⁠קָדֵ֣שׁ|lemma="קָדֵשׁ בַּרְנֵעַ" strong="l:H6947" x-morph="He,R:Np"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/05-DEU.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/05-DEU.usfm index c46fc21d..c0c469b4 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/05-DEU.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/05-DEU.usfm @@ -1153,7 +1153,7 @@ \w וַ⁠נַּ֥ךְ|lemma="נָכָה" strong="c:H5221" x-morph="He,C:Vhw1cp"\w* \w אֹת֛⁠וֹ|lemma="אֵת" strong="H0853" x-morph="He,To:Sp3ms"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w בנ⁠ו|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/son"\w* -\f + \ft Q \w בָּנָ֖יו|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc:Sp3ms"\w*\f* +\f + \ft Q \+w בָּנָ֖יו|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc:Sp3ms"\+w*\f* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w עַמּֽ⁠וֹ|lemma="עַם" strong="H5971a" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w*׃ \v 34 @@ -2619,7 +2619,7 @@ \w לְ⁠אֹהֲבַ֖⁠י|lemma="אָהַב" strong="l:H0157" x-morph="He,R:Vqrmpc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/love"\w* \w וּ⁠לְ⁠שֹׁמְרֵ֥י|lemma="שָׁמַר" strong="c:l:H8104" x-morph="He,C:R:Vqrmpc"\w* \w מִצְוֹתָֽי|lemma="מִצְוָה" strong="H4687" x-morph="He,Ncfpc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/command"\w*׃ס -\f + \ft K \w מצות⁠ו|lemma="מִצְוָה" strong="H4687" x-morph="He,Ncfpc:Sp3ms"\w*\f* +\f + \ft K \+w מצות⁠ו|lemma="מִצְוָה" strong="H4687" x-morph="He,Ncfpc:Sp3ms"\+w*\f* \v 11 \w לֹ֥א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* @@ -3449,7 +3449,7 @@ \w לְ⁠אֹהֲבָ֛י⁠ו|lemma="אָהַב" strong="l:H0157" x-morph="He,R:Vqrmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/love"\w* \w וּ⁠לְ⁠שֹׁמְרֵ֥י|lemma="שָׁמַר" strong="c:l:H8104" x-morph="He,C:R:Vqrmpc"\w* \w מִצְוֹתָיו|lemma="מִצְוָה" strong="H4687" x-morph="He,Ncfpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/command"\w* -\f + \ft K \w מצותו|lemma="מִצְוָה" strong="H4687" x-morph="He,Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w מצותו|lemma="מִצְוָה" strong="H4687" x-morph="He,Ncfsc:Sp3ms"\+w*\f* \w לְ⁠אֶ֥לֶף|lemma="אֶלֶף" strong="l:H0505" x-morph="He,R:Acbsa"\w* \w דּֽוֹר|lemma="דּוֹר" strong="H1755" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/generation"\w*׃ @@ -3748,7 +3748,7 @@ \w בִּֽ⁠לְבָבְ⁠ךָ֛|lemma="לֵבָב" strong="b:H3824" x-morph="He,R:Ncmsc:Sp2ms"\w* \w הֲ⁠תִשְׁמֹ֥ר|lemma="שָׁמַר" strong="i:H8104" x-morph="He,Ti:Vqi2ms"\w* \w מִצוֹתָיו|lemma="מִצְוָה" strong="H4687" x-morph="He,Ncfpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/command"\w* -\f + \ft K \w מצות⁠ו|lemma="מִצְוָה" strong="H4687" x-morph="He,Ncfסc:Sp3ms"\w*\f* +\f + \ft K \+w מצות⁠ו|lemma="מִצְוָה" strong="H4687" x-morph="He,Ncfסc:Sp3ms"\+w*\f* \w אִם|lemma="אִם" strong="H0518a" x-morph="He,C"\w*־\w לֹֽא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*׃ \v 3 @@ -6117,7 +6117,7 @@ \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w יֹֽשְׁבֵ֛י|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqrmpc"\w* \w הָ⁠עִ֥יר|lemma="עִיר" strong="d:H5892b" x-morph="He,Td:Ncfsa"\w* \w ה⁠הוא|lemma="הוּא" strong="d:H1931" x-morph="He,Td:Pp3ms"\w* -\f + \ft Q \w הַהִ֖יא|lemma="הִיא" strong="d:H1992" x-morph="He,Td:Pp3fs"\w*\f* +\f + \ft Q \+w הַהִ֖יא|lemma="הִיא" strong="d:H1992" x-morph="He,Td:Pp3fs"\+w*\f* \w לְ⁠פִי|lemma="פֶּה" strong="l:H6310" x-morph="He,R:Ncmsc"\w*־\w חָ֑רֶב|lemma="חֶרֶב" strong="H2719" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/other/sword"\w* \w הַחֲרֵ֨ם|lemma="חָרַם" strong="H2763a" x-morph="He,Vha" x-tw="rc://*/tw/dict/bible/other/destroyer"\w* \w אֹתָ֧⁠הּ|lemma="אֵת" strong="H0853" x-morph="He,To:Sp3fs"\w* @@ -8662,7 +8662,7 @@ \w יָדֵ֗י⁠נוּ|lemma="יָד" strong="H3027" x-morph="He,Ncbdc:Sp1cp" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w לֹ֤א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w שָֽׁפְכוּ֙|lemma="שָׁפַךְ" strong="H8210" x-morph="He,Vqp3cp"\w* -\f + \ft K \w שפכה|lemma="שָׁפַךְ" strong="H8210" x-morph="He,Vqp3fs"\w*\f* +\f + \ft K \+w שפכה|lemma="שָׁפַךְ" strong="H8210" x-morph="He,Vqp3fs"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ⁠דָּ֣ם|lemma="דָּם" strong="d:H1818" x-morph="He,Td:Ncmsa"\w* \w הַ⁠זֶּ֔ה|lemma="זֶה" strong="d:H2088" x-morph="He,Td:Pdxms"\w* \w וְ⁠עֵינֵ֖י⁠נוּ|lemma="עַיִן" strong="c:H5869a" x-morph="He,C:Ncbdc:Sp1cp"\w* @@ -9100,12 +9100,12 @@ \w וְ⁠לָקַ֛ח|lemma="לָקַח" strong="c:H3947" x-morph="He,C:Vqq3ms"\w* \w אֲבִ֥י|lemma="אָב" strong="H0001" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/father"\w* \w הַֽנַּעֲרָ֖ה|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\w* -\f + \ft K \w ה⁠נער|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncf sa"\w*\f* +\f + \ft K \+w ה⁠נער|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncf sa"\+w*\f* \w וְ⁠אִמָּ֑⁠הּ|lemma="אֵם" strong="c:H0517" x-morph="He,C:Ncfsc:Sp3fs"\w* \w וְ⁠הוֹצִ֜יאוּ|lemma="יָצָא" strong="c:H3318" x-morph="He,C:Vhq3cp" x-tw="rc://*/tw/dict/bible/kt/command"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w בְּתוּלֵ֧י|lemma="בְּתוּלִים" strong="H1331" x-morph="He,Ncbpc"\w* \w הַֽנַּעֲרָ֛ה|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\w* -\f + \ft K \w ה⁠נער|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\w*\f* +\f + \ft K \+w ה⁠נער|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\+w*\f* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w זִקְנֵ֥י|lemma="זָקֵן" strong="H2205" x-morph="He,Aampc" x-tw="rc://*/tw/dict/bible/other/elder"\w* \w הָ⁠עִ֖יר|lemma="עִיר" strong="d:H5892b" x-morph="He,Td:Ncfsa"\w* \w הַ⁠שָּֽׁעְרָ⁠ה|lemma="שַׁעַר" strong="d:H8179" x-morph="He,Td:Ncmsa:Sd" x-tw="rc://*/tw/dict/bible/other/gate"\w*׃ @@ -9114,7 +9114,7 @@ \w וְ⁠אָמַ֛ר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqq3ms"\w* \w אֲבִ֥י|lemma="אָב" strong="H0001" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/father"\w* \w הַֽנַּעֲרָ֖ה|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\w* -\f + \ft K \w ה⁠נער|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\w*\f* +\f + \ft K \+w ה⁠נער|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\+w*\f* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w הַ⁠זְּקֵנִ֑ים|lemma="זָקֵן" strong="d:H2205" x-morph="He,Td:Aampa" x-tw="rc://*/tw/dict/bible/other/elder"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w בִּתִּ֗⁠י|lemma="בַּת" strong="H1323" x-morph="He,Ncfsc:Sp1cs"\w* \w נָתַ֜תִּי|lemma="נָתַן" strong="H5414" x-morph="He,Vqp1cs"\w* @@ -9178,12 +9178,12 @@ \w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w נִמְצְא֥וּ|lemma="מָצָא" strong="H4672" x-morph="He,VNp3cp"\w* \w בְתוּלִ֖ים|lemma="בְּתוּלִים" strong="H1331" x-morph="He,Ncbpa"\w* \w לַֽ/נַּעֲרָֽה|lemma="נַעֲרָה" strong="l:H5291" x-morph="He,Rd:Ncfsa"\w*׃ -\f + \ft K \w ה⁠נער|lemma="נַעֲרָה" strong="l:H5291" x-morph="He,Td:Ncfsa"\w*\f* +\f + \ft K \+w ה⁠נער|lemma="נַעֲרָה" strong="l:H5291" x-morph="He,Td:Ncfsa"\+w*\f* \v 21 \w וְ⁠הוֹצִ֨יאוּ|lemma="יָצָא" strong="c:H3318" x-morph="He,C:Vhq3cp" x-tw="rc://*/tw/dict/bible/kt/command"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w ה⁠נער|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\w* -\f + \ft K \w ה⁠נער|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\w*\f* +\f + \ft K \+w ה⁠נער|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\+w*\f* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w פֶּ֣תַח|lemma="פֶּתַח" strong="H6607" x-morph="He,Ncmsc"\w* \w בֵּית|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w*־\w אָבִ֗י⁠הָ|lemma="אָב" strong="H0001" x-morph="He,Ncmsc:Sp3fs" x-tw="rc://*/tw/dict/bible/other/father"\w* \w וּ⁠סְקָלוּ⁠הָ֩|lemma="סָקַל" strong="c:H5619" x-morph="He,C:Vqq3cp:Sp3fs"\w* @@ -9221,7 +9221,7 @@ \w כִּ֤י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* \w יִהְיֶה֙|lemma="הָיָה" strong="H1961" x-morph="He,Vqi3ms"\w* \w נַעֲרָ֣ה|lemma="נַעֲרָה" strong="H5291" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/other/servant"\w* -\f + \ft K \w ה⁠נער|lemma="נַעֲרָה" strong="H5291" x-morph="He,Ncfsa"\w*\f* +\f + \ft K \+w ה⁠נער|lemma="נַעֲרָה" strong="H5291" x-morph="He,Ncfsa"\+w*\f* \w בְתוּלָ֔ה|lemma="בְּתוּלָה" strong="H1330" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/other/virgin"\w* \w מְאֹרָשָׂ֖ה|lemma="אָרַשׂ" strong="H0781" x-morph="He,VPsfsa"\w* \w לְ⁠אִ֑ישׁ|lemma="אִישׁ" strong="l:H0376" x-morph="He,R:Ncmsa"\w* @@ -9242,7 +9242,7 @@ \w בָּ⁠אֲבָנִים֮|lemma="אֶבֶן" strong="b:H0068" x-morph="He,Rd:Ncfpa"\w* \w וָ⁠מֵתוּ֒|lemma="מוּת" strong="c:H4191" x-morph="He,C:Vqq3cp" x-tw="rc://*/tw/dict/bible/other/death"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַֽנַּעֲרָ֗ה|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\w* -\f + \ft K \w ה⁠נער|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\w*\f* +\f + \ft K \+w ה⁠נער|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\+w*\f* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w דְּבַר֙|lemma="דָּבָר" strong="H1697" x-morph="He,Ncmsc"\w* \w אֲשֶׁ֣ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w צָעֲקָ֣ה|lemma="צָעַק" strong="H6817" x-morph="He,Vqp3fs" x-tw="rc://*/tw/dict/bible/other/cry"\w* @@ -9261,7 +9261,7 @@ \w יִמְצָ֣א|lemma="מָצָא" strong="H4672" x-morph="He,Vqi3ms"\w* \w הָ⁠אִ֗ישׁ|lemma="אִישׁ" strong="d:H0376" x-morph="He,Td:Ncmsa"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַֽנַּעֲרָה֙|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\w* -\f + \ft K \w הנער|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\w*\f* +\f + \ft K \+w הנער|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\+w*\f* \w הַ⁠מְאֹ֣רָשָׂ֔ה|lemma="אָרַשׂ" strong="d:H0781" x-morph="He,Td:VPsfsa"\w* \w וְ⁠הֶחֱזִֽיק|lemma="חָזַק" strong="c:H2388" x-morph="He,C:Vhq3ms"\w*־\w בָּ֥⁠הּ|lemma="" strong="b" x-morph="He,R:Sp3fs"\w* \w הָ⁠אִ֖ישׁ|lemma="אִישׁ" strong="d:H0376" x-morph="He,Td:Ncmsa"\w* @@ -9275,12 +9275,12 @@ \v 26 \w וְלַֽנַּעֲרָה֙|lemma="נַעֲרָה" strong="c:l:H5291" x-morph="He,C:Rd:Ncfsa"\w* -\f + \ft K \w ו⁠ל⁠נער|lemma="נַעֲרָה" strong="c:l:H5291" x-morph="He,C:Rd:Ncfsa"\w*\f* +\f + \ft K \+w ו⁠ל⁠נער|lemma="נַעֲרָה" strong="c:l:H5291" x-morph="He,C:Rd:Ncfsa"\+w*\f* \w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w תַעֲשֶׂ֣ה|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqi2ms"\w* \w דָבָ֔ר|lemma="דָּבָר" strong="H1697" x-morph="He,Ncmsa"\w* \w אֵ֥ין|lemma="אַיִן" strong="H0369" x-morph="He,Tn"\w* \w לַֽנַּעֲרָ֖ה|lemma="נַעֲרָה" strong="l:H5291" x-morph="He,Rd:Ncfsa"\w* -\f + \ft K \w לנער|lemma="נַעֲרָה" strong="l:H5291" x-morph="He,Rd:Ncfsa"\w*\f* +\f + \ft K \+w לנער|lemma="נַעֲרָה" strong="l:H5291" x-morph="He,Rd:Ncfsa"\+w*\f* \w חֵ֣טְא|lemma="חֵטְא" strong="H2399" x-morph="He,Ncmsc"\w* \w מָ֑וֶת|lemma="מָוֶת" strong="H4194" x-morph="He,Ncmsa"\w* \w כִּ֡י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* @@ -9300,7 +9300,7 @@ \w מְצָאָ֑⁠הּ|lemma="מָצָא" strong="H4672" x-morph="He,Vqp3ms:Sp3fs"\w* \w צָעֲקָ֗ה|lemma="צָעַק" strong="H6817" x-morph="He,Vqp3fs" x-tw="rc://*/tw/dict/bible/other/cry"\w* \w הַֽנַּעֲרָה֙|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\w* -\f + \ft K \w הנער|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\w*\f* +\f + \ft K \+w הנער|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\+w*\f* \w הַ⁠מְאֹ֣רָשָׂ֔ה|lemma="אָרַשׂ" strong="d:H0781" x-morph="He,Td:VPsfsa"\w* \w וְ⁠אֵ֥ין|lemma="אַיִן" strong="c:H0369" x-morph="He,C:Tn"\w* \w מוֹשִׁ֖יעַ|lemma="יָשַׁע" strong="H3467" x-morph="He,Vhrmsa" x-tw="rc://*/tw/dict/bible/other/deliverer"\w* @@ -9310,7 +9310,7 @@ \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w יִמְצָ֣א|lemma="מָצָא" strong="H4672" x-morph="He,Vqi3ms"\w* \w אִ֗ישׁ|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsa"\w* \w נַעֲרָ֤ה|lemma="נַעֲרָה" strong="H5291" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/other/servant"\w* -\f + \ft K \w נער|lemma="נַעֲרָה" strong="H5291" x-morph="He,Ncfsa"\w*\f* +\f + \ft K \+w נער|lemma="נַעֲרָה" strong="H5291" x-morph="He,Ncfsa"\+w*\f* \w בְתוּלָה֙|lemma="בְּתוּלָה" strong="H1330" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/other/virgin"\w* \w אֲשֶׁ֣ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w אֹרָ֔שָׂה|lemma="אָרַשׂ" strong="H0781" x-morph="He,VPp3fs"\w* @@ -9326,7 +9326,7 @@ \w עִמָּ֛⁠הּ|lemma="עִם" strong="H5973a" x-morph="He,R:Sp3fs"\w* \w לַ⁠אֲבִ֥י|lemma="אָב" strong="l:H0001" x-morph="He,R:Ncmsc" x-tw="rc://*/tw/dict/bible/other/father"\w* \w הַֽנַּעֲרָ֖ה|lemma="נַעֲרָה" strong="d:H5291" x-morph="He,Td:Ncfsa"\w* -\f + \ft K \w ה⁠נער|lemma="נַעֲרָה" strong="H5291" x-morph="He,Td:Ncfsa"\w*\f* +\f + \ft K \+w ה⁠נער|lemma="נַעֲרָה" strong="H5291" x-morph="He,Td:Ncfsa"\+w*\f* \w חֲמִשִּׁ֣ים|lemma="חֲמִשִּׁים" strong="H2572" x-morph="He,Acbpa"\w* \w כָּ֑סֶף|lemma="כֶּסֶף" strong="H3701" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/silver"\w* \w וְ⁠לֽ⁠וֹ|lemma="" strong="c:l" x-morph="He,C:R:Sp3ms"\w*־\w תִהְיֶ֣ה|lemma="הָיָה" strong="H1961" x-morph="He,Vqi3fs"\w* @@ -11328,7 +11328,7 @@ \w בִּ⁠שְׁחִ֤ין|lemma="שְׁחִין" strong="b:H7822" x-morph="He,R:Ncmsc"\w* \w מִצְרַ֨יִם֙|lemma="מִצְרַיִם" strong="H4714" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/egypt"\w* \w ו⁠ב⁠עפלים|lemma="עֹפֶל" strong="c:b:H2914" x-morph="He,C:Rd:Ncmpa"\w* -\f + \ft Q \w וּבַטְּחֹרִ֔ים|lemma="טְחוֹר" strong="c:b:H2914" x-morph="He,C:Rd:Ncmpa"\w*\f* +\f + \ft Q \+w וּבַטְּחֹרִ֔ים|lemma="טְחוֹר" strong="c:b:H2914" x-morph="He,C:Rd:Ncmpa"\+w*\f* \w וּ⁠בַ⁠גָּרָ֖ב|lemma="גָּרָב" strong="c:b:H1618" x-morph="He,C:Rd:Ncmsa"\w* \w וּ⁠בֶ⁠חָ֑רֶס|lemma="חֶרֶס" strong="c:b:H2775b" x-morph="He,C:Rd:Ncmsa"\w* \w אֲשֶׁ֥ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* @@ -11368,7 +11368,7 @@ \w וְ⁠אִ֤ישׁ|lemma="אִישׁ" strong="c:H0376" x-morph="He,C:Ncmsa"\w* \w אַחֵר֙|lemma="אַחֵר" strong="H0312" x-morph="He,Aamsa"\w* \w ישגל⁠נה|lemma="שָׁגַל" strong="H7693" x-morph="He,Vqi3ms:Sp3fs"\w* -\f + \ft Q \w יִשְׁכָּבֶ֔נָּה|lemma="שָׁכַב" strong="H7901" x-morph="He,Vqi3ms:Sp3fs"\w*\f* +\f + \ft Q \+w יִשְׁכָּבֶ֔נָּה|lemma="שָׁכַב" strong="H7901" x-morph="He,Vqi3ms:Sp3fs"\+w*\f* \w בַּ֥יִת|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/house"\w* \w תִּבְנֶ֖ה|lemma="בָּנָה" strong="H1129" x-morph="He,Vqi2ms"\w* \w וְ⁠לֹא|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w*־\w תֵשֵׁ֣ב|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqi2ms"\w* @@ -12366,7 +12366,7 @@ \w וַ⁠עֲמֹרָה֙|lemma="עֲמֹרָה" strong="c:H6017" x-morph="He,C:Np"\w* \w אַדְמָ֣ה|lemma="אַדְמָה" strong="H0126" x-morph="He,Np"\w* \w וּצְבוֹיִ֔ם|lemma="צְבֹאִים" strong="c:H6636" x-morph="He,C:Np"\w* -\f + \ft K \w ו⁠צביים|lemma="צְבֹאִים" strong="c:H6636" x-morph="He,C:Np"\w*\f* +\f + \ft K \+w ו⁠צביים|lemma="צְבֹאִים" strong="c:H6636" x-morph="He,C:Np"\+w*\f* \w אֲשֶׁר֙|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w הָפַ֣ךְ|lemma="הָפַךְ" strong="H2015" x-morph="He,Vqp3ms"\w* \w יְהוָ֔ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* @@ -13461,7 +13461,7 @@ \v 13 \w יַרְכִּבֵ֨⁠הוּ֙|lemma="רָכַב" strong="H7392" x-morph="He,Vhi3ms:Sp3ms"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w בָּ֣מֳתֵי|lemma="בָּמָה" strong="H1116" x-morph="He,Ncfpc"\w* -\f + \ft K \w במותי|lemma="בָּמָה" strong="H1116" x-morph="He,Ncfpc"\w*\f* +\f + \ft K \+w במותי|lemma="בָּמָה" strong="H1116" x-morph="He,Ncfpc"\+w*\f* \w אָ֔רֶץ|lemma="אֶרֶץ" strong="H0776" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w* \w וַ⁠יֹּאכַ֖ל|lemma="אָכַל" strong="c:H0398" x-morph="He,C:Vqw3ms" x-tw="rc://*/tw/dict/bible/other/devour"\w* \w תְּנוּבֹ֣ת|lemma="תְּנוּבָה" strong="H8570" x-morph="He,Ncfpc"\w* @@ -14078,7 +14078,7 @@ \w לֹ֣א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w הִכִּ֔יר|lemma="נָכַר" strong="H5234a" x-morph="He,Vhp3ms"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w בָּנָ֖יו|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/son"\w* -\f + \ft K \w בנ⁠ו|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w בנ⁠ו|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w לֹ֣א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w יָדָ֑ע|lemma="יָדַע" strong="H3045" x-morph="He,Vqp3ms" x-tw="rc://*/tw/dict/bible/other/know"\w* \w כִּ֤י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/06-JOS.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/06-JOS.usfm index f426df19..61080389 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/06-JOS.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/06-JOS.usfm @@ -529,7 +529,7 @@ \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w אִמִּ֗⁠י|lemma="אֵם" strong="H0517" x-morph="He,Ncfsc:Sp1cs"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w אַחַ⁠י֙|lemma="אָח" strong="H0251" x-morph="He,Ncmpc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/brother"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w אחות⁠י|lemma="אָחוֹת" strong="H0269" x-morph="He,Ncfpc:Sp1cs"\w* -\f + \ft Q \w אַחְיוֹתַ֔י|lemma="אָחוֹת" strong="H0269" x-morph="He,Ncfpc:Sp1cs"\w*\f* +\f + \ft Q \+w אַחְיוֹתַ֔י|lemma="אָחוֹת" strong="H0269" x-morph="He,Ncfpc:Sp1cs"\+w*\f* \w וְ⁠אֵ֖ת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w* \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w אֲשֶׁ֣ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w לָ⁠הֶ֑ם|lemma="" strong="l" x-morph="He,R:Sp3mp"\w* @@ -765,7 +765,7 @@ \w יִהְיֶ֗ה|lemma="הָיָה" strong="H1961" x-morph="He,Vqi3ms"\w* \w בֵּֽינֵי⁠כֶם֙|lemma="בֵּין" strong="H0996" x-morph="He,R:Sp2mp"\w* \w ו⁠בינ⁠ו|lemma="בֵּין" strong="c:H0996" x-morph="He,C:R:Sp3ms"\w* -\f + \ft Q \w וּבֵינָ֔יו|lemma="בֵּין" strong="c:H0996" x-morph="He,C:R:Sp3ms"\w*\f* +\f + \ft Q \+w וּבֵינָ֔יו|lemma="בֵּין" strong="c:H0996" x-morph="He,C:R:Sp3ms"\+w*\f* \w כְּ⁠אַלְפַּ֥יִם|lemma="אֶלֶף" strong="k:H0505" x-morph="He,R:Acbpa"\w* \w אַמָּ֖ה|lemma="אַמָּה" strong="H0520a" x-morph="He,Ncfsa"\w* \w בַּ⁠מִּדָּ֑ה|lemma="מִדָּה" strong="b:H4060a" x-morph="He,Rd:Ncfsa"\w* @@ -973,7 +973,7 @@ \w הַרְחֵ֨ק|lemma="רָחַק" strong="H7368" x-morph="He,Vha"\w* \w מְאֹ֜ד|lemma="מְאֹד" strong="H3966" x-morph="He,D"\w* \w ב⁠אדם|lemma="אָדָם" strong="b:H0121" x-morph="He,Rd:Np"\w* -\f + \ft Q \w מֵֽאָדָ֤ם|lemma="אָדָם" strong="m:H0121" x-morph="He,Rd:Np"\w*\f* +\f + \ft Q \+w מֵֽאָדָ֤ם|lemma="אָדָם" strong="m:H0121" x-morph="He,Rd:Np"\+w*\f* \w הָ⁠עִיר֙|lemma="עִיר" strong="d:H5892b" x-morph="He,Td:Ncfsa" x-tw="rc://*/tw/dict/bible/other/elder"\w* \w אֲשֶׁר֙|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w מִ⁠צַּ֣ד|lemma="צַד" strong="m:H6654" x-morph="He,R:Ncmsc"\w* @@ -1288,7 +1288,7 @@ \v 18 \w וַ֠⁠יְהִי|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqw3ms"\w* \w ב⁠עלות|lemma="עָלָה" strong="b:H5927" x-morph="He,R:Vqc"\w* -\f + \ft Q \w כַּעֲל֨וֹת|lemma="עָלָה" strong="k:H5927" x-morph="He,R:Vqc"\w*\f* +\f + \ft Q \+w כַּעֲל֨וֹת|lemma="עָלָה" strong="k:H5927" x-morph="He,R:Vqc"\+w*\f* \w הַ⁠כֹּהֲנִ֜ים|lemma="כֹּהֵן" strong="d:H3548" x-morph="He,Td:Ncmpa" x-tw="rc://*/tw/dict/bible/kt/priest"\w* \w נֹשְׂאֵ֨י|lemma="נָשָׂא" strong="H5375" x-morph="He,Vqrmpc"\w* \k-s | x-tw="rc://*/tw/dict/bible/kt/arkofthecovenant"\*\w אֲר֤וֹן|lemma="אָרוֹן" strong="H0727" x-morph="He,Ncbsc"\w* @@ -1418,7 +1418,7 @@ \w מִ⁠פְּנֵ֥י|lemma="פָּנִים" strong="m:H6440" x-morph="He,R:Ncbpc"\w* \w בְנֵֽי|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w יִשְׂרָאֵ֖ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w עַד|lemma="עַד" strong="H5704" x-morph="He,R"\w*־\w עָבְרָ֑ם|lemma="עָבַר" strong="H5674a" x-morph="He,Vqc:Sp3mp"\w* -\f + \ft K \w עבר⁠נו|lemma="עָבַר" strong="H5674a" x-morph="He,Vqc:Sp1cp"\w*\f* +\f + \ft K \+w עבר⁠נו|lemma="עָבַר" strong="H5674a" x-morph="He,Vqc:Sp1cp"\+w*\f* \w וַ⁠יִּמַּ֣ס|lemma="מָסַס" strong="c:H4549" x-morph="He,C:VNw3ms"\w* \w לְבָבָ֗⁠ם|lemma="לֵבָב" strong="H3824" x-morph="He,Ncmsc:Sp3mp" x-tw="rc://*/tw/dict/bible/kt/heart"\w* \w וְ⁠לֹא|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w*־\w הָ֨יָה|lemma="הָיָה" strong="H1961" x-morph="He,Vqp3ms"\w* @@ -1738,7 +1738,7 @@ \w בְּ⁠קֶ֣רֶן|lemma="קֶרֶן" strong="b:H7161a" x-morph="He,R:Ncbsc"\w* \w הַ⁠יּוֹבֵ֗ל|lemma="יוֹבֵל" strong="d:H3104" x-morph="He,Td:Ncmsa"\w* \w כְּשָׁמְעֲכֶם֙|lemma="שָׁמַע" strong="k:H8085" x-morph="He,R:Vqc:Sp2mp"\w* -\f + \ft K \w ב⁠שמע⁠כם|lemma="שָׁמַע" strong="b:H8085" x-morph="He,R:Vqc:Sp2mp"\w*\f* +\f + \ft K \+w ב⁠שמע⁠כם|lemma="שָׁמַע" strong="b:H8085" x-morph="He,R:Vqc:Sp2mp"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w ק֣וֹל|lemma="קוֹל" strong="H6963a" x-morph="He,Ncmsc"\w* \w הַ⁠שּׁוֹפָ֔ר|lemma="שׁוֹפָר" strong="d:H7782" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/trumpet"\w* \w יָרִ֥יעוּ|lemma="רוּעַ" strong="H7321" x-morph="He,Vhi3mp"\w* @@ -1777,7 +1777,7 @@ \v 7 \w וַיֹּ֙אמֶר֙|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* -\f + \ft K \w ו⁠יאמרו|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3mp"\w*\f* +\f + \ft K \+w ו⁠יאמרו|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3mp"\+w*\f* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w הָ⁠עָ֔ם|lemma="עַם" strong="d:H5971a" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* \w עִבְר֖וּ|lemma="עָבַר" strong="H5674a" x-morph="He,Vqv2mp"\w* \w וְ⁠סֹ֣בּוּ|lemma="סָבַב" strong="c:H5437" x-morph="He,C:Vqv2mp"\w* @@ -1817,7 +1817,7 @@ \w לִ⁠פְנֵי֙|lemma="פָּנִים" strong="l:H6440" x-morph="He,R:Ncbpc"\w* \w הַ⁠כֹּ֣הֲנִ֔ים|lemma="כֹּהֵן" strong="d:H3548" x-morph="He,Td:Ncmpa" x-tw="rc://*/tw/dict/bible/kt/priest"\w* \w תֹּקְעֵ֖י|lemma="תָּקַע" strong="H8628" x-morph="He,Vqrmpc"\w* -\f + \ft K \w תקעו|lemma="תָּקַע" strong="H8628" x-morph="He,Vqp3cp"\w*\f* +\f + \ft K \+w תקעו|lemma="תָּקַע" strong="H8628" x-morph="He,Vqp3cp"\+w*\f* \w הַ⁠שּֽׁוֹפָר֑וֹת|lemma="שׁוֹפָר" strong="d:H7782" x-morph="He,Td:Ncmpa" x-tw="rc://*/tw/dict/bible/other/trumpet"\w* \w וְ⁠הַֽ⁠מְאַסֵּ֗ף|lemma="אָסַף" strong="c:d:H0622" x-morph="He,C:Td:Vprmsa"\w* \w הֹלֵךְ֙|lemma="הָלַךְ" strong="H1980" x-morph="He,Vqrmsa" x-tw="rc://*/tw/dict/bible/other/walk"\w* @@ -1890,7 +1890,7 @@ \w אֲר֣וֹן|lemma="אָרוֹן" strong="H0727" x-morph="He,Ncbsc" x-tw="rc://*/tw/dict/bible/kt/arkofthecovenant"\w* \w יְהוָ֔ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w הָל֖וֹךְ|lemma="הָלַךְ" strong="H1980" x-morph="He,Vqa" x-tw="rc://*/tw/dict/bible/other/walk"\w* -\f + \ft K \w הולך|lemma="הָלַךְ" strong="H1980" x-morph="He,Vqrmsa"\w*\f* +\f + \ft K \+w הולך|lemma="הָלַךְ" strong="H1980" x-morph="He,Vqrmsa"\+w*\f* \w וְ⁠תָק֥וֹעַ|lemma="תָּקַע" strong="c:H8628" x-morph="He,C:Vqa"\w* \w בַּ⁠שּׁוֹפָרֽוֹת|lemma="שׁוֹפָר" strong="b:H7782" x-morph="He,Rd:Ncmpa" x-tw="rc://*/tw/dict/bible/other/trumpet"\w*׃ @@ -2495,7 +2495,7 @@ \v 21 \w וָאֵ֣רֶא|lemma="רָאָה" strong="c:H7200" x-morph="He,C:Vqw1cs"\w* -\f + \ft K \w ו⁠אראה|lemma="רָאָה" strong="c:H7200" x-morph="He,C:Vqw1cs"\w*\f* +\f + \ft K \+w ו⁠אראה|lemma="רָאָה" strong="c:H7200" x-morph="He,C:Vqw1cs"\+w*\f* \w בַ⁠שָּׁלָ֡ל|lemma="שָׁלָל" strong="b:H7998" x-morph="He,Rd:Ncmsa"\w* \w אַדֶּ֣רֶת|lemma="אַדֶּרֶת" strong="H0155" x-morph="He,Ncfsc"\w* \w שִׁנְעָר֩|lemma="שִׁנְעָר" strong="H8152" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/shinar"\w* @@ -2793,7 +2793,7 @@ \w לָ⁠עַ֔י|lemma="עַי" strong="l:H5857" x-morph="He,R:Np" x-tw="rc://*/tw/dict/bible/names/ai"\w* \w וְ⁠הַ⁠גַּ֖י|lemma="גַּיְא" strong="c:d:H1516" x-morph="He,C:Td:Ncbsa"\w* \w בינ⁠ו|lemma="בֵּין" strong="H0996" x-morph="He,R:Sp3ms"\w* -\f + \ft Q \w בֵּינָ֥יוlemma="בֵּין" strong="H0996" x-morph="He,R:Sp3ms"\w*\f* +\f + \ft Q \+w בֵּינָ֥יוlemma="בֵּין" strong="H0996" x-morph="He,R:Sp3ms"\+w*\f* \w וּ⁠בֵין|lemma="בֵּין" strong="c:H0996" x-morph="He,C:R"\w*־\w הָ⁠עָֽי|lemma="עַי" strong="d:H5857" x-morph="He,Td:Np" x-tw="rc://*/tw/dict/bible/names/ai"\w*׃ \v 12 @@ -2865,7 +2865,7 @@ \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w הָ⁠עָם֙|lemma="עַם" strong="d:H5971a" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* \w אֲשֶׁ֣ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w ב⁠עיר|lemma="עִיר" strong="b:H5892b" x-morph="He,Rd:Ncfsa"\w* -\f + \ft Q \w בָּעַ֔י|lemma="עַי" strong="b:H5857" x-morph="He,Rd:Np" x-tw="rc://*/tw/dict/bible/names/ai"\w*\f* +\f + \ft Q \+w בָּעַ֔י|lemma="עַי" strong="b:H5857" x-morph="He,Rd:Np" x-tw="rc://*/tw/dict/bible/names/ai"\+w*\f* \w לִ⁠רְדֹּ֖ף|lemma="רָדַף" strong="l:H7291" x-morph="He,R:Vqc"\w* \w אַחֲרֵי⁠הֶ֑ם|lemma="אַחַר" strong="H0310a" x-morph="He,R:Sp3mp"\w* \w וַֽ⁠יִּרְדְּפוּ֙|lemma="רָדַף" strong="c:H7291" x-morph="He,C:Vqw3mp" x-tw="rc://*/tw/dict/bible/names/gibeon"\w* @@ -3304,7 +3304,7 @@ \v 7 \w ו⁠יאמרו|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3mp"\w* -\f + \ft Q \w וַיֹּ֥אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w*\f* +\f + \ft Q \+w וַיֹּ֥אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\+w*\f* \w אִֽישׁ|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsc"\w*־\w יִשְׂרָאֵ֖ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w הַ⁠חִוִּ֑י|lemma="חִוִּי" strong="d:H2340" x-morph="He,Td:Ngmsa" x-tw="rc://*/tw/dict/bible/names/hivite"\w* \w אוּלַ֗י|lemma="אוּלַי" strong="H0194" x-morph="He,D"\w* @@ -3313,7 +3313,7 @@ \w יוֹשֵׁ֔ב|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqrmsa"\w* \w וְ⁠אֵ֖יךְ|lemma="אֵיךְ" strong="c:H0349a" x-morph="He,C:Ti"\w* \w אֶֽכְרָת|lemma="כָּרַת" strong="H3772" x-morph="He,Vqi1cs"\w*־\w לְ⁠ךָ֥|lemma="כָּרַת" strong="l:H3772" x-morph="He,R:Sp2ms"\w* -\f + \ft K \w אכרות|lemma="כָּרַת" strong="H3772" x-morph="He,Vqi1cs"\w*\f* +\f + \ft K \+w אכרות|lemma="כָּרַת" strong="H3772" x-morph="He,Vqi1cs"\+w*\f* \w בְרִֽית|lemma="בְּרִית" strong="H1285" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/kt/covenant"\w*׃ \v 8 @@ -5754,7 +5754,7 @@ \w נַ֣חַל|lemma="נַחַל" strong="H5158a" x-morph="He,Ncmsc"\w* \w מִצְרַ֔יִם|lemma="מִצְרַיִם" strong="H4714" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/egypt"\w* \w וְהָי֛וּ|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3cp"\w* -\f + \ft K \w ו⁠היה|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqp3ms"\w*\f* +\f + \ft K \+w ו⁠היה|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqp3ms"\+w*\f* \w תֹּצְא֥וֹת|lemma="תּוֹצָאָה" strong="H8444" x-morph="He,Ncfpc"\w* \w הַ⁠גְּב֖וּל|lemma="גְּבוּל" strong="d:H1366" x-morph="He,Td:Ncmsa"\w* \w יָ֑מָּ⁠ה|lemma="יָם" strong="H3220" x-morph="He,Ncmsa:Sd"\w* @@ -6193,7 +6193,7 @@ \k-s | x-tw="rc://*/tw/dict/bible/names/mediterranean"\*\w וְ⁠הַ⁠יָּ֥ם|lemma="יָם" strong="c:d:H3220" x-morph="He,C:Td:Ncmsa"\w* \w הַגָּד֖וֹל|lemma="גְּבוּל" strong="d:H1419a" x-morph="He,Td:Aamsa"\w* \k-e\* -\f + \ft K \w ה⁠גבול|lemma="גְּבוּל" strong="d:H1366" x-morph="He,Td:Ncmsa"\w*\f* +\f + \ft K \+w ה⁠גבול|lemma="גְּבוּל" strong="d:H1366" x-morph="He,Td:Ncmsa"\+w*\f* \w וּ⁠גְבֽוּל|lemma="גְּבוּל" strong="c:H1366" x-morph="He,C:Ncmsa"\w*׃ס \v 48 @@ -6228,7 +6228,7 @@ \v 53 \w ו⁠ינים|lemma="יָנִים" strong="c:H3241" x-morph="He,C:Np"\w* -\f + \ft Q \w וְיָנ֥וּם|lemma="יָנִים" strong="c:H3241" x-morph="He,C:Np"\w*\f* +\f + \ft Q \+w וְיָנ֥וּם|lemma="יָנִים" strong="c:H3241" x-morph="He,C:Np"\+w*\f* \w וּ⁠בֵית|lemma="בֵּית תַּפּוּחַ" strong="c:H1054" x-morph="He,C:Np"\w*־\w תַּפּ֖וּחַ|lemma="בֵּית תַּפּוּחַ" strong="H1054" x-morph="He,Np"\w* \w וַ⁠אֲפֵֽקָה|lemma="אֲפֵקָה" strong="c:H0664" x-morph="He,C:Np"\w*׃ @@ -6307,7 +6307,7 @@ \w יוֹשְׁבֵ֣י|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqrmpc"\w* \w יְרֽוּשָׁלִַ֔ם|lemma="יְרוּשָׁלִַ͏ם" strong="H3389" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jerusalem"\w* \w לֹֽא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w יָכְל֥וּ|lemma="יָכֹל" strong="H3201" x-morph="He,Vqp3mp"\w* -\f + \ft K \w יוכלו|lemma="יָכֹל" strong="H3201" x-morph="He,Vqi3mp"\w*\f* +\f + \ft K \+w יוכלו|lemma="יָכֹל" strong="H3201" x-morph="He,Vqi3mp"\+w*\f* \w בְנֵֽי|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w יְהוּדָ֖ה|lemma="יְהוּדָה" strong="H3063" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/judah"\w* \w לְ⁠הֽוֹרִישָׁ֑⁠ם|lemma="יָרַשׁ" strong="l:H3423" x-morph="He,R:Vhc:Sp3mp"\w* \w וַ⁠יֵּ֨שֶׁב|lemma="יָשַׁב" strong="c:H3427" x-morph="He,C:Vqw3ms"\w* @@ -6360,7 +6360,7 @@ \w וְ⁠עַד|lemma="עַד" strong="c:H5704" x-morph="He,C:R"\w*־\w גָּ֑זֶר|lemma="גֶּזֶר" strong="H1507" x-morph="He,Np"\w* \w וְ⁠הָי֥וּ|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3cp"\w* \w תצאת⁠ו|lemma="תּוֹצָאָה" strong="H8444" x-morph="He,Ncfpc:Sp3ms"\w* -\f + \ft Q \w תֹצְאֹתָ֖יו|lemma="תּוֹצָאָה" strong="H8444" x-morph="He,Ncfpc:Sp3ms"\w*\f* +\f + \ft Q \+w תֹצְאֹתָ֖יו|lemma="תּוֹצָאָה" strong="H8444" x-morph="He,Ncfpc:Sp3ms"\+w*\f* \w יָֽמָּ⁠ה|lemma="יָם" strong="H3220" x-morph="He,Ncmsa:Sd"\w*׃ \v 4 @@ -6987,7 +6987,7 @@ \w בָ⁠הָר֙|lemma="הַר" strong="b:H2022" x-morph="He,Rd:Ncmsa"\w* \w יָ֔מָּ⁠ה|lemma="יָם" strong="H3220" x-morph="He,Ncmsa:Sd"\w* \w וְהָיוּ֙|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3cp"\w* -\f + \ft K \w ו⁠היה|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3ms"\w*\f* +\f + \ft K \+w ו⁠היה|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3ms"\+w*\f* \w תֹּֽצְאֹתָ֔י⁠ו|lemma="תּוֹצָאָה" strong="H8444" x-morph="He,Ncfpc:Sp3ms"\w* \w מִדְבַּ֖רָ⁠ה|lemma="מִדְבָּר" strong="H4057b" x-morph="He,Ncmsc:Sd" x-tw="rc://*/tw/dict/bible/other/desert"\w* \w בֵּ֥ית|lemma="בֵּית אָוֶן" strong="H1007" x-morph="He,Np"\w* @@ -7026,7 +7026,7 @@ \w בֵית|lemma="בֵּית חוֹרוֹן" strong="H1032" x-morph="He,Np"\w*־\w חֹרוֹן֮|lemma="בֵּית חוֹרוֹן" strong="H1032" x-morph="He,Np"\w* \w נֶגְבָּ⁠ה֒|lemma="נֶגֶב" strong="H5045" x-morph="He,Ncmsa:Sd" x-tw="rc://*/tw/dict/bible/names/negev"\w* \w וְהָי֣וּ|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3cp"\w* -\f + \ft K \w ו⁠היה|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3ms"\w*\f* +\f + \ft K \+w ו⁠היה|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3ms"\+w*\f* \w תֹֽצְאֹתָ֗י⁠ו|lemma="תּוֹצָאָה" strong="H8444" x-morph="He,Ncfpc:Sp3ms"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w קִרְיַת|lemma="קִרְיַת בַּעַל" strong="H7154" x-morph="He,Np"\w*־\w בַּ֨עַל֙|lemma="קִרְיַת בַּעַל" strong="H7154" x-morph="He,Np"\w* \w הִ֚יא|lemma="הוּא" strong="H1931" x-morph="He,Pp3fs"\w* @@ -7105,9 +7105,9 @@ \w בֵּית|lemma="בֵּית חׇגְלָה" strong="H1031" x-morph="He,Np"\w*־\w חָגְלָה֮|lemma="בֵּית חׇגְלָה" strong="H1031" x-morph="He,Np"\w* \w צָפוֹנָ⁠ה֒|lemma="צָפוֹן" strong="H6828" x-morph="He,Ncfsa:Sd"\w* \w וְהָי֣וּ|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3cp"\w* ׀ -\f + \ft K \w ו⁠היה|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3ms"\w*\f* +\f + \ft K \+w ו⁠היה|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3ms"\+w*\f* \w תֹּצְא֣וֹת|lemma="תּוֹצָאָה" strong="H8444" x-morph="He,Ncfpc"\w* -\f + \ft K \w תצאותי⁠ו|lemma="תּוֹצָאָה" strong="H8444" x-morph="He,Ncfpc:Sp3ms"\w*\f* +\f + \ft K \+w תצאותי⁠ו|lemma="תּוֹצָאָה" strong="H8444" x-morph="He,Ncfpc:Sp3ms"\+w*\f* \w הַ⁠גְּב֗וּל|lemma="גְּבוּל" strong="d:H1366" x-morph="He,Td:Ncmsa"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w לְשׁ֤וֹן|lemma="לָשׁוֹן" strong="H3956" x-morph="He,Ncbsc" x-tw="rc://*/tw/dict/bible/other/tongue"\w* \k-s | x-tw="rc://*/tw/dict/bible/names/saltsea"\*\w יָם|lemma="יָם" strong="H3220" x-morph="He,Ncmsc"\w*־\w הַ⁠מֶּ֨לַח֙|lemma="מֶלַח" strong="d:H4417" x-morph="He,Td:Ncmsa"\w* @@ -7159,7 +7159,7 @@ \v 24 \w וּ⁠כְפַ֧ר|lemma="כְּפַר הָעַמּוֹנִי" strong="c:H3726" x-morph="He,C:Np"\w* \w העמני|lemma="כְּפַר הָעַמּוֹנִי" strong="H3726" x-morph="He,Np"\w* -\f + \ft Q \w הָֽעַמֹּנָ֛ה|lemma="כְּפַר הָֽעַמֹּנָה" strong="H3726" x-morph="He,Np"\w*\f* +\f + \ft Q \+w הָֽעַמֹּנָ֛ה|lemma="כְּפַר הָֽעַמֹּנָה" strong="H3726" x-morph="He,Np"\+w*\f* \w וְ⁠הָֽ⁠עָפְנִ֖י|lemma="עׇפְנִי" strong="c:d:H6078" x-morph="He,C:Td:Np"\w* \w וָ⁠גָ֑בַע|lemma="גֶּבַע" strong="c:H1387" x-morph="He,C:Np"\w* \w עָרִ֥ים|lemma="עִיר" strong="H5892b" x-morph="He,Ncfpa"\w* @@ -7414,7 +7414,7 @@ \w הַ⁠גְּב֨וּל|lemma="גְּבוּל" strong="d:H1366" x-morph="He,Td:Ncmsa"\w* \w בְּ⁠תָב֤וֹר|lemma="תָּבוֹר" strong="b:H8396" x-morph="He,R:Np"\w* \w ו⁠שחצומ⁠ה|lemma="שַׁחֲצוֹם" strong="c:H7831" x-morph="He,C:Np:Sd"\w* -\f + \ft Q \w וְשַׁחֲצִ֙ימָה֙|lemma="שַׁחֲצוֹם" strong="c:H7831" x-morph="He,C:Np:Sd"\w*\f* +\f + \ft Q \+w וְשַׁחֲצִ֙ימָה֙|lemma="שַׁחֲצוֹם" strong="c:H7831" x-morph="He,C:Np:Sd"\+w*\f* \w וּ⁠בֵ֣ית|lemma="בֵּית שֶׁמֶשׁ" strong="c:H1053" x-morph="He,C:Np"\w* \w שֶׁ֔מֶשׁ|lemma="בֵּית שֶׁמֶשׁ" strong="H1053" x-morph="He,Np"\w* \w וְ⁠הָי֛וּ|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqp3cp"\w* @@ -7497,7 +7497,7 @@ \w הַ⁠גְּבוּל֙|lemma="גְּבוּל" strong="d:H1366" x-morph="He,Td:Ncmsa"\w* \w חֹסָ֔ה|lemma="חֹסָה" strong="H2621" x-morph="He,Np"\w* \w וְהָי֧וּ|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3cp"\w* -\f + \ft K \w ו⁠יהיו|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqw3mp"\w*\f* +\f + \ft K \+w ו⁠יהיו|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqw3mp"\+w*\f* \w תֹצְאֹתָ֛י⁠ו|lemma="תּוֹצָאָה" strong="H8444" x-morph="He,Ncfpc:Sp3ms"\w* \w הַ⁠יָּ֖מָּ⁠ה|lemma="יָם" strong="d:H3220" x-morph="He,Td:Ncmsa:Sd"\w* \w מֵ⁠חֶ֥בֶל|lemma="חֶבֶל" strong="m:H2256a" x-morph="He,R:Ncbsa"\w* @@ -7871,7 +7871,7 @@ \w בַּ⁠גִּלְעָד֙|lemma="גִּלְעָד" strong="b:H1568" x-morph="He,Rd:Np"\w* \w מִ⁠מַּטֵּה|lemma="מַטֶּה" strong="m:H4294" x-morph="He,R:Ncmsc" x-tw="rc://*/tw/dict/bible/other/tribe"\w*־\w גָ֔ד|lemma="גָּד" strong="H1410" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/gad"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w גּוֹלָ֥ן|lemma="גּוֹלָן" strong="H1474" x-morph="He,Np"\w* -\f + \ft K \w גלון|lemma="גּוֹלָן" strong="H1474" x-morph="He,Np"\w*\f* +\f + \ft K \+w גלון|lemma="גּוֹלָן" strong="H1474" x-morph="He,Np"\+w*\f* \w בַּ⁠בָּשָׁ֖ן|lemma="בָּשָׁן" strong="b:H1316" x-morph="He,Rd:Np" x-tw="rc://*/tw/dict/bible/names/bashan"\w* \w מִ⁠מַּטֵּ֥ה|lemma="מַטֶּה" strong="m:H4294" x-morph="He,R:Ncmsc" x-tw="rc://*/tw/dict/bible/other/tribe"\w* \w מְנַשֶּֽׁה|lemma="מְנַשֶּׁה" strong="H4519" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/manasseh"\w*׃ @@ -8220,7 +8220,7 @@ \w מִקְלַ֣ט|lemma="מִקְלָט" strong="H4733" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/refuge"\w* \w הָ⁠רֹצֵ֔חַ|lemma="רָצַח" strong="d:H7523" x-morph="He,Td:Vqrmsa"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w גּוֹלָ֤ן|lemma="גּוֹלָן" strong="H1474" x-morph="He,Np"\w* -\f + \ft K \w גלון|lemma="גּוֹלָן" strong="H1474" x-morph="He,Np"\w*\f* +\f + \ft K \+w גלון|lemma="גּוֹלָן" strong="H1474" x-morph="He,Np"\+w*\f* \w בַּ⁠בָּשָׁן֙|lemma="בָּשָׁן" strong="b:H1316" x-morph="He,Rd:Np" x-tw="rc://*/tw/dict/bible/names/bashan"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w מִגְרָשֶׁ֔⁠הָ|lemma="מִגְרָשׁ" strong="H4054" x-morph="He,Ncmpc:Sp3fs"\w* \w וְ⁠אֶֽת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w בְּעֶשְׁתְּרָ֖ה|lemma="בְּעֶשְׁתְּרָה" strong="H1203" x-morph="He,Np"\w* @@ -8538,7 +8538,7 @@ \w יְהוֹשֻׁ֨עַ֙|lemma="יְהוֹשׁוּעַ" strong="H3091" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/joshua"\w* \w עִם|lemma="עִם" strong="H5973a" x-morph="He,R"\w*־\w אֲחֵי⁠הֶ֔ם|lemma="אָח" strong="H0251" x-morph="He,Ncmpc:Sp3mp" x-tw="rc://*/tw/dict/bible/kt/brother"\w* \w בְּעֵ֥בֶר|lemma="עֵבֶר" strong="b:H5676" x-morph="He,R:Ncmsc"\w* -\f + \ft K \w מ⁠עבר|lemma="עֵבֶר" strong="m:H5676" x-morph="He,R:Ncmsc"\w*\f* +\f + \ft K \+w מ⁠עבר|lemma="עֵבֶר" strong="m:H5676" x-morph="He,R:Ncmsc"\+w*\f* \w הַ⁠יַּרְדֵּ֖ן|lemma="יַרְדֵּן" strong="d:H3383" x-morph="He,Td:Np" x-tw="rc://*/tw/dict/bible/names/jordanriver"\w* \w יָ֑מָּ⁠ה|lemma="יָם" strong="H3220" x-morph="He,Ncmsa:Sd"\w* \w וְ֠⁠גַם|lemma="גַּם" strong="c:H1571" x-morph="He,C:Ta"\w* @@ -9417,7 +9417,7 @@ \w בְּ⁠כָל|lemma="כֹּל" strong="b:H3605" x-morph="He,R:Ncmsc"\w*־\w אֶ֣רֶץ|lemma="אֶרֶץ" strong="H0776" x-morph="He,Ncbsc"\w* \w כְּנָ֑עַן|lemma="כְּנַעַן" strong="H3667a" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/canaan"\w* \w וָאַרְבֶּה֙|lemma="רָבָה" strong="c:H7235a" x-morph="He,C:Vhw1cs"\w* -\f + \ft Q \w ו⁠ארב|lemma="רָבָה" strong="c:H7235a" x-morph="He,C:Vhw1cs"\w*\f* +\f + \ft Q \+w ו⁠ארב|lemma="רָבָה" strong="c:H7235a" x-morph="He,C:Vhw1cs"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w זַרְע֔⁠וֹ|lemma="זֶרַע" strong="H2233" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/seed"\w* \w וָֽ⁠אֶתֶּן|lemma="נָתַן" strong="c:H5414" x-morph="He,C:Vqw1cs"\w*־\w ל֖⁠וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w יִצְחָֽק|lemma="יִצְחָק" strong="H3327" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/isaac"\w*׃ @@ -9490,7 +9490,7 @@ \v 8 \w וָאָבִ֣יא|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vhw1cs"\w* -\f + \ft K \w ו⁠אבא⁠ה|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vhw1cs:Sh"\w*\f* +\f + \ft K \+w ו⁠אבא⁠ה|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vhw1cs:Sh"\+w*\f* \w אֶתְ⁠כֶ֗ם|lemma="אֵת" strong="H0853" x-morph="He,To:Sp2mp"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w אֶ֤רֶץ|lemma="אֶרֶץ" strong="H0776" x-morph="He,Ncbsc"\w* \w הָ⁠אֱמֹרִי֙|lemma="אֱמֹרִי" strong="d:H0567" x-morph="He,Td:Ngmsa" x-tw="rc://*/tw/dict/bible/names/amorite"\w* @@ -9623,7 +9623,7 @@ \w אֲבוֹתֵי⁠כֶ֗ם|lemma="אָב" strong="H0001" x-morph="He,Ncmpc:Sp2mp" x-tw="rc://*/tw/dict/bible/other/father"\w* \w אֲשֶׁר֙|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w ב⁠עבר|lemma="עֵבֶר" strong="b:H5676" x-morph="He,R:Ncmsc"\w* -\f + \ft Q \w מֵעֵ֣בֶר|lemma="עֵבֶר" strong="m:H5676" x-morph="He,R:Ncmsc"\w*\f* +\f + \ft Q \+w מֵעֵ֣בֶר|lemma="עֵבֶר" strong="m:H5676" x-morph="He,R:Ncmsc"\+w*\f* \w הַ⁠נָּהָ֔ר|lemma="נָהָר" strong="d:H5104" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/names/euphrates"\w* \w וְ⁠אִם֙|lemma="אִם" strong="c:H0518a" x-morph="He,C:C"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w אֱלֹהֵ֣י|lemma="אֱלֹהִים" strong="H0430" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/falsegod"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/07-JDG.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/07-JDG.usfm index cd59fbf2..015832af 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/07-JDG.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/07-JDG.usfm @@ -381,7 +381,7 @@ \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w תַּעְנַ֣ךְ|lemma="תַּעֲנָךְ" strong="H8590" x-morph="He,Np"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w בְּנֹתֶי⁠הָ֒|lemma="בַּת" strong="H1323" x-morph="He,Ncfpc:Sp3fs"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w יֹשְׁבֵ֨י|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqrmpc"\w* -\f + \ft K \w ישב|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqrmsc"\w*\f* +\f + \ft K \+w ישב|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqrmsc"\+w*\f* \w ד֜וֹר|lemma="דּוֹר" strong="H1756" x-morph="He,Np"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w בְּנוֹתֶ֗י⁠הָ|lemma="בַּת" strong="H1323" x-morph="He,Ncfpc:Sp3fs"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w יוֹשְׁבֵ֤י|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqrmpc"\w* @@ -1511,7 +1511,7 @@ \w אָהֳל֔⁠וֹ|lemma="אֹהֶל" strong="H0168" x-morph="He,Ncmsc:Sp3ms"\w* \w עַד|lemma="עַד" strong="H5704" x-morph="He,R"\w*־\w אֵל֥וֹן|lemma="אֵלוֹן" strong="H0436" x-morph="He,Ncmsa"\w* \w בְּצַעֲנַנִּ֖ים|lemma="צַעֲנַנִּים" strong="b:H6815" x-morph="He,R:Np"\w* -\f + \ft K \w ב⁠צענים|lemma="צַעֲנַנִּים" strong="b:H6815" x-morph="He,R:Np"\w*\f* +\f + \ft K \+w ב⁠צענים|lemma="צַעֲנַנִּים" strong="b:H6815" x-morph="He,R:Np"\+w*\f* \w אֲשֶׁ֥ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w אֶת|lemma="אֵת" strong="H0854" x-morph="He,R"\w*־\w קֶֽדֶשׁ|lemma="קֶדֶשׁ" strong="H6943" x-morph="He,Np"\w*׃ @@ -2211,7 +2211,7 @@ \w יַעֲל֜וּ|lemma="עָלָה" strong="H5927" x-morph="He,Vqi3mp"\w* \w וְ⁠אָהֳלֵי⁠הֶ֗ם|lemma="אֹהֶל" strong="c:H0168" x-morph="He,C:Ncmpc:Sp3mp"\w* \w וּבָ֤אוּ|lemma="בּוֹא" strong="H0935" x-morph="He,Vqq3cp"\w* -\f + \ft K \w יבאו|lemma="בּוֹא" strong="H0935" x-morph="He,Vqi3mp"\w*\f* +\f + \ft K \+w יבאו|lemma="בּוֹא" strong="H0935" x-morph="He,Vqi3mp"\+w*\f* \w כְ⁠דֵֽי|lemma="דַּי" strong="k:H1767" x-morph="He,R:Ncmsc"\w*־\w אַרְבֶּה֙|lemma="אַרְבֶּה" strong="H0697" x-morph="He,Ncmsa"\w* \w לָ⁠רֹ֔ב|lemma="רֹב" strong="l:H7230" x-morph="He,R:Ncbsa"\w* \w וְ⁠לָ⁠הֶ֥ם|lemma="" strong="c:l" x-morph="He,C:R:Sp3mp"\w* @@ -3051,7 +3051,7 @@ \w חָלַ֗מְתִּי|lemma="חָלַם" strong="H2492b" x-morph="He,Vqp1cs" x-tw="rc://*/tw/dict/bible/other/dream"\w* \w וְ⁠הִנֵּ֨ה|lemma="הִנֵּה" strong="c:H2009" x-morph="He,C:Tm"\w* \w צלול|lemma="צְלוּל" strong="H6742" x-morph="He,Ncmsc"\w* -\f + \ft Q \w צְלִ֜יל|lemma="צְלוּל" strong="H6742" x-morph="He,Ncmsc"\w*\f* +\f + \ft Q \+w צְלִ֜יל|lemma="צְלוּל" strong="H6742" x-morph="He,Ncmsc"\+w*\f* \w לֶ֤חֶם|lemma="לֶחֶם" strong="H3899" x-morph="He,Ncbsc" x-tw="rc://*/tw/dict/bible/other/bread"\w* \w שְׂעֹרִים֙|lemma="שְׂעֹרָה" strong="H8184" x-morph="He,Ncfpa" x-tw="rc://*/tw/dict/bible/other/barley"\w* \w מִתְהַפֵּךְ֙|lemma="הָפַךְ" strong="H2015" x-morph="He,Vtrmsa"\w* @@ -3199,7 +3199,7 @@ \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w הַֽ⁠מַּחֲנֶ֛ה|lemma="מַחֲנֶה" strong="d:H4264" x-morph="He,Td:Ncbsa"\w* \w וַ⁠יָּרִ֖יעוּ|lemma="רוּעַ" strong="c:H7321" x-morph="He,C:Vhw3mp" x-tw="rc://*/tw/dict/bible/other/alarm"\w* \w וַיָּנֽוּסוּ|lemma="נוּס" strong="c:H5127" x-morph="He,C:Vqw3mp"\w*׃ -\f + \ft K \w ו⁠יניסו|lemma="נוּס" strong="c:H5127" x-morph="He,C:Vhw3mp"\w*\f* +\f + \ft K \+w ו⁠יניסו|lemma="נוּס" strong="c:H5127" x-morph="He,C:Vhw3mp"\+w*\f* \v 22 \w וַֽ⁠יִּתְקְעוּ֮|lemma="תָּקַע" strong="c:H8628" x-morph="He,C:Vqw3mp"\w* @@ -3948,7 +3948,7 @@ \w וַ⁠יֹּאמְר֥וּ|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3mp"\w* \w לַ⁠זַּ֖יִת|lemma="זַיִת" strong="l:H2132" x-morph="He,Rd:Ncmsa"\w* \w מָלְכָ֥ה|lemma="מָלַךְ" strong="H4427a" x-morph="He,Vqv2ms:Sh"\w* -\f + \ft K \w מלוכ⁠ה|lemma="מָלַךְ" strong="H4427a" x-morph="He,Vqv2ms:Sh"\w*\f* +\f + \ft K \+w מלוכ⁠ה|lemma="מָלַךְ" strong="H4427a" x-morph="He,Vqv2ms:Sh"\+w*\f* \w עָלֵֽי⁠נוּ|lemma="עַל" strong="H5921a" x-morph="He,R:Sp1cp"\w*׃ \v 9 @@ -3991,7 +3991,7 @@ \w לַ⁠גָּ֑פֶן|lemma="גֶּפֶן" strong="l:H1612" x-morph="He,Rd:Ncbsa"\w* \w לְכִי|lemma="יָלַךְ" strong="H3212" x-morph="He,Vqv2fs" x-tw="rc://*/tw/dict/bible/other/walk"\w*־\w אַ֖תְּ|lemma="אַתָּה" strong="H0859c" x-morph="He,Pp2fs"\w* \w מָלְכִ֥י|lemma="מָלַךְ" strong="H4427a" x-morph="He,Vqv2fs"\w* -\f + \ft K \w מלוכי|lemma="מָלַךְ" strong="H4427a" x-morph="He,Vqv2fs"\w*\f* +\f + \ft K \+w מלוכי|lemma="מָלַךְ" strong="H4427a" x-morph="He,Vqv2fs"\+w*\f* \w עָלֵֽי⁠נוּ|lemma="עַל" strong="H5921a" x-morph="He,R:Sp1cp"\w*׃ \v 13 @@ -5514,7 +5514,7 @@ \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w בְּתוּלַ֔⁠י|lemma="בְּתוּלִים" strong="H1331" x-morph="He,Ncbpc:Sp1cs"\w* \w אָנֹכִ֖י|lemma="אָנֹכִי" strong="H0595" x-morph="He,Pp1cs" x-tw="rc://*/tw/dict/bible/kt/pray"\w* \w וְרֵעוֹתָֽי|lemma="רֵעַ" strong="c:H7453" x-morph="He,C:Ncbpc:Sp1cs"\w*׃ -\f + \ft K \w ו⁠רעית⁠י|lemma="רֵעַ" strong="c:H7453" x-morph="He,C:Ncbpc:Sp1cs"\w*\f* +\f + \ft K \+w ו⁠רעית⁠י|lemma="רֵעַ" strong="c:H7453" x-morph="He,C:Ncbpc:Sp1cs"\+w*\f* \v 38 \w וַ⁠יֹּ֣אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* @@ -6058,7 +6058,7 @@ \w שְׁמֶ֑⁠ךָ|lemma="שֵׁם" strong="H8034" x-morph="He,Ncmsc:Sp2ms" x-tw="rc://*/tw/dict/bible/kt/name"\w* \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w יָבֹ֥א|lemma="בּוֹא" strong="H0935" x-morph="He,Vqi3ms"\w* \w דְבָרְךָ֖|lemma="דָּבָר" strong="H1697" x-morph="He,Ncmsc:Pp2ms"\w* -\f + \ft K \w דברי⁠ך|lemma="דָּבָר" strong="H1697" x-morph="He,Ncmpc:Pp2ms"\w*\f* +\f + \ft K \+w דברי⁠ך|lemma="דָּבָר" strong="H1697" x-morph="He,Ncmpc:Pp2ms"\+w*\f* \w וְ⁠כִבַּדְנֽוּ⁠ךָ|lemma="כָּבַד" strong="c:H3513" x-morph="He,C:Vpp1cp:Sp2ms"\w*׃ \v 18 @@ -7157,7 +7157,7 @@ \w הַ⁠פַּ֔עַם|lemma="פַּעַם" strong="d:H6471" x-morph="He,Td:Ncfsa"\w* \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w הִגִּ֥יד|lemma="נָגַד" strong="H5046" x-morph="He,Vhp3ms"\w* \w לִ֖י|lemma="" strong="l" x-morph="He,R:Sp1cs"\w* -\f + \ft K \w ל⁠ה|lemma="" strong="l" x-morph="He,R:Sp3fs"\w*\f* +\f + \ft K \+w ל⁠ה|lemma="" strong="l" x-morph="He,R:Sp3fs"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w לִבּ֑⁠וֹ|lemma="לֵב" strong="H3820a" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/heart"\w* \w וְ⁠עָל֤וּ|lemma="עָלָה" strong="c:H5927" x-morph="He,C:Vqp3cp"\w* \w אֵלֶ֨י⁠הָ֙|lemma="אֵל" strong="H0413" x-morph="He,R:Sp3fs"\w* @@ -7216,7 +7216,7 @@ \w טוֹחֵ֖ן|lemma="טָחַן" strong="H2912" x-morph="He,Vqrmsa"\w* \w בְּ⁠בֵ֥ית|lemma="בַּיִת" strong="b:H1004b" x-morph="He,R:Ncmsc" x-tw="rc://*/tw/dict/bible/kt/temple"\w* \w ה⁠אסירים|lemma="אָסִיר" strong="d:H0615" x-morph="He,Td:Ncmpa"\w*׃ -\f + \ft Q \w הָאֲסוּרִֽים|lemma="אָסִיר" strong="d:H0631" x-morph="He,Td:Vqsmpa"\w*\f* +\f + \ft Q \+w הָאֲסוּרִֽים|lemma="אָסִיר" strong="d:H0631" x-morph="He,Td:Vqsmpa"\+w*\f* \v 22 \w וַ⁠יָּ֧חֶל|lemma="חָלַל" strong="c:H2490c" x-morph="He,C:Vhw3ms" x-tw="rc://*/tw/dict/bible/other/profane"\w* @@ -7274,7 +7274,7 @@ \w לְ⁠שִׁמְשׁ֜וֹן|lemma="שִׁמְשׁוֹן" strong="l:H8123" x-morph="He,R:Np"\w* \w מִ⁠בֵּ֣ית|lemma="בַּיִת" strong="m:H1004b" x-morph="He,R:Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w* \w ה⁠אסירים|lemma="אָסִיר" strong="d:H0615" x-morph="He,Td:Ncmpa"\w* -\f + \ft Q \w הָאֲסוּרִ֗ים|lemma="אָסִיר" strong="d:H0631" x-morph="He,Td:Vqsmpa"\w*\f* +\f + \ft Q \+w הָאֲסוּרִ֗ים|lemma="אָסִיר" strong="d:H0631" x-morph="He,Td:Vqsmpa"\+w*\f* \w וַ⁠יְצַחֵק֙|lemma="צָחַק" strong="c:H6711" x-morph="He,C:Vpw3ms"\w* \w לִ⁠פְנֵי⁠הֶ֔ם|lemma="פָּנִים" strong="l:H6440" x-morph="He,R:Ncbpc:Sp3mp"\w* \w וַ⁠יַּעֲמִ֥ידוּ|lemma="עָמַד" strong="c:H5975" x-morph="He,C:Vhw3mp"\w* @@ -7291,7 +7291,7 @@ \w הַנִּ֣יחָ⁠ה|lemma="יָנַח" strong="H3240" x-morph="He,Vhv2ms:Sh"\w* \w אוֹתִ⁠י֒|lemma="אֵת" strong="H0853" x-morph="He,To:Sp1cs"\w* \w וַהֲמִשֵׁ֙נִי֙|lemma="משׁשׁ" strong="c:H4959" x-morph="He,C:Vhv2ms:Sp1cs"\w* -\f + \ft K \w ו⁠הימש⁠ני|lemma="משׁשׁ" strong="c:H4959" x-morph="He,C:Vhv2ms:Sp1cs"\w*\f* +\f + \ft K \+w ו⁠הימש⁠ני|lemma="משׁשׁ" strong="c:H4959" x-morph="He,C:Vhv2ms:Sp1cs"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הָֽ⁠עַמֻּדִ֔ים|lemma="עַמּוּד" strong="d:H5982" x-morph="He,Td:Ncmpa"\w* \w אֲשֶׁ֥ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w הַ⁠בַּ֖יִת|lemma="בַּיִת" strong="d:H1004b" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/house"\w* @@ -7420,7 +7420,7 @@ \w אֲשֶׁ֣ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w לֻֽקַּֽח|lemma="לָקַח" strong="H3947" x-morph="He,VPp3ms"\w*־\w לָ֗⁠ךְ|lemma="" strong="l" x-morph="He,R:Sp2fs"\w* \w וְאַ֤תְּ|lemma="אַתָּה" strong="c:H0859c" x-morph="He,C:Pp2fs"\w* -\f + \ft K \w ו⁠אתי|lemma="אַתָּה" strong="c:H0859b" x-morph="He,C:Pp2fs"\w*\f* +\f + \ft K \+w ו⁠אתי|lemma="אַתָּה" strong="c:H0859b" x-morph="He,C:Pp2fs"\+w*\f* \w אָלִית֙|lemma="אָלָה" strong="H0422" x-morph="He,Vqp2fs"\w* \w וְ⁠גַם֙|lemma="גַּם" strong="c:H1571" x-morph="He,C:Ta"\w* \w אָמַ֣רְתְּ|lemma="אָמַר" strong="H0559" x-morph="He,Vqp2fs"\w* @@ -8159,7 +8159,7 @@ \w לְ⁠דַבֵּ֤ר|lemma="דָבַר" strong="l:H1696" x-morph="He,R:Vpc"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w לִבָּ⁠הּ֙|lemma="לֵב" strong="H3820a" x-morph="He,Ncmsc:Sp3fs" x-tw="rc://*/tw/dict/bible/kt/heart"\w* \w לַהֲשִׁיבָ֔הּ|lemma="שׁוּב" strong="l:H7725" x-morph="He,R:Vhc:Sp3fs" x-tw="rc://*/tw/dict/bible/kt/restore"\w* -\f + \ft K \w ל⁠השיב⁠ו|lemma="שׁוּב" strong="l:H7725" x-morph="He,R:Vhc:Sp3ms"\w*\f* +\f + \ft K \+w ל⁠השיב⁠ו|lemma="שׁוּב" strong="l:H7725" x-morph="He,R:Vhc:Sp3ms"\+w*\f* \w וְ⁠נַעֲר֥⁠וֹ|lemma="נַעַר" strong="c:H5288" x-morph="He,C:Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/servant"\w* \w עִמּ֖⁠וֹ|lemma="עִם" strong="H5973a" x-morph="He,R:Sp3ms"\w* \w וְ⁠צֶ֣מֶד|lemma="צֶמֶד" strong="c:H6776" x-morph="He,C:Ncmsc"\w* @@ -8331,7 +8331,7 @@ \w וַ⁠יֹּ֣אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* \w לְ⁠נַעֲר֔⁠וֹ|lemma="נַעַר" strong="l:H5288" x-morph="He,R:Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/servant"\w* \w לך|lemma="יָלַךְ" strong="H3212" x-morph="He,Vqv2ms" x-tw="rc://*/tw/dict/bible/other/walk"\w* -\f + \ft Q \w לְךָ֥|lemma="יָלַךְ" strong="H3212" x-morph="He,Vqv2ms:Sh"\w*\f* +\f + \ft Q \+w לְךָ֥|lemma="יָלַךְ" strong="H3212" x-morph="He,Vqv2ms:Sh"\+w*\f* \w וְ⁠נִקְרְבָ֖ה|lemma="קָרַב" strong="c:H7126" x-morph="He,C:Vqh1cp"\w* \w בְּ⁠אַחַ֣ד|lemma="אֶחָד" strong="b:H0259" x-morph="He,R:Acmsc"\w* \w הַ⁠מְּקֹמ֑וֹת|lemma="מָקוֹם" strong="d:H4725" x-morph="He,Td:Ncmpa"\w* @@ -8459,7 +8459,7 @@ \w וַ⁠יְבִיאֵ֣⁠הוּ|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vhw3ms:Sp3ms"\w* \w לְ⁠בֵית֔⁠וֹ|lemma="בַּיִת" strong="l:H1004b" x-morph="He,R:Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/house"\w* \w ויבול|lemma="בָּלַל" strong="c:H1101b" x-morph="He,C:Vqw3ms"\w* -\f + \ft Q \w וַיָּ֖בָל|lemma="בָּלַל" strong="c:H1101b" x-morph="He,C:Vqw3ms"\w*\f* +\f + \ft Q \+w וַיָּ֖בָל|lemma="בָּלַל" strong="c:H1101b" x-morph="He,C:Vqw3ms"\+w*\f* \w לַ⁠חֲמוֹרִ֑ים|lemma="חֲמוֹר" strong="l:H2543" x-morph="He,Rd:Ncbpa"\w* \w וַֽ⁠יִּרְחֲצוּ֙|lemma="רָחַץ" strong="c:H7364" x-morph="He,C:Vqw3mp" x-tw="rc://*/tw/dict/bible/kt/clean"\w* \w רַגְלֵי⁠הֶ֔ם|lemma="רֶגֶל" strong="H7272" x-morph="He,Ncfdc:Sp3mp"\w* @@ -8550,7 +8550,7 @@ \w עַד|lemma="עַד" strong="H5704" x-morph="He,R"\w*־\w הַ⁠בֹּ֔קֶר|lemma="בֹּקֶר" strong="d:H1242" x-morph="He,Td:Ncmsa"\w* \w וַֽ⁠יְשַׁלְּח֖וּ⁠הָ|lemma="שָׁלַח" strong="c:H7971" x-morph="He,C:Vpw3mp:Sp3fs"\w* \w כַּ/עֲל֥וֹת|lemma="עָלָה" strong="k:H5927" x-morph="He,R:Vqc"\w* -\f + \ft K \w ב⁠עלות|lemma="עָלָה" strong="b:H5927" x-morph="He,R:Vqc"\w*\f* +\f + \ft K \+w ב⁠עלות|lemma="עָלָה" strong="b:H5927" x-morph="He,R:Vqc"\+w*\f* \w הַ⁠שָּֽׁחַר|lemma="שַׁחַר" strong="d:H7837" x-morph="He,Td:Ncmsa"\w*׃ \v 26 @@ -9661,7 +9661,7 @@ \v 20 \w ו⁠יצו|lemma="צָוָה" strong="c:H6680" x-morph="He,C:Vpw3mp" x-tw="rc://*/tw/dict/bible/kt/command"\w* -\f + \ft Q \w וַיְצַוּ֕וּ|lemma="צָוָה" strong="c:H6680" x-morph="He,C:Vpw3mp"\w*\f* +\f + \ft Q \+w וַיְצַוּ֕וּ|lemma="צָוָה" strong="c:H6680" x-morph="He,C:Vpw3mp"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w בְּנֵ֥י|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w בִנְיָמִ֖ן|lemma="בִּנְיָמִין" strong="H1144" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/benjamin"\w* \w לֵ⁠אמֹ֑ר|lemma="אָמַר" strong="l:H0559" x-morph="He,R:Vqc"\w* @@ -9695,7 +9695,7 @@ \w א֨וֹ|lemma="אוֹ" strong="H0176a" x-morph="He,C"\w* \w אֲחֵי⁠הֶ֜ם|lemma="אָח" strong="H0251" x-morph="He,Ncmpc:Sp3mp" x-tw="rc://*/tw/dict/bible/kt/brother"\w* \w לָרִ֣יב|lemma="רִיב" strong="l:H7378" x-morph="He,R:Vqc"\w* ׀ -\f + \ft K \w לרוב|lemma="רִיב" strong="l:H7378" x-morph="He,R:Vqc"\w*\f* +\f + \ft K \+w לרוב|lemma="רִיב" strong="l:H7378" x-morph="He,R:Vqc"\+w*\f* \w אֵלֵ֗י⁠נוּ|lemma="אֵל" strong="H0413" x-morph="He,R:Sp1cp"\w* \w וְ⁠אָמַ֤רְנוּ|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqp1cp"\w* \w אֲלֵי⁠הֶם֙|lemma="אֵל" strong="H0413" x-morph="He,R:Sp3mp"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/08-RUT.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/08-RUT.usfm index 592ce27a..98ce1a70 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/08-RUT.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/08-RUT.usfm @@ -133,7 +133,7 @@ \w לְ⁠בֵ֣ית|lemma="בַּיִת" strong="l:H1004b" x-morph="He,R:Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w* \w אִמָּ֑⁠הּ|lemma="אֵם" strong="H0517" x-morph="He,Ncfsc:Sp3fs"\w* \w יעשה|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqi3ms"\w* -\f + \ft Q \w יַ֣עַשׂ|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqi3ms"\w*\f* +\f + \ft Q \+w יַ֣עַשׂ|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqi3ms"\+w*\f* \w יְהוָ֤ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w עִמָּ⁠כֶם֙|lemma="עִם" strong="H5973a" x-morph="He,R:Sp2mp"\w* \w חֶ֔סֶד|lemma="חֶסֶד" strong="H2617a" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/kt/covenantfaith"\w* @@ -364,7 +364,7 @@ \v 1 \w וּֽ⁠לְ⁠נָעֳמִ֞י|lemma="נׇעֳמִי" strong="c:l:H5281" x-morph="He,C:R:Np"\w* \w מוֹדַ֣ע|lemma="יָדַע" strong="H4129" x-morph="He,VNcmsa"\w* -\f + \ft K \w מידע|lemma="יָדַע" strong="H3045" x-morph="He,VPsmsa"\w*\f* +\f + \ft K \+w מידע|lemma="יָדַע" strong="H3045" x-morph="He,VPsmsa"\+w*\f* \w לְ⁠אִישָׁ֗⁠הּ|lemma="אִישׁ" strong="l:H0376" x-morph="He,R:Ncmsc:Sp3fs"\w* \w אִ֚ישׁ|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsa"\w* \w גִּבּ֣וֹר|lemma="גִּבּוֹר" strong="H1368" x-morph="He,Aamsc"\w* @@ -770,10 +770,10 @@ \w וָ⁠סַ֗כְתְּ|lemma="סוּךְ" strong="c:H5480" x-morph="He,C:Vqq2fs" x-tw="rc://*/tw/dict/bible/kt/anoint"\w* \w וְ⁠שַׂ֧מְתְּ|lemma="שׂוּם" strong="c:H7760a" x-morph="He,C:Vqq2fs"\w* \w שמלת⁠ך|lemma="שִׂמְלָה" strong="H8071" x-morph="He,Ncfsc:Sp2fs"\w* -\f + \ft Q \w שִׂמְלֹתַ֛יִךְ|lemma="שִׂמְלָה" strong="H8071" x-morph="He,Ncfsc:Sp2fs"\w*\f* +\f + \ft Q \+w שִׂמְלֹתַ֛יִךְ|lemma="שִׂמְלָה" strong="H8071" x-morph="He,Ncfsc:Sp2fs"\+w*\f* \w עָלַ֖יִ⁠ךְ|lemma="עַל" strong="H5921a" x-morph="He,R:Sp2fs"\w* \w וְיָרַ֣דְתְּ|lemma="יָרַד" strong="c:H3381" x-morph="He,C:Vqq2fs"\w* -\f + \ft K \w ו⁠ירדתי|lemma="יָרַד" strong="c:H3381" x-morph="He,C:Vqq2fs"\w*\f* +\f + \ft K \+w ו⁠ירדתי|lemma="יָרַד" strong="c:H3381" x-morph="He,C:Vqq2fs"\+w*\f* \w הַ⁠גֹּ֑רֶן|lemma="גֹּרֶן" strong="d:H1637" x-morph="He,Td:Ncbsa" x-tw="rc://*/tw/dict/bible/other/thresh"\w* \w אַל|lemma="אַל" strong="H0408" x-morph="He,Tn"\w*־\w תִּוָּדְעִ֣י|lemma="יָדַע" strong="H3045" x-morph="He,VNj2fs"\w* \w לָ⁠אִ֔ישׁ|lemma="אִישׁ" strong="l:H0376" x-morph="He,Rd:Ncmsa"\w* @@ -793,7 +793,7 @@ \w וְ⁠גִלִּ֥ית|lemma="גָּלָה" strong="c:H1540" x-morph="He,C:Vpq2fs"\w* \w מַרְגְּלֹתָ֖י⁠ו|lemma="מַרְגְלָה" strong="H4772" x-morph="He,Ncfpc:Sp3ms"\w* \w וְשָׁכָ֑בְתְּ|lemma="שָׁכַב" strong="c:H7901" x-morph="He,C:Vqq2fs"\w* -\f + \ft K \w ו⁠שכבתי|lemma="שָׁכַב" strong="c:H7901" x-morph="He,C:Vqq2fs"\w*\f* +\f + \ft K \+w ו⁠שכבתי|lemma="שָׁכַב" strong="c:H7901" x-morph="He,C:Vqq2fs"\+w*\f* \w וְ⁠הוּא֙|lemma="הוּא" strong="c:H1931" x-morph="He,C:Pp3ms"\w* \w יַגִּ֣יד|lemma="נָגַד" strong="H5046" x-morph="He,Vhi3ms"\w* \w לָ֔⁠ךְ|lemma="" strong="l" x-morph="He,R:Sp2fs"\w* @@ -895,7 +895,7 @@ \w כִּ֣י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* \w אָמְנָ֔ם|lemma="אׇמְנָם" strong="H0551" x-morph="He,D" x-tw="rc://*/tw/dict/bible/kt/true"\w* \w כִּ֥י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* -\f + \ft K \w כי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* \w אם|lemma="אִם" strong="H0518a" x-morph="He,C"\w*\f* +\f + \ft K \+w כי|lemma="כִּי" strong="H3588a" x-morph="He,C"\+w* \+w אם|lemma="אִם" strong="H0518a" x-morph="He,C"\+w*\f* \w גֹאֵ֖ל|lemma="גָּאַל" strong="H1350a" x-morph="He,Vqrmsa" x-tw="rc://*/tw/dict/bible/kt/redeem"\w* \w אָנֹ֑כִי|lemma="אָנֹכִי" strong="H0595" x-morph="He,Pp1cs"\w* \w וְ⁠גַ֛ם|lemma="גַּם" strong="c:H1571" x-morph="He,C:Ta"\w* @@ -924,11 +924,11 @@ \v 14 \w וַ⁠תִּשְׁכַּ֤ב|lemma="שָׁכַב" strong="c:H7901" x-morph="He,C:Vqw3fs"\w* \w מַרְגְּלוֹתָיו֙|lemma="מַרְגְלָה" strong="H4772" x-morph="He,Ncfpc:Sp3ms"\w* -\f + \ft K \w מרגלת⁠ו|lemma="מַרְגְלָה" strong="H4772" x-morph="He,Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w מרגלת⁠ו|lemma="מַרְגְלָה" strong="H4772" x-morph="He,Ncfsc:Sp3ms"\+w*\f* \w עַד|lemma="עַד" strong="H5704" x-morph="He,R"\w*־\w הַ⁠בֹּ֔קֶר|lemma="בֹּקֶר" strong="d:H1242" x-morph="He,Td:Ncmsa"\w* \w וַ⁠תָּ֕קָם|lemma="קוּם" strong="c:H6965b" x-morph="He,C:Vqw3fs"\w* \w בְּטֶ֛רֶם|lemma="טְרוֹם" strong="b:H2962" x-morph="He,R:D"\w* -\f + \ft Q \w ב⁠טרום|lemma="טְרוֹם" strong="b:H2958" x-morph="He,R:D"\w*\f* +\f + \ft Q \+w ב⁠טרום|lemma="טְרוֹם" strong="b:H2958" x-morph="He,R:D"\+w*\f* \w יַכִּ֥יר|lemma="נָכַר" strong="H5234a" x-morph="He,Vhi3ms"\w* \w אִ֖ישׁ|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsa"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w רֵעֵ֑⁠הוּ|lemma="רֵעַ" strong="H7453" x-morph="He,Ncmsc:Sp3ms"\w* @@ -951,7 +951,7 @@ \w וַ⁠יָּ֣שֶׁת|lemma="שִׁית" strong="c:H7896" x-morph="He,C:Vqw3ms"\w* \w עָלֶ֔י⁠הָ|lemma="עַל" strong="H5921a" x-morph="He,R:Sp3fs"\w* \w וַ⁠יָּבֹ֖א|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3ms"\w* -\f + \ft Or perhaps \w וַתָּבֹא|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3fs"\w*\f* +\f + \ft Or perhaps \+w וַתָּבֹא|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3fs"\+w*\f* \w הָ⁠עִֽיר|lemma="עִיר" strong="d:H5892b" x-morph="He,Td:Ncfsa"\w*׃ \v 16 @@ -1058,11 +1058,11 @@ \w גְּאָ֔ל|lemma="גָּאַל" strong="H1350a" x-morph="He,Vqv2ms" x-tw="rc://*/tw/dict/bible/kt/redeem"\w* \w וְ⁠אִם|lemma="אִם" strong="c:H0518a" x-morph="He,C:C"\w*־\w לֹ֨א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w יִגְאַ֜ל|lemma="גָּאַל" strong="H1350a" x-morph="He,Vqi3ms" x-tw="rc://*/tw/dict/bible/kt/redeem"\w* -\f + \ft Or perhaps \w תִגְאַל|lemma="גָּאַל" strong="H1350a" x-morph="He,Vqi2ms"\w*\f* +\f + \ft Or perhaps \+w תִגְאַל|lemma="גָּאַל" strong="H1350a" x-morph="He,Vqi2ms"\+w*\f* \w הַגִּ֣ידָ⁠ה|lemma="נָגַד" strong="H5046" x-morph="He,Vhv2ms:Sh"\w* \w לִּ֗⁠י|lemma="" strong="l" x-morph="He,R:Sp1cs"\w* \w ו⁠אדע|lemma="יָדַע" strong="c:H3045" x-morph="He,C:Vqi1cs"\w* -\f + \ft Q \w וְאֵֽדְעָה֙|lemma="יָדַע" strong="c:H3045" x-morph="He,C:Vqh1cs"\w*\f* +\f + \ft Q \+w וְאֵֽדְעָה֙|lemma="יָדַע" strong="c:H3045" x-morph="He,C:Vqh1cs"\+w*\f* \w כִּ֣י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* \w אֵ֤ין|lemma="אַיִן" strong="H0369" x-morph="He,Tn"\w* \w זוּלָֽתְ⁠ךָ֙|lemma="זוּלָה" strong="H2108" x-morph="He,R:Sp2ms"\w* @@ -1085,7 +1085,7 @@ \w הַ⁠מּוֹאֲבִיָּ֤ה|lemma="מוֹאָבִי" strong="d:H4125" x-morph="He,Td:Ngfsa" x-tw="rc://*/tw/dict/bible/names/moab"\w* \w אֵֽשֶׁת|lemma="אִשָּׁה" strong="H0802" x-morph="He,Ncfsc"\w*־\w הַ⁠מֵּת֙|lemma="מוּת" strong="d:H4191" x-morph="He,Td:Vqrmsa" x-tw="rc://*/tw/dict/bible/other/death"\w* \w קָנִ֔יתָה|lemma="קָנָה" strong="H7069" x-morph="He,Vqp2ms:Sh"\w* -\f + \ft K \w קניתי|lemma="קָנָה" strong="H7069" x-morph="He,Vqp1cs"\w*\f* +\f + \ft K \+w קניתי|lemma="קָנָה" strong="H7069" x-morph="He,Vqp1cs"\+w*\f* \w לְ⁠הָקִ֥ים|lemma="קוּם" strong="l:H6965b" x-morph="He,R:Vhc" x-tw="rc://*/tw/dict/bible/other/raise"\w* \w שֵׁם|lemma="שֵׁם" strong="H8034" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/name"\w*־\w הַ⁠מֵּ֖ת|lemma="מוּת" strong="d:H4191" x-morph="He,Td:Vqrmsa" x-tw="rc://*/tw/dict/bible/other/death"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w נַחֲלָתֽ⁠וֹ|lemma="נַחֲלָה" strong="H5159" x-morph="He,Ncfsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/inherit"\w*׃ @@ -1096,7 +1096,7 @@ \w לֹ֤א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w אוּכַל֙|lemma="יָכֹל" strong="H3201" x-morph="He,Vqi1cs"\w* \w ל⁠גאול|lemma="גָּאַל" strong="l:H1350a" x-morph="He,R:Vqc" x-tw="rc://*/tw/dict/bible/kt/redeem"\w*־\w לִ֔⁠י|lemma="" strong="l" x-morph="He,R:Sp1cs"\w* -\f + \ft Q \w לִגְאָל|lemma="גָּאַל" strong="l:H1350a" x-morph="He,R:Vqc"\w*\f* +\f + \ft Q \+w לִגְאָל|lemma="גָּאַל" strong="l:H1350a" x-morph="He,R:Vqc"\+w*\f* \w פֶּן|lemma="פֵּן" strong="H6435" x-morph="He,C"\w*־\w אַשְׁחִ֖ית|lemma="שָׁחַת" strong="H7843" x-morph="He,Vhi1cs"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w נַחֲלָתִ֑⁠י|lemma="נַחֲלָה" strong="H5159" x-morph="He,Ncfsc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/inherit"\w* \w גְּאַל|lemma="גָּאַל" strong="H1350a" x-morph="He,Vqv2ms" x-tw="rc://*/tw/dict/bible/kt/redeem"\w*־\w לְ⁠ךָ֤|lemma="" strong="l" x-morph="He,R:Sp2ms"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/09-1SA.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/09-1SA.usfm index 5e12bb0c..a2e154d3 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/09-1SA.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/09-1SA.usfm @@ -470,7 +470,7 @@ \w דֵּעוֹת֙|lemma="דֵּעָה" strong="H1844" x-morph="He,Ncfpa"\w* \w יְהוָ֔ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w וְל֥וֹ|lemma="" strong="l" x-morph="He,C:R:Sp3ms"\w* -\f + \ft K \w ו⁠לא|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w*\f* +\f + \ft K \+w ו⁠לא|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\+w*\f* \w נִתְכְּנ֖וּ|lemma="תָּכַן" strong="H8505" x-morph="He,VNp3cp"\w* \w עֲלִלֽוֹת|lemma="עֲלִילָה" strong="H5949" x-morph="He,Ncfpa"\w*׃ @@ -533,7 +533,7 @@ \v 9 \w רַגְלֵ֤י|lemma="רֶגֶל" strong="H7272" x-morph="He,Ncfdc"\w* \w חֲסִידָיו֙|lemma="חָסִיד" strong="H2623" x-morph="He,Aampc:Sp3ms"\w* -\f + \ft K \w חסיד⁠ו|lemma="חָסִיד" strong="H2623" x-morph="He,Aamsc:Sp3ms"\w*\f* +\f + \ft K \+w חסיד⁠ו|lemma="חָסִיד" strong="H2623" x-morph="He,Aamsc:Sp3ms"\+w*\f* \w יִשְׁמֹ֔ר|lemma="שָׁמַר" strong="H8104" x-morph="He,Vqi3ms" x-tw="rc://*/tw/dict/bible/other/watch"\w* \w וּ⁠רְשָׁעִ֖ים|lemma="רָשָׁע" strong="c:H7563" x-morph="He,C:Aampa"\w* \w בַּ⁠חֹ֣שֶׁךְ|lemma="חֹשֶׁךְ" strong="b:H2822" x-morph="He,Rd:Ncmsa"\w* @@ -546,9 +546,9 @@ \w יְהוָ֞ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w יֵחַ֣תּוּ|lemma="נָחַת" strong="H5181" x-morph="He,VNi3mp"\w* \w מְרִיבָ֗יו|lemma="רִיב" strong="H7378" x-morph="He,Vhrmpc:Sp3ms"\w* -\f + \ft K \w מריב⁠ו|lemma="רִיב" strong="H7378" x-morph="He,Vhrmsc:Sp3ms"\w*\f* +\f + \ft K \+w מריב⁠ו|lemma="רִיב" strong="H7378" x-morph="He,Vhrmsc:Sp3ms"\+w*\f* \w עָלָיו֙|lemma="עַל" strong="H5921a" x-morph="He,R:Sp3ms"\w* -\f + \ft K \w על⁠ו|lemma="עַל" strong="H5921a" x-morph="He,R:Sp3ms"\w*\f* +\f + \ft K \+w על⁠ו|lemma="עַל" strong="H5921a" x-morph="He,R:Sp3ms"\+w*\f* \w בַּ⁠שָּׁמַ֣יִם|lemma="שָׁמַיִם" strong="b:H8064" x-morph="He,Rd:Ncmpa" x-tw="rc://*/tw/dict/bible/kt/heaven"\w* \w יַרְעֵ֔ם|lemma="רָעַם" strong="H7481" x-morph="He,Vhi3ms"\w* \w יְהוָ֖ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* @@ -657,7 +657,7 @@ \w נַפְשֶׁ֑⁠ךָ|lemma="נֶפֶשׁ" strong="H5315" x-morph="He,Ncbsc:Sp2ms" x-tw="rc://*/tw/dict/bible/kt/life"\w* \w וְ⁠אָמַ֥ר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqq3ms"\w* ׀ \w לֹא֙|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* -\f + \ft K \w ל⁠ו|lemma="" strong="l" x-morph="He,R:Sp3ms"\w*\f* +\f + \ft K \+w ל⁠ו|lemma="" strong="l" x-morph="He,R:Sp3ms"\+w*\f* \w כִּ֚י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* \w עַתָּ֣ה|lemma="עַתָּה" strong="H6258" x-morph="He,D"\w* \w תִתֵּ֔ן|lemma="נָתַן" strong="H5414" x-morph="He,Vqi2ms"\w* @@ -1009,7 +1009,7 @@ \w שֹׁכֵ֣ב|lemma="שָׁכַב" strong="H7901" x-morph="He,Vqrmsa"\w* \w בִּ⁠מְקֹמ֑⁠וֹ|lemma="מָקוֹם" strong="b:H4725" x-morph="He,R:Ncmsc:Sp3ms"\w* \w וְעֵינָיו֙|lemma="עַיִן" strong="c:H5869a" x-morph="He,C:Ncbdc:Sp3ms"\w* -\f + \ft K \w ו⁠עינ⁠ו|lemma="עַיִן" strong="c:H5869a" x-morph="He,C:Ncbsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠עינ⁠ו|lemma="עַיִן" strong="c:H5869a" x-morph="He,C:Ncbsc:Sp3ms"\+w*\f* \w הֵחֵ֣לּוּ|lemma="חָלַל" strong="H2490c" x-morph="He,Vhp3cp"\w* \w כֵה֔וֹת|lemma="כֵּהֶה" strong="H3544" x-morph="He,Aafpa"\w* \w לֹ֥א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* @@ -1498,7 +1498,7 @@ \w יֹשֵׁ֨ב|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqrmsa"\w* \w עַֽל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w הַ⁠כִּסֵּ֜א|lemma="כִּסֵּא" strong="d:H3678" x-morph="He,Td:Ncmsa"\w* \w יַ֥ד|lemma="יַד" strong="H3027" x-morph="He,Ncbsc"\w* -\f + \ft K \w יך|lemma="נָכָה" strong="H5221" x-morph="He,Vhc"\w*\f* +\f + \ft K \+w יך|lemma="נָכָה" strong="H5221" x-morph="He,Vhc"\+w*\f* \w דֶּ֨רֶךְ֙|lemma="דֶּרֶךְ" strong="H1870" x-morph="He,Ncbsa"\w* \w מְצַפֶּ֔ה|lemma="צָפָה" strong="H6822" x-morph="He,Vprmsa"\w* \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w הָיָ֤ה|lemma="הָיָה" strong="H1961" x-morph="He,Vqp3ms"\w* @@ -1752,7 +1752,7 @@ \w וַ⁠יַּ֤ךְ|lemma="נָכָה" strong="c:H5221" x-morph="He,C:Vhw3ms"\w* \w אֹתָ⁠ם֙|lemma="אֵת" strong="H0853" x-morph="He,To:Sp3mp"\w* \w ב⁠עפלים|lemma="עֹפֶל" strong="b:H6076b" x-morph="He,Rd:Ncmpa"\w* -\f + \ft Q \w בַּטְּחֹרִ֔ים|lemma="טְחוֹר" strong="b:H2914" x-morph="He,Rd:Ncmpa"\w*\f* +\f + \ft Q \+w בַּטְּחֹרִ֔ים|lemma="טְחוֹר" strong="b:H2914" x-morph="He,Rd:Ncmpa"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w אַשְׁדּ֖וֹד|lemma="אַשְׁדּוֹד" strong="H0795" x-morph="He,Np"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w גְּבוּלֶֽי⁠הָ|lemma="גְּבוּל" strong="H1366" x-morph="He,Ncmpc:Sp3fs"\w*׃ @@ -1814,7 +1814,7 @@ \w וַ⁠יִּשָּׂתְר֥וּ|lemma="שָׂתַר" strong="c:H8368" x-morph="He,C:VNw3mp"\w* \w לָ⁠הֶ֖ם|lemma="" strong="l" x-morph="He,R:Sp3mp"\w* \w עפלים|lemma="עֹפֶל" strong="H6076b" x-morph="He,Ncmpa"\w*׃ -\f + \ft Q \w טְחֹרִֽים|lemma="טְחוֹר" strong="H2914" x-morph="He,Ncmpa"\w*\f* +\f + \ft Q \+w טְחֹרִֽים|lemma="טְחוֹר" strong="H2914" x-morph="He,Ncmpa"\+w*\f* \v 10 \w וַֽ⁠יְשַׁלְּח֛וּ|lemma="שָׁלַח" strong="c:H7971" x-morph="He,C:Vpw3mp"\w* @@ -1867,7 +1867,7 @@ \w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w מֵ֔תוּ|lemma="מוּת" strong="H4191" x-morph="He,Vqp3cp"\w* \w הֻכּ֖וּ|lemma="נָכָה" strong="H5221" x-morph="He,VHp3cp"\w* \w ב⁠עפלים|lemma="עֹפֶל" strong="b:H6076b" x-morph="He,Rd:Ncmpa"\w* -\f + \ft Q \w בַּטְּחֹרִ֑ים|lemma="טְחוֹר" strong="b:H2914" x-morph="He,Rd:Ncmpa"\w*\f* +\f + \ft Q \+w בַּטְּחֹרִ֑ים|lemma="טְחוֹר" strong="b:H2914" x-morph="He,Rd:Ncmpa"\+w*\f* \w וַ⁠תַּ֛עַל|lemma="עָלָה" strong="c:H5927" x-morph="He,C:Vqw3fs"\w* \w שַֽׁוְעַ֥ת|lemma="שַׁוְעָה" strong="H7775" x-morph="He,Ncfsc"\w* \w הָ⁠עִ֖יר|lemma="עִיר" strong="d:H5892b" x-morph="He,Td:Ncfsa"\w* @@ -1933,7 +1933,7 @@ \w פְלִשְׁתִּ֔ים|lemma="פְּלִשְׁתִּי" strong="H6430" x-morph="He,Ngmpa" x-tw="rc://*/tw/dict/bible/names/philistines"\w* \w חֲמִשָּׁה֙|lemma="חָמֵשׁ" strong="H2568" x-morph="He,Acmsa"\w* \w עפלי|lemma="עֹפֶל" strong="H6076b" x-morph="He,Ncmpc"\w* -\f + \ft Q \w טְחֹרֵ֣י|lemma="טְחוֹר" strong="H2914" x-morph="He,Ncmpc"\w*\f* +\f + \ft Q \+w טְחֹרֵ֣י|lemma="טְחוֹר" strong="H2914" x-morph="He,Ncmpc"\+w*\f* \w זָהָ֔ב|lemma="זָהָב" strong="H2091" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/gold"\w* \w וַ⁠חֲמִשָּׁ֖ה|lemma="חָמֵשׁ" strong="c:H2568" x-morph="He,C:Acmsa"\w* \w עַכְבְּרֵ֣י|lemma="עַכְבָּר" strong="H5909" x-morph="He,Ncmpc"\w* @@ -1947,7 +1947,7 @@ \w וַ⁠עֲשִׂיתֶם֩|lemma="עָשָׂה" strong="c:H6213a" x-morph="He,C:Vqq2mp"\w* \w צַלְמֵ֨י|lemma="צֶלֶם" strong="H6754" x-morph="He,Ncmpc"\w* \w עפלי⁠כם|lemma="עֹפֶל" strong="H6076b" x-morph="He,Ncmpc:Sp2mp"\w* -\f + \ft Q \w טְחֹרֵיכֶ֜ם|lemma="טְחוֹר" strong="H2914" x-morph="He,Ncmpc:Sp2mp"\w*\f* +\f + \ft Q \+w טְחֹרֵיכֶ֜ם|lemma="טְחוֹר" strong="H2914" x-morph="He,Ncmpc:Sp2mp"\+w*\f* \w וְ⁠צַלְמֵ֣י|lemma="צֶלֶם" strong="c:H6754" x-morph="He,C:Ncmpc"\w* \w עַכְבְּרֵי⁠כֶ֗ם|lemma="עַכְבָּר" strong="H5909" x-morph="He,Ncmpc:Sp2mp"\w* \w הַ⁠מַּשְׁחִיתִם֙|lemma="שָׁחַת" strong="d:H7843" x-morph="He,Td:Vhrmpa"\w* @@ -2408,7 +2408,7 @@ \w חָלָב֙|lemma="חָלָב" strong="H2461" x-morph="He,Ncmsa"\w* \w אֶחָ֔ד|lemma="אֶחָד" strong="H0259" x-morph="He,Acmsa"\w* \w וַיַּעֲלֵ֧הוּ|lemma="עָלָה" strong="c:H5927" x-morph="He,C:Vhw3ms:Sp3ms"\w* -\f + \ft K \w ו⁠יעלה|lemma="עָלָה" strong="c:H5927" x-morph="He,C:Vhw3ms"\w*\f* +\f + \ft K \+w ו⁠יעלה|lemma="עָלָה" strong="c:H5927" x-morph="He,C:Vhw3ms"\+w*\f* \w עוֹלָ֛ה|lemma="עֹלָה" strong="H5930a" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/other/burntoffering"\w* \w כָּלִ֖יל|lemma="כָּלִיל" strong="H3632" x-morph="He,Aamsa"\w* \w לַֽ⁠יהוָ֑ה|lemma="יְהֹוָה" strong="l:H3068" x-morph="He,R:Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* @@ -2571,7 +2571,7 @@ \w וְ⁠לֹֽא|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w*־\w הָלְכ֤וּ|lemma="הָלַךְ" strong="H1980" x-morph="He,Vqp3cp" x-tw="rc://*/tw/dict/bible/other/walk"\w* \w בָנָי⁠ו֙|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w בִּדְרָכָ֔יו|lemma="דֶּרֶךְ" strong="b:H1870" x-morph="He,R:Ncbpc:Sp3ms"\w* -\f + \ft K \w ב⁠דרכ⁠ו|lemma="דֶּרֶךְ" strong="b:H1870" x-morph="He,R:Ncbsc:Sp3ms"\w*\f* +\f + \ft K \+w ב⁠דרכ⁠ו|lemma="דֶּרֶךְ" strong="b:H1870" x-morph="He,R:Ncbsc:Sp3ms"\+w*\f* \w וַ⁠יִּטּ֖וּ|lemma="נָטָה" strong="c:H5186" x-morph="He,C:Vqw3mp"\w* \w אַחֲרֵ֣י|lemma="אַחַר" strong="H0310a" x-morph="He,R"\w* \w הַ⁠בָּ֑צַע|lemma="בֶּצַע" strong="d:H1215" x-morph="He,Td:Ncmsa"\w* @@ -3280,7 +3280,7 @@ \w שְׁמוּאֵ֤ל|lemma="שְׁמוּאֵל" strong="H8050" x-morph="He,Np"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w שָׁאוּל֙|lemma="שָׁאוּל" strong="H7586" x-morph="He,Np"\w* \w הַגָּ֣גָה|lemma="גָּג" strong="d:H1406" x-morph="He,Td:Ncmsa:Sd"\w* -\f + \ft K \w ה⁠גג|lemma="גָּג" strong="d:H1406" x-morph="He,Td:Ncmsa"\w*\f* +\f + \ft K \+w ה⁠גג|lemma="גָּג" strong="d:H1406" x-morph="He,Td:Ncmsa"\+w*\f* \w לֵ⁠אמֹ֔ר|lemma="אָמַר" strong="l:H0559" x-morph="He,R:Vqc"\w* \w ק֖וּמָ⁠ה|lemma="קוּם" strong="H6965b" x-morph="He,Vqv2ms:Sh"\w* \w וַ⁠אֲשַׁלְּחֶ֑⁠ךָּ|lemma="שָׁלַח" strong="c:H7971" x-morph="He,C:Vpi1cs:Sp2ms"\w* @@ -3439,7 +3439,7 @@ \w וְ⁠הָיָ֗ה|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3ms"\w* \w כִּ֥י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* \w תבאינה|lemma="בּוֹא" strong="H0935" x-morph="He,Vqi3fp"\w* -\f + \ft Q \w תָבֹ֛אנָה|lemma="בּוֹא" strong="H0935" x-morph="He,Vqi3fp"\w*\f* +\f + \ft Q \+w תָבֹ֛אנָה|lemma="בּוֹא" strong="H0935" x-morph="He,Vqi3fp"\+w*\f* \w הָ⁠אֹת֥וֹת|lemma="אוֹת" strong="d:H0226" x-morph="He,Td:Ncbpa"\w* \w הָ⁠אֵ֖לֶּה|lemma="אֵלֶּה" strong="d:H0428" x-morph="He,Td:Pdxcp"\w* \w לָ֑⁠ךְ|lemma="" strong="l" x-morph="He,R:Sp2fs"\w* @@ -3656,7 +3656,7 @@ \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w שֵׁ֤בֶט|lemma="שֵׁבֶט" strong="H7626" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/tribe"\w* \w בִּנְיָמִן֙|lemma="בִּנְיָמִין" strong="H1144" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/benjamin"\w* \w ל⁠משפחת⁠ו|lemma="מִשְׁפָּחָה" strong="l:H4940" x-morph="He,R:Ncfpc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/clan"\w* -\f + \ft Q \w לְמִשְׁפְּחֹתָ֔יו|lemma="מִשְׁפָּחָה" strong="l:H4940" x-morph="He,R:Ncfpc:Sp3ms"\w*\f* +\f + \ft Q \+w לְמִשְׁפְּחֹתָ֔יו|lemma="מִשְׁפָּחָה" strong="l:H4940" x-morph="He,R:Ncfpc:Sp3ms"\+w*\f* \w וַ⁠תִּלָּכֵ֖ד|lemma="לָכַד" strong="c:H3920" x-morph="He,C:VNw3fs"\w* \w מִשְׁפַּ֣חַת|lemma="מִשְׁפָּחָה" strong="H4940" x-morph="He,Ncfsc" x-tw="rc://*/tw/dict/bible/other/family"\w* \w הַ⁠מַּטְרִ֑י|lemma="מַטְרִי" strong="d:H4309" x-morph="He,Td:Ngmsa"\w* @@ -3843,7 +3843,7 @@ \w רֽוּחַ|lemma="רוּחַ" strong="H7307" x-morph="He,Ncbsc" x-tw="rc://*/tw/dict/bible/kt/spirit"\w*־\w אֱלֹהִים֙|lemma="אֱלֹהִים" strong="H0430" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/kt/god"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w שָׁא֔וּל|lemma="שָׁאוּל" strong="H7586" x-morph="He,Np"\w* \w ב⁠שמע⁠ו|lemma="שָׁמַע" strong="b:H8085" x-morph="He,R:Vqc:Sp3ms"\w* -\f + \ft Q \w כְּשָׁמְע֖וֹ|lemma="שָׁמַע" strong="k:H8085" x-morph="He,R:Vqc:Sp3ms"\w*\f* +\f + \ft Q \+w כְּשָׁמְע֖וֹ|lemma="שָׁמַע" strong="k:H8085" x-morph="He,R:Vqc:Sp3ms"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ⁠דְּבָרִ֣ים|lemma="דָּבָר" strong="d:H1697" x-morph="He,Td:Ncmpa"\w* \w הָ⁠אֵ֑לֶּה|lemma="אֵלֶּה" strong="d:H0428" x-morph="He,Td:Pdxcp"\w* \w וַ⁠יִּ֥חַר|lemma="חָרָה" strong="c:H2734" x-morph="He,C:Vqw3ms"\w* @@ -3904,7 +3904,7 @@ \w תִּהְיֶֽה|lemma="הָיָה" strong="H1961" x-morph="He,Vqi3fs"\w*־\w לָ⁠כֶ֥ם|lemma="" strong="l" x-morph="He,R:Sp2mp"\w* \w תְּשׁוּעָ֖ה|lemma="תְּשׁוּעָה" strong="H8668" x-morph="He,Ncfsa"\w* \w ב⁠חם|lemma="חֹם" strong="b:H2527" x-morph="He,R:Ncmsc"\w* -\f + \ft Q \w כְּחֹ֣ם|lemma="חֹם" strong="k:H2527" x-morph="He,R:Ncmsc"\w*\f* +\f + \ft Q \+w כְּחֹ֣ם|lemma="חֹם" strong="k:H2527" x-morph="He,R:Ncmsc"\+w*\f* \w הַ⁠שָּׁ֑מֶשׁ|lemma="שֶׁמֶשׁ" strong="d:H8121" x-morph="He,Td:Ncbsa"\w* \w וַ⁠יָּבֹ֣אוּ|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3mp"\w* \w הַ⁠מַּלְאָכִ֗ים|lemma="מַלְאָךְ" strong="d:H4397" x-morph="He,Td:Ncmpa"\w* @@ -4167,7 +4167,7 @@ \w וַ⁠יִּזְעֲק֤וּ|lemma="זָעַק" strong="c:H2199" x-morph="He,C:Vqw3mp" x-tw="rc://*/tw/dict/bible/other/cry"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w יְהוָה֙|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w וַיֹּאמְר֣וּ|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* -\f + \ft K \w ו⁠יאמר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w*\f* +\f + \ft K \+w ו⁠יאמר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\+w*\f* \w חָטָ֔אנוּ|lemma="חָטָא" strong="H2398" x-morph="He,Vqp1cp" x-tw="rc://*/tw/dict/bible/kt/sin"\w* \w כִּ֤י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* \w עָזַ֨בְנוּ֙|lemma="עָזַב" strong="H5800a" x-morph="He,Vqp1cp" x-tw="rc://*/tw/dict/bible/other/forsaken"\w* @@ -4536,7 +4536,7 @@ \v 8 \w ו⁠ייחל|lemma="יָחַל" strong="c:H3176" x-morph="He,C:VNw3ms"\w* ׀ -\f + \ft Q \w וַיּ֣וֹחֶל|lemma="יָחַל" strong="c:H3176" x-morph="He,C:Vhw3ms"\w*\f* +\f + \ft Q \+w וַיּ֣וֹחֶל|lemma="יָחַל" strong="c:H3176" x-morph="He,C:Vhw3ms"\+w*\f* \w שִׁבְעַ֣ת|lemma="שֶׁבַע" strong="H7651" x-morph="He,Acmsc"\w* \w יָמִ֗ים|lemma="יוֹם" strong="H3117" x-morph="He,Ncmpa"\w* \w לַ⁠מּוֹעֵד֙|lemma="מוֹעֵד" strong="l:H4150" x-morph="He,Rd:Ncmsa" x-tw="rc://*/tw/dict/bible/other/feast"\w* @@ -4716,7 +4716,7 @@ \w אֶ֣רֶץ|lemma="אֶרֶץ" strong="H0776" x-morph="He,Ncbsc" x-tw="rc://*/tw/dict/bible/other/earth"\w* \w יִשְׂרָאֵ֑ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w אָמְר֣וּ|lemma="אָמַר" strong="H0559" x-morph="He,Vqp3ms"\w* -\f + \ft K \w אמר|lemma="אָמַר" strong="H0559" x-morph="He,Vqp3ms"\w*\f* +\f + \ft K \+w אמר|lemma="אָמַר" strong="H0559" x-morph="He,Vqp3ms"\+w*\f* \w פְלִשְׁתִּ֔ים|lemma="פְּלִשְׁתִּי" strong="H6430" x-morph="He,Ngmpa" x-tw="rc://*/tw/dict/bible/names/philistines"\w* \w פֶּ֚ן|lemma="פֵּן" strong="H6435" x-morph="He,C"\w* \w יַעֲשׂ֣וּ|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqi3mp"\w* @@ -5212,7 +5212,7 @@ \w יָד⁠וֹ֙|lemma="יָד" strong="H3027" x-morph="He,Ncbsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w פִּ֔י⁠ו|lemma="פֶּה" strong="H6310" x-morph="He,Ncmsc:Sp3ms"\w* \w וַתָּאֹ֖רְנָה|lemma="רָאָה" strong="c:H0215" x-morph="He,C:Vqw3fp"\w* -\f + \ft K \w ו⁠תראנה|lemma="רָאָה" strong="c:H7200" x-morph="He,C:Vqw3fp"\w*\f* +\f + \ft K \+w ו⁠תראנה|lemma="רָאָה" strong="c:H7200" x-morph="He,C:Vqw3fp"\+w*\f* \w עֵינָֽי⁠ו|lemma="עַיִן" strong="H5869a" x-morph="He,Ncbdc:Sp3ms"\w*׃ \v 28 @@ -5281,7 +5281,7 @@ \w ו⁠יעש|lemma="עָשָׂה" strong="c:H6213a" x-morph="He,C:Vqw3ms"\w* \w הָ⁠עָם֙|lemma="עַם" strong="d:H5971a" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w הַשָּׁלָ֔ל|lemma="שָׁלָל" strong="d:H7998" x-morph="He,Td:Ncmsa"\w* -\f + \ft K \w שלל|lemma="שָׁלָל" strong="H7998" x-morph="He,Ncmsa"\w*\f* +\f + \ft K \+w שלל|lemma="שָׁלָל" strong="H7998" x-morph="He,Ncmsa"\+w*\f* \w וַ⁠יִּקְח֨וּ|lemma="לָקַח" strong="c:H3947" x-morph="He,C:Vqw3mp"\w* \w צֹ֧אן|lemma="צֹאן" strong="H6629" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/other/flock"\w* \w וּ⁠בָקָ֛ר|lemma="בָּקָר" strong="c:H1241" x-morph="He,C:Ncbsa"\w* @@ -5855,7 +5855,7 @@ \w אֵלַ֖⁠י|lemma="אֵל" strong="H0413" x-morph="He,R:Sp1cs"\w* \w הַ⁠לָּ֑יְלָה|lemma="לַיִל" strong="d:H3915" x-morph="He,Td:Ncmsa"\w* \w וַיֹּ֥אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* -\f + \ft K \w ו⁠יאמרו|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3mp"\w*\f* +\f + \ft K \+w ו⁠יאמרו|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3mp"\+w*\f* \w ל֖⁠וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* \w דַּבֵּֽר|lemma="דָבַר" strong="H1696" x-morph="He,Vpv2ms"\w*׃ס @@ -6580,7 +6580,7 @@ \v 7 \w וְעֵ֣ץ|lemma="חֵץ" strong="c:H6086" x-morph="He,C:Ncmsc"\w* -\f + \ft K \w ו⁠חץ|lemma="חֵץ" strong="c:H2671" x-morph="He,C:Ncmsc"\w*\f* +\f + \ft K \+w ו⁠חץ|lemma="חֵץ" strong="c:H2671" x-morph="He,C:Ncmsc"\+w*\f* \w חֲנִית֗⁠וֹ|lemma="חֲנִית" strong="H2595" x-morph="He,Ncfsc:Sp3ms"\w* \w כִּ⁠מְנוֹר֙|lemma="מָנוֹר" strong="k:H4500" x-morph="He,R:Ncmsc"\w* \w אֹֽרְגִ֔ים|lemma="אָרַג" strong="H0707" x-morph="He,Vqrmpa"\w* @@ -6826,7 +6826,7 @@ \w שְׁמ֤⁠וֹ|lemma="שֵׁם" strong="H8034" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/name"\w* \w מִ⁠גַּת֙|lemma="גַּת" strong="m:H1661" x-morph="He,R:Np"\w* \w מִמַּעַרְכ֣וֹת|lemma="מַעֲרָכָה" strong="m:H4634" x-morph="He,R:Ncfpc"\w* -\f + \ft K \w ממערות|lemma="מְעָרָה" strong="m:H4631" x-morph="He,R:Ncfpc"\w*\f* +\f + \ft K \+w ממערות|lemma="מְעָרָה" strong="m:H4631" x-morph="He,R:Ncfpc"\+w*\f* \w פְּלִשְׁתִּ֔ים|lemma="פְּלִשְׁתִּי" strong="H6431" x-morph="He,Ngmpa" x-tw="rc://*/tw/dict/bible/names/philistines"\w* \w וַ⁠יְדַבֵּ֖ר|lemma="דָבַר" strong="c:H1696" x-morph="He,C:Vpw3ms"\w* \w כַּ⁠דְּבָרִ֣ים|lemma="דָּבָר" strong="k:H1697" x-morph="He,Rd:Ncmpa"\w* @@ -7428,7 +7428,7 @@ \w בְּ⁠נֶ֣פֶשׁ|lemma="נֶפֶשׁ" strong="b:H5315" x-morph="He,R:Ncbsc" x-tw="rc://*/tw/dict/bible/kt/heart"\w* \w דָּוִ֑ד|lemma="דָּוִד" strong="H1732" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/david"\w* \w וַיֶּאֱהָבֵ֥הוּ|lemma="אָהַב" strong="c:H0157" x-morph="He,C:Vqw3ms" x-tw="rc://*/tw/dict/bible/kt/love"\w* -\f + \ft K \w ו⁠יאהבו|lemma="אָהַב" strong="c:H0157" x-morph="He,C:Vqw3mp"\w*\f* +\f + \ft K \+w ו⁠יאהבו|lemma="אָהַב" strong="c:H0157" x-morph="He,C:Vqw3mp"\+w*\f* \w יְהוֹנָתָ֖ן|lemma="יְהוֹנָתָן" strong="H3083" x-morph="He,Np"\w* \w כְּ⁠נַפְשֽׁ⁠וֹ|lemma="נֶפֶשׁ" strong="k:H5315" x-morph="He,R:Ncbsc:Sp3ms"\w*׃ @@ -7498,7 +7498,7 @@ \w מִ⁠כָּל|lemma="כֹּל" strong="m:H3605" x-morph="He,R:Ncmsc"\w*־\w עָרֵ֤י|lemma="עִיר" strong="H5892b" x-morph="He,Ncfpc"\w* \w יִשְׂרָאֵל֙|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w ל⁠שור|lemma="שִׁיר" strong="l:H7891" x-morph="He,R:Vqc"\w* -\f + \ft Q \w לָשִׁ֣יר|lemma="שִׁיר" strong="l:H7891" x-morph="He,R:Vqc"\w*\f* +\f + \ft Q \+w לָשִׁ֣יר|lemma="שִׁיר" strong="l:H7891" x-morph="He,R:Vqc"\+w*\f* \w וְ⁠הַ⁠מְּחֹל֔וֹת|lemma="מְחֹלָה" strong="c:d:H4246" x-morph="He,C:Td:Ncfpa"\w* \w לִ⁠קְרַ֖את|lemma="קָרָא" strong="l:H7122" x-morph="He,R:Vqc"\w* \w שָׁא֣וּל|lemma="שָׁאוּל" strong="H7586" x-morph="He,Np"\w* @@ -7515,7 +7515,7 @@ \w הִכָּ֤ה|lemma="נָכָה" strong="H5221" x-morph="He,Vhp3ms"\w* \w שָׁאוּל֙|lemma="שָׁאוּל" strong="H7586" x-morph="He,Np"\w* \w בַּאֲלָפָ֔יו|lemma="אֶלֶף" strong="b:H0505" x-morph="He,R:Acbpc:Sp3ms"\w* -\f + \ft K \w ב⁠אלפ⁠ו|lemma="אֶלֶף" strong="b:H0505" x-morph="He,R:Acbsc:Sp3ms"\w*\f* +\f + \ft K \+w ב⁠אלפ⁠ו|lemma="אֶלֶף" strong="b:H0505" x-morph="He,R:Acbsc:Sp3ms"\+w*\f* \w וְ⁠דָוִ֖ד|lemma="דָּוִד" strong="c:H1732" x-morph="He,C:Np"\w* \w בְּ⁠רִבְבֹתָֽי⁠ו|lemma="רְבָבָה" strong="b:H7233" x-morph="He,R:Ncfpc:Sp3ms"\w*׃ @@ -8144,7 +8144,7 @@ \w וּ⁠שְׁמוּאֵ֔ל|lemma="שְׁמוּאֵל" strong="c:H8050" x-morph="He,C:Np"\w* \w וַ⁠יֵּשְׁב֖וּ|lemma="יָשַׁב" strong="c:H3427" x-morph="He,C:Vqw3mp"\w* \w בְּנָֽיוֹת|lemma="נָוִית" strong="b:H5121" x-morph="He,R:Np"\w*׃ -\f + \ft K \w ב⁠נוית|lemma="נָוִית" strong="b:H5121" x-morph="He,R:Np"\w*\f* +\f + \ft K \+w ב⁠נוית|lemma="נָוִית" strong="b:H5121" x-morph="He,R:Np"\+w*\f* \v 19 \w וַ⁠יֻּגַּ֥ד|lemma="נָגַד" strong="c:H5046" x-morph="He,C:VHw3ms"\w* @@ -8153,7 +8153,7 @@ \w הִנֵּ֣ה|lemma="הִנֵּה" strong="H2009" x-morph="He,Tm"\w* \w דָוִ֔ד|lemma="דָּוִד" strong="H1732" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/david"\w* \w בְּנָי֖וֹת|lemma="נָוִית" strong="b:H5121" x-morph="He,R:Np"\w* -\f + \ft K \w ב⁠נוית|lemma="נָוִית" strong="b:H5121" x-morph="He,R:Np"\w*\f* +\f + \ft K \+w ב⁠נוית|lemma="נָוִית" strong="b:H5121" x-morph="He,R:Np"\+w*\f* \w בָּ⁠רָמָֽה|lemma="רָמָה" strong="b:H7414" x-morph="He,Rd:Np"\w*׃ \v 20 @@ -8211,14 +8211,14 @@ \w וַ⁠יֹּ֕אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* \w הִנֵּ֖ה|lemma="הִנֵּה" strong="H2009" x-morph="He,Tm"\w* \w בְּנָי֥וֹת|lemma="נָוִית" strong="b:H5121" x-morph="He,R:Np"\w* -\f + \ft K \w ב⁠נוית|lemma="נָוִית" strong="b:H5121" x-morph="He,R:Np"\w*\f* +\f + \ft K \+w ב⁠נוית|lemma="נָוִית" strong="b:H5121" x-morph="He,R:Np"\+w*\f* \w בָּ⁠רָמָֽה|lemma="רָמָה" strong="b:H7414" x-morph="He,Rd:Np"\w*׃ \v 23 \w וַ⁠יֵּ֣לֶךְ|lemma="יָלַךְ" strong="c:H3212" x-morph="He,C:Vqw3ms"\w* \w שָׁ֔ם|lemma="שָׁם" strong="H8033" x-morph="He,D"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w נָי֖וֹת|lemma="נָוִית" strong="H5121" x-morph="He,Np"\w* -\f + \ft ? \w נוית|lemma="נָוִית" strong="H5121" x-morph="He,Np"\w*\f* +\f + \ft ? \w נוית|lemma="נָוִית" strong="H5121" x-morph="He,Np"\+w*\f* \w בָּ⁠רָמָ֑ה|lemma="רָמָה" strong="b:H7414" x-morph="He,Rd:Np"\w* \w וַ⁠תְּהִי֩|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqw3fs"\w* \w עָלָ֨י⁠ו|lemma="עַל" strong="H5921a" x-morph="He,R:Sp3ms"\w* @@ -8230,7 +8230,7 @@ \w וַ⁠יִּתְנַבֵּ֔א|lemma="נָבָא" strong="c:H5012" x-morph="He,C:Vtw3ms" x-tw="rc://*/tw/dict/bible/kt/prophet"\w* \w עַד|lemma="עַד" strong="H5704" x-morph="He,R"\w*־\w בֹּא֖⁠וֹ|lemma="בּוֹא" strong="H0935" x-morph="He,Vqc:Sp3ms"\w* \w בְּנָי֥וֹת|lemma="נָוִית" strong="b:H5121" x-morph="He,R:Np"\w* -\f + \ft K \w ב⁠נוית|lemma="נָוִית" strong="b:H5121" x-morph="He,R:Np"\w*\f* +\f + \ft K \+w ב⁠נוית|lemma="נָוִית" strong="b:H5121" x-morph="He,R:Np"\+w*\f* \w בָּ⁠רָמָֽה|lemma="רָמָה" strong="b:H7414" x-morph="He,Rd:Np"\w*׃ \v 24 @@ -8259,7 +8259,7 @@ \w וַ⁠יִּבְרַ֣ח|lemma="בָּרַח" strong="c:H1272" x-morph="He,C:Vqw3ms"\w* \w דָּוִ֔ד|lemma="דָּוִד" strong="H1732" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/david"\w* \w מִנָּי֖וֹת|lemma="נָוִית" strong="m:H5121" x-morph="He,R:Np"\w* -\f + \ft K \w מ⁠נוות|lemma="נָוִית" strong="m:H5121" x-morph="He,R:Np"\w*\f* +\f + \ft K \+w מ⁠נוות|lemma="נָוִית" strong="m:H5121" x-morph="He,R:Np"\+w*\f* \w בָּ⁠רָמָ֑ה|lemma="רָמָה" strong="b:H7414" x-morph="He,Rd:Np"\w* \w וַ⁠יָּבֹ֞א|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3ms"\w* \w וַ⁠יֹּ֣אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* ׀ @@ -8624,7 +8624,7 @@ \w וַ⁠יֵּ֧שֶׁב|lemma="יָשַׁב" strong="c:H3427" x-morph="He,C:Vqw3ms"\w* \w הַ⁠מֶּ֛לֶךְ|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* \w אֶל|lemma="אֶל" strong="H0413" x-morph="He,R"\w*־\w הַ⁠לֶּ֖חֶם|lemma="לֶחֶם" strong="d:H3899" x-morph="He,Td:Ncbsa" x-tw="rc://*/tw/dict/bible/other/bread"\w* -\f + \ft K \w על|lemma="עַל" strong="H5921a" x-morph="He,R"\w*\f* +\f + \ft K \+w על|lemma="עַל" strong="H5921a" x-morph="He,R"\+w*\f* \w לֶ⁠אֱכֽוֹל|lemma="אָכַל" strong="l:H0398" x-morph="He,R:Vqc"\w*׃ \v 25 @@ -8856,7 +8856,7 @@ \w נַ֤עַר|lemma="נַעַר" strong="H5288" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/servant"\w* \w יְהֽוֹנָתָן֙|lemma="יְהוֹנָתָן" strong="H3083" x-morph="He,Np"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ֣חִצִּ֔ים|lemma="חִצִּי" strong="d:H2671" x-morph="He,Td:Ncmpa"\w* -\f + \ft K \w החצי|lemma="חִצִּי" strong="d:H2678" x-morph="He,Td:Ncmsa"\w*\f* +\f + \ft K \+w החצי|lemma="חִצִּי" strong="d:H2678" x-morph="He,Td:Ncmsa"\+w*\f* \w וַ⁠יָּבֹ֖א|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3ms"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w אֲדֹנָֽי⁠ו|lemma="אָדוֹן" strong="H0113" x-morph="He,Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/lord"\w*׃ @@ -9158,10 +9158,10 @@ \w הִכָּ֤ה|lemma="נָכָה" strong="H5221" x-morph="He,Vhp3ms"\w* \w שָׁאוּל֙|lemma="שָׁאוּל" strong="H7586" x-morph="He,Np"\w* \w בַּאֲלָפָ֔יו|lemma="אֶלֶף" strong="b:H0505" x-morph="He,R:Acbpc:Sp3ms"\w* -\f + \ft K \w ב⁠אלפ⁠ו|lemma="אֶלֶף" strong="b:H0505" x-morph="He,R:Acbsc:Sp3ms"\w*\f* +\f + \ft K \+w ב⁠אלפ⁠ו|lemma="אֶלֶף" strong="b:H0505" x-morph="He,R:Acbsc:Sp3ms"\+w*\f* \w וְ⁠דָוִ֖ד|lemma="דָּוִד" strong="c:H1732" x-morph="He,C:Np"\w* \w בְּרִבְבֹתָֽיו|lemma="רְבָבָה" strong="b:H7233" x-morph="He,R:Ncfpc:Sp3ms"\w*׃ -\f + \ft K \w ברבבתו|lemma="רְבָבָה" strong="b:H7233" x-morph="He,R:Ncfpc:Sp3ms"\w*\f* +\f + \ft K \+w ברבבתו|lemma="רְבָבָה" strong="b:H7233" x-morph="He,R:Ncfpc:Sp3ms"\+w*\f* \v 12 \va 13\va* @@ -9184,7 +9184,7 @@ \w וַ⁠יִּתְהֹלֵ֖ל|lemma="הָלַל" strong="c:H1984c" x-morph="He,C:Vrw3ms"\w* \w בְּ⁠יָדָ֑⁠ם|lemma="יָד" strong="b:H3027" x-morph="He,R:Ncbsc:Sp3mp" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w ו⁠יתו|lemma="תָּוָה" strong="c:H8427" x-morph="He,C:Vpw3ms"\w* -\f + \ft Q \w וַיְתָיו֙|lemma="תָּוָה" strong="c:H8427" x-morph="He,C:Vpw3ms"\w*\f* +\f + \ft Q \+w וַיְתָיו֙|lemma="תָּוָה" strong="c:H8427" x-morph="He,C:Vpw3ms"\+w*\f* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w דַּלְת֣וֹת|lemma="דֶּלֶת" strong="H1817c" x-morph="He,Ncfpc" x-tw="rc://*/tw/dict/bible/other/gate"\w* \w הַ⁠שַּׁ֔עַר|lemma="שַׁעַר" strong="d:H8179" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/gate"\w* \w וַ⁠יּ֥וֹרֶד|lemma="יָרַד" strong="c:H3381" x-morph="He,C:Vhw3ms"\w* @@ -9424,7 +9424,7 @@ \v 13 \w וַ⁠יֹּ֤אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* \w אֵלָיו֙|lemma="אֵל" strong="H0413" x-morph="He,R:Sp3ms"\w* -\f + \ft Q \w אל⁠ו|lemma="אֵל" strong="H0413" x-morph="He,R:Sp3ms"\w*\f* +\f + \ft Q \+w אל⁠ו|lemma="אֵל" strong="H0413" x-morph="He,R:Sp3ms"\+w*\f* \w שָׁא֔וּל|lemma="שָׁאוּל" strong="H7586" x-morph="He,Np"\w* \w לָ֚⁠מָּה|lemma="מָה" strong="l:H4100" x-morph="He,R:Ti"\w* \w קְשַׁרְתֶּ֣ם|lemma="קָשַׁר" strong="H7194" x-morph="He,Vqp2mp"\w* @@ -9464,7 +9464,7 @@ \w הַ⁠יּ֧וֹם|lemma="יוֹם" strong="d:H3117" x-morph="He,Td:Ncmsa"\w* \w הַחִלֹּ֛תִי|lemma="חָלַל" strong="H2490c" x-morph="He,Vhp1cs"\w* \w ל⁠שאול|lemma="שָׁאַל" strong="l:H7592" x-morph="He,R:Vqc"\w*־\w ל֥⁠וֹ|lemma="שָׁאַל" strong="l:H7592" x-morph="He,R:Sp3ms"\w* -\f + \ft Q \w לִשְׁאָל|lemma="שָׁאַל" strong="l:H7592" x-morph="He,R:Vqc"\w*\f* +\f + \ft Q \+w לִשְׁאָל|lemma="שָׁאַל" strong="l:H7592" x-morph="He,R:Vqc"\+w*\f* \w בֵ⁠אלֹהִ֖ים|lemma="אֱלֹהִים" strong="b:H0430" x-morph="He,R:Ncmpa" x-tw="rc://*/tw/dict/bible/kt/god"\w* \w חָלִ֣ילָ⁠ה|lemma="חָלִילָה" strong="H2486" x-morph="He,Tj:Sh"\w* \w לִּ֑⁠י|lemma="" strong="l" x-morph="He,R:Sp1cs"\w* @@ -9513,7 +9513,7 @@ \w וְ⁠לֹ֥א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w* \w גָל֖וּ|lemma="גָּלָה" strong="H1540" x-morph="He,Vqp3cp" x-tw="rc://*/tw/dict/bible/other/exile"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w אָזְנִ֑י|lemma="אֹזֶן" strong="H0241" x-morph="He,Ncfsc:Sp1cs"\w* -\f + \ft K \w אזנ⁠ו|lemma="אֹזֶן" strong="H0241" x-morph="He,Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w אזנ⁠ו|lemma="אֹזֶן" strong="H0241" x-morph="He,Ncfsc:Sp3ms"\+w*\f* \w וְ⁠לֹֽא|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w*־\w אָב֞וּ|lemma="אָבָה" strong="H0014" x-morph="He,Vqp3cp"\w* \w עַבְדֵ֤י|lemma="עֶבֶד" strong="H5650" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/other/servant"\w* \w הַ⁠מֶּ֨לֶךְ֙|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* @@ -9527,14 +9527,14 @@ \w וַ⁠יֹּ֤אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* \w הַ⁠מֶּ֨לֶךְ֙|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* \w לְדוֹאֵ֔ג|lemma="דֹּאֵג" strong="l:H1673" x-morph="He,R:Np"\w* -\f + \ft K \w ל⁠דויג|lemma="דֹּאֵג" strong="l:H1673" x-morph="He,R:Np"\w*\f* +\f + \ft K \+w ל⁠דויג|lemma="דֹּאֵג" strong="l:H1673" x-morph="He,R:Np"\+w*\f* \w סֹ֣ב|lemma="סָבַב" strong="H5437" x-morph="He,Vqv2ms"\w* \w אַתָּ֔ה|lemma="אַתָּה" strong="H0859a" x-morph="He,Pp2ms"\w* \w וּ⁠פְגַ֖ע|lemma="פָּגַע" strong="c:H6293" x-morph="He,C:Vqv2ms"\w* \w בַּ⁠כֹּהֲנִ֑ים|lemma="כֹּהֵן" strong="b:H3548" x-morph="He,Rd:Ncmpa"\w* \w וַ⁠יִּסֹּ֞ב|lemma="סָבַב" strong="c:H5437" x-morph="He,C:Vqw3ms"\w* \w דּוֹאֵ֣ג|lemma="דֹּאֵג" strong="H1673" x-morph="He,Np"\w* -\f + \ft K \w דויג|lemma="דֹּאֵג" strong="H1673" x-morph="He,Np"\w*\f* +\f + \ft K \+w דויג|lemma="דֹּאֵג" strong="H1673" x-morph="He,Np"\+w*\f* \w הָ⁠אֲדֹמִ֗י|lemma="אֱדֹמִי" strong="d:H0130" x-morph="He,Td:Ngmsa"\w* \w וַ⁠יִּפְגַּע|lemma="פָּגַע" strong="c:H6293" x-morph="He,C:Vqw3ms"\w*־\w הוּא֙|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w* \w בַּ⁠כֹּ֣הֲנִ֔ים|lemma="כֹּהֵן" strong="b:H3548" x-morph="He,Rd:Ncmpa"\w* @@ -9594,7 +9594,7 @@ \w הַ⁠הוּא֙|lemma="הוּא" strong="d:H1931" x-morph="He,Td:Pp3ms"\w* \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w שָׁם֙|lemma="שָׁם" strong="H8033" x-morph="He,D"\w* \w דּוֹאֵ֣ג|lemma="דֹּאֵג" strong="H1673" x-morph="He,Np"\w* -\f + \ft K \w דויג|lemma="דֹּאֵג" strong="H1673" x-morph="He,Np"\w*\f* +\f + \ft K \+w דויג|lemma="דֹּאֵג" strong="H1673" x-morph="He,Np"\+w*\f* \w הָ⁠אֲדֹמִ֔י|lemma="אֱדֹמִי" strong="d:H0130" x-morph="He,Td:Ngmsa"\w* \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w הַגֵּ֥ד|lemma="נָגַד" strong="H5046" x-morph="He,Vha"\w* \w יַגִּ֖יד|lemma="נָגַד" strong="H5046" x-morph="He,Vhi3ms"\w* @@ -9688,7 +9688,7 @@ \w וַ⁠יֵּ֣לֶךְ|lemma="יָלַךְ" strong="c:H3212" x-morph="He,C:Vqw3ms"\w* \w דָּוִד֩|lemma="דָּוִד" strong="H1732" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/david"\w* \w וַאֲנָשָׁ֨יו|lemma="אִישׁ" strong="c:H0376" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠אנש⁠ו|lemma="אִישׁ" strong="c:H0376" x-morph="He,C:Ncmpc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠אנש⁠ו|lemma="אִישׁ" strong="c:H0376" x-morph="He,C:Ncmpc:Sp3ms"\+w*\f* \w קְעִילָ֜ה|lemma="קְעִילָה" strong="H7084" x-morph="He,Np"\w* \w וַ⁠יִּלָּ֣חֶם|lemma="לָחַם" strong="c:H3898a" x-morph="He,C:VNw3ms"\w* \w בַּ⁠פְּלִשְׁתִּ֗ים|lemma="פְּלִשְׁתִּי" strong="b:H6430" x-morph="He,Rd:Ngmpa"\w* @@ -10145,7 +10145,7 @@ \w אָנֹכִ֜י|lemma="אָנֹכִי" strong="H0595" x-morph="He,Pp1cs" x-tw="rc://*/tw/dict/bible/kt/pray"\w* \w נֹתֵ֤ן|lemma="נָתַן" strong="H5414" x-morph="He,Vqrmsa"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w אֹֽיִבְךָ֙|lemma="אֹיֵב" strong="H0341" x-morph="He,Vqrmsc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/adversary"\w* -\f + \ft K \w איבי⁠ך|lemma="אֹיֵב" strong="H0341" x-morph="He,Vqrmpc:Sp2ms"\w*\f* +\f + \ft K \+w איבי⁠ך|lemma="אֹיֵב" strong="H0341" x-morph="He,Vqrmpc:Sp2ms"\+w*\f* \w בְּ⁠יָדֶ֔⁠ךָ|lemma="יָד" strong="b:H3027" x-morph="He,R:Ncbsc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w וְ⁠עָשִׂ֣יתָ|lemma="עָשָׂה" strong="c:H6213a" x-morph="He,C:Vqq2ms"\w* \w לּ֔⁠וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* @@ -10395,7 +10395,7 @@ \v 18 \va 19\va* \w וְאַתָּה֙|lemma="אַתָּה" strong="c:H0859a" x-morph="He,C:Pp2ms"\w* -\f + \ft K \w ו⁠את|lemma="אַתָּה" strong="c:H0859b" x-morph="He,C:Pp2fs"\w*\f* +\f + \ft K \+w ו⁠את|lemma="אַתָּה" strong="c:H0859b" x-morph="He,C:Pp2fs"\+w*\f* \w הִגַּ֣דְתָּ|lemma="נָגַד" strong="H5046" x-morph="He,Vhp2ms"\w* \w הַ⁠יּ֔וֹם|lemma="יוֹם" strong="d:H3117" x-morph="He,Td:Ncmsa"\w* \w אֵ֛ת|lemma="אֵת" strong="H0853" x-morph="He,To"\w* @@ -10521,7 +10521,7 @@ \w מַעֲלָלִ֖ים|lemma="מַעֲלָל" strong="H4611" x-morph="He,Ncmpa"\w* \w וְ⁠ה֥וּא|lemma="הוּא" strong="c:H1931" x-morph="He,C:Pp3ms"\w* \w כָלִבִּֽי|lemma="כָּלֵבִי" strong="k:H3614" x-morph="He,R:Ngmsa"\w*׃ -\f + \ft K \w כ⁠לב⁠ו|lemma="לֵב" strong="k:H3820a" x-morph="He,R:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w כ⁠לב⁠ו|lemma="לֵב" strong="k:H3820a" x-morph="He,R:Ncmsc:Sp3ms"\+w*\f* \v 4 \w וַ⁠יִּשְׁמַ֥ע|lemma="שָׁמַע" strong="c:H8085" x-morph="He,C:Vqw3ms"\w* @@ -10746,7 +10746,7 @@ \v 18 \w וַ⁠תְּמַהֵ֣ר|lemma="מָהַר" strong="c:H4116a" x-morph="He,C:Vpw3fs"\w* \w אֲבִיגַ֡יִל|lemma="אֲבִיגַיִל" strong="H0026" x-morph="He,Np"\w* -\f + \ft K \w אבוגיל|lemma="אֲבִיגַיִל" strong="H0026" x-morph="He,Np"\w*\f* +\f + \ft K \+w אבוגיל|lemma="אֲבִיגַיִל" strong="H0026" x-morph="He,Np"\+w*\f* \w וַ⁠תִּקַּח֩|lemma="לָקַח" strong="c:H3947" x-morph="He,C:Vqw3fs"\w* \w מָאתַ֨יִם|lemma="מֵאָה" strong="H3967" x-morph="He,Acbda"\w* \w לֶ֜חֶם|lemma="לֶחֶם" strong="H3899" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/other/bread"\w* @@ -10755,7 +10755,7 @@ \w וְ⁠חָמֵ֨שׁ|lemma="חָמֵשׁ" strong="c:H2568" x-morph="He,C:Acfsa"\w* \w צֹ֤אן|lemma="צֹאן" strong="H6629" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/other/flock"\w* \w עשוות|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqsfpa"\w* -\f + \ft Q \w עֲשׂוּיֹת֙|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqsfpa"\w*\f* +\f + \ft Q \+w עֲשׂוּיֹת֙|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqsfpa"\+w*\f* \w וְ⁠חָמֵ֤שׁ|lemma="חָמֵשׁ" strong="c:H2568" x-morph="He,C:Acfsa"\w* \w סְאִים֙|lemma="סְאָה" strong="H5429" x-morph="He,Ncfpa"\w* \w קָלִ֔י|lemma="קָלִי" strong="H7039" x-morph="He,Ncmsa"\w* @@ -11032,7 +11032,7 @@ \w לוּלֵ֣י|lemma="לוּלֵא" strong="H3884" x-morph="He,C"\w* \w מִהַ֗רְתְּ|lemma="מָהַר" strong="H4116a" x-morph="He,Vpp2fs"\w* \w ו⁠תבאתי|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw2fs"\w* -\f + \ft Q \w וַ/תָּבֹאת֙|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw2fs"\w*\f* +\f + \ft Q \+w וַ/תָּבֹאת֙|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw2fs"\+w*\f* \w לִ⁠קְרָאתִ֔⁠י|lemma="קָרָא" strong="l:H7122" x-morph="He,R:Vqc:Sp1cs"\w* \w כִּ֣י|lemma="כִּי" strong="H3588b" x-morph="He,C"\w* \w אִם|lemma="אִם" strong="H0518b" x-morph="He,C"\w*־\w נוֹתַ֧ר|lemma="יָתַר" strong="H3498" x-morph="He,VNp3ms"\w* @@ -11294,7 +11294,7 @@ \w וְ⁠הָ⁠עָ֖ם|lemma="עַם" strong="c:d:H5971a" x-morph="He,C:Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* \w חֹנִ֥ים|lemma="חָנָה" strong="H2583" x-morph="He,Vqrmpa"\w* \w סביבת⁠ו|lemma="סָבִיב" strong="H5439" x-morph="He,Ncbpc:Sp3ms"\w*׃ -\f + \ft Q \w סְבִיבֹתָֽיו|lemma="סָבִיב" strong="H5439" x-morph="He,Ncbpc:Sp3ms"\w*\f* +\f + \ft Q \+w סְבִיבֹתָֽיו|lemma="סָבִיב" strong="H5439" x-morph="He,Ncbpc:Sp3ms"\+w*\f* \v 6 \w וַ⁠יַּ֨עַן|lemma="עָנָה" strong="c:H6030b" x-morph="He,C:Vqw3ms"\w* @@ -11331,12 +11331,12 @@ \w וַ⁠חֲנִית֥⁠וֹ|lemma="חֲנִית" strong="c:H2595" x-morph="He,C:Ncfsc:Sp3ms"\w* \w מְעוּכָֽה|lemma="מָעַךְ" strong="H4600" x-morph="He,Vqsfsa"\w*־\w בָ⁠אָ֖רֶץ|lemma="אֶרֶץ" strong="b:H0776" x-morph="He,Rd:Ncbsa"\w* \w מראשת⁠ו|lemma="מְרַאֲשָׁה" strong="H4763" x-morph="He,Ncfpc:Sp3ms"\w* -\f + \ft Q \w מְרַאֲשֹׁתָ֑יו|lemma="מְרַאֲשָׁה" strong="H4763" x-morph="He,Ncfpc:Sp3ms"\w*\f* +\f + \ft Q \+w מְרַאֲשֹׁתָ֑יו|lemma="מְרַאֲשָׁה" strong="H4763" x-morph="He,Ncfpc:Sp3ms"\+w*\f* \w וְ⁠אַבְנֵ֣ר|lemma="אַבְנֵר" strong="c:H0074" x-morph="He,C:Np"\w* \w וְ⁠הָ⁠עָ֔ם|lemma="עַם" strong="c:d:H5971a" x-morph="He,C:Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* \w שֹׁכְבִ֖ים|lemma="שָׁכַב" strong="H7901" x-morph="He,Vqrmpa"\w* \w סביבת⁠ו|lemma="סָבִיב" strong="H5439" x-morph="He,Ncbsc:Sp3ms"\w*׃ס -\f + \ft Q \w סְבִיבֹתָֽיו|lemma="סָבִיב" strong="H5439" x-morph="He,Ncbsc:Sp3ms"\w*\f* +\f + \ft Q \+w סְבִיבֹתָֽיו|lemma="סָבִיב" strong="H5439" x-morph="He,Ncbsc:Sp3ms"\+w*\f* \v 8 \w וַ⁠יֹּ֤אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* @@ -11399,7 +11399,7 @@ \w אֶֽת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ⁠חֲנִ֜ית|lemma="חֲנִית" strong="d:H2595" x-morph="He,Td:Ncfsa"\w* \w אֲשֶׁ֧ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w מראשת⁠ו|lemma="מְרַאֲשָׁה" strong="H4763" x-morph="He,Ncfpc:Sp3ms"\w* -\f + \ft Q \w מְרַאֲשֹׁתָ֛יו|lemma="מְרַאֲשָׁה" strong="H4763" x-morph="He,Ncfpc:Sp3ms"\w*\f* +\f + \ft Q \+w מְרַאֲשֹׁתָ֛יו|lemma="מְרַאֲשָׁה" strong="H4763" x-morph="He,Ncfpc:Sp3ms"\+w*\f* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w צַפַּ֥חַת|lemma="צַפַּחַת" strong="H6835" x-morph="He,Ncfsc"\w* \w הַ⁠מַּ֖יִם|lemma="מַיִם" strong="d:H4325" x-morph="He,Td:Ncmpa"\w* \w וְ⁠נֵ֥לֲכָה|lemma="יָלַךְ" strong="c:H3212" x-morph="He,C:Vqi1cp"\w* @@ -11503,7 +11503,7 @@ \w הַ⁠מַּ֖יִם|lemma="מַיִם" strong="d:H4325" x-morph="He,Td:Ncmpa"\w* \w אֲשֶׁ֥ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w מראשת⁠ו|lemma="מְרַאֲשָׁה" strong="H4763" x-morph="He,Ncfpc:Sp3ms"\w*׃ -\f + \ft Q \w מְרַאֲשֹׁתָֽיו|lemma="מְרַאֲשָׁה" strong="H4763" x-morph="He,Ncfpc:Sp3ms"\w*\f* +\f + \ft Q \+w מְרַאֲשֹׁתָֽיו|lemma="מְרַאֲשָׁה" strong="H4763" x-morph="He,Ncfpc:Sp3ms"\+w*\f* \v 17 \w וַ⁠יַּכֵּ֤ר|lemma="נָכַר" strong="c:H5234a" x-morph="He,C:Vhw3ms"\w* @@ -11614,7 +11614,7 @@ \w וַ⁠יֹּ֔אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* \w הִנֵּ֖ה|lemma="הִנֵּה" strong="H2009" x-morph="He,Tm"\w* \w חֲנִ֣ית|lemma="חֲנִית" strong="H2595" x-morph="He,Ncfsc"\w* -\f + \ft K \w החנית|lemma="חֲנִית" strong="d:H2595" x-morph="He,Td:Ncfsa"\w*\f* +\f + \ft K \+w החנית|lemma="חֲנִית" strong="d:H2595" x-morph="He,Td:Ncfsa"\+w*\f* \w הַ⁠מֶּ֑לֶךְ|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* \w וְ⁠יַעֲבֹ֛ר|lemma="עָבַר" strong="c:H5674a" x-morph="He,C:Vqi3ms" x-tw="rc://*/tw/dict/bible/other/preach"\w* \w אֶחָ֥ד|lemma="אֶחָד" strong="H0259" x-morph="He,Acmsa"\w* @@ -11743,7 +11743,7 @@ \w דָּוִ֖ד|lemma="דָּוִד" strong="H1732" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/david"\w* \w גַּ֑ת|lemma="גַּת" strong="H1661" x-morph="He,Np"\w* \w וְ⁠לֹֽא|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w*־\w יָסַ֥ף|lemma="יָסַף" strong="H3254" x-morph="He,Vqp3ms"\w* -\f + \ft K \w יוסף|lemma="יָסַף" strong="H3254" x-morph="He,Vqrmsa"\w*\f* +\f + \ft K \+w יוסף|lemma="יָסַף" strong="H3254" x-morph="He,Vqrmsa"\+w*\f* \w ע֖וֹד|lemma="עוֹד" strong="H5750" x-morph="He,D"\w* \w לְ⁠בַקְשֽׁ⁠וֹ|lemma="בָּקַשׁ" strong="l:H1245" x-morph="He,R:Vpc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/seek"\w*׃ס @@ -11803,7 +11803,7 @@ \w וַֽ⁠יִּפְשְׁט֛וּ|lemma="פָּשַׁט" strong="c:H6584" x-morph="He,C:Vqw3mp"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w הַ⁠גְּשׁוּרִ֥י|lemma="גְּשׁוּרִי" strong="d:H1651" x-morph="He,Td:Ngmsa"\w* \w ו⁠ה⁠גרזי|lemma="גִּזְרִי" strong="c:d:H1511" x-morph="He,C:Td:Ngmsa"\w* -\f + \ft Q \w וְהַגִּזְרִ֖י|lemma="גִּזְרִי" strong="c:d:H1511" x-morph="He,C:Td:Ngmsa"\w*\f* +\f + \ft Q \+w וְהַגִּזְרִ֖י|lemma="גִּזְרִי" strong="c:d:H1511" x-morph="He,C:Td:Ngmsa"\+w*\f* \w וְ⁠הָ⁠עֲמָלֵקִ֑י|lemma="עֲמָלֵקִי" strong="c:d:H6003" x-morph="He,C:Td:Ngmsa"\w* \w כִּ֣י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* \w הֵ֜נָּה|lemma="הֵנָּה" strong="H2007" x-morph="He,Pp3fp"\w* @@ -12012,7 +12012,7 @@ \w לָ֑יְלָה|lemma="לַיִל" strong="H3915" x-morph="He,Ncmsa"\w* \w וַ⁠יֹּ֗אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* \w קסומי|lemma="קָסַם" strong="H7080" x-morph="He,Vqv2fs"\w*־\w נָ֥א|lemma="קָסַם" strong="H7080" x-morph="He,Te"\w* -\f + \ft Q \w קָֽסֳמִי|lemma="קָסַם" strong="H7080" x-morph="He,Vqv2fs"\w*\f* +\f + \ft Q \+w קָֽסֳמִי|lemma="קָסַם" strong="H7080" x-morph="He,Vqv2fs"\+w*\f* \w לִ⁠י֙|lemma="" strong="l" x-morph="He,R:Sp1cs"\w* \w בָּ⁠א֔וֹב|lemma="אוֹב" strong="b:H0178" x-morph="He,Rd:Ncmsa"\w* \w וְ⁠הַ֣עֲלִי|lemma="עָלָה" strong="c:H5927" x-morph="He,C:Vhv2fs"\w* @@ -12400,7 +12400,7 @@ \w בַּֽ⁠אֲלָפָ֔י⁠ו|lemma="אֶלֶף" strong="b:H0505" x-morph="He,R:Acbpc:Sp3ms"\w* \w וְ⁠דָוִ֖ד|lemma="דָּוִד" strong="c:H1732" x-morph="He,C:Np"\w* \w בְּרִבְבֹתָֽיו|lemma="רְבָבָה" strong="b:H7233" x-morph="He,R:Ncfpc:Sp3ms"\w*׃ס -\f + \ft K \w ב⁠רבבת⁠ו|lemma="רְבָבָה" strong="b:H7233" x-morph="He,R:Ncfpc:Sp3ms"\w*\f* +\f + \ft K \+w ב⁠רבבת⁠ו|lemma="רְבָבָה" strong="b:H7233" x-morph="He,R:Ncfpc:Sp3ms"\+w*\f* \v 6 \w וַ⁠יִּקְרָ֨א|lemma="קָרָא" strong="c:H7121" x-morph="He,C:Vqw3ms" x-tw="rc://*/tw/dict/bible/other/declare"\w* @@ -12597,7 +12597,7 @@ \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w הָ⁠עָ֔ם|lemma="עַם" strong="d:H5971a" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* \w אִ֖ישׁ|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsa"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w בָּנָ֣יו|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/son"\w* -\f + \ft K \w בנ⁠ו|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w בנ⁠ו|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w וְ⁠עַל|lemma="עַל" strong="c:H5921a" x-morph="He,C:R"\w*־\w בְּנֹתָ֑י⁠ו|lemma="בַּת" strong="H1323" x-morph="He,Ncfpc:Sp3ms"\w* \w וַ⁠יִּתְחַזֵּ֣ק|lemma="חָזַק" strong="c:H2388" x-morph="He,C:Vtw3ms"\w* \w דָּוִ֔ד|lemma="דָּוִד" strong="H1732" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/david"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/10-2SA.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/10-2SA.usfm index 1667b24b..f4fba34b 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/10-2SA.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/10-2SA.usfm @@ -127,7 +127,7 @@ \w לִ֖⁠י|lemma="" strong="l" x-morph="He,R:Sp1cs"\w* \w מִי|lemma="מִי" strong="H4310" x-morph="He,Ti"\w*־\w אָ֑תָּה|lemma="אַתָּה" strong="H0859a" x-morph="He,Pp2ms"\w* \w וָאֹמַ֣ר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw1cs"\w* -\f + \ft K \w ו⁠יאמר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w*\f* +\f + \ft K \+w ו⁠יאמר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\+w*\f* \w אֵלָ֔י⁠ו|lemma="אֵל" strong="H0413" x-morph="He,R:Sp3ms"\w* \w עֲמָלֵקִ֖י|lemma="עֲמָלֵקִי" strong="H6003" x-morph="He,Ngmsa"\w* \w אָנֹֽכִי|lemma="אָנֹכִי" strong="H0595" x-morph="He,Pp1cs" x-tw="rc://*/tw/dict/bible/kt/pray"\w*׃ @@ -171,7 +171,7 @@ \w וַ⁠יַּחֲזֵ֥ק|lemma="חָזַק" strong="c:H2388" x-morph="He,C:Vhw3ms"\w* \w דָּוִ֛ד|lemma="דָּוִד" strong="H1732" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/david"\w* \w בִּבְגָדָ֖יו|lemma="בֶּגֶד" strong="b:H0899b" x-morph="He,R:Ncmpc:Sp3ms"\w* -\f + \ft K \w ב⁠בגד⁠ו|lemma="בֶּגֶד" strong="b:H0899b" x-morph="He,R:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ב⁠בגד⁠ו|lemma="בֶּגֶד" strong="b:H0899b" x-morph="He,R:Ncmsc:Sp3ms"\+w*\f* \w וַ⁠יִּקְרָעֵ֑⁠ם|lemma="קָרַע" strong="c:H7167" x-morph="He,C:Vqw3ms:Sp3mp"\w* \w וְ⁠גַ֥ם|lemma="גַּם" strong="c:H1571" x-morph="He,C:Ta"\w* \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w הָ⁠אֲנָשִׁ֖ים|lemma="אִישׁ" strong="d:H0376" x-morph="He,Td:Ncmpa"\w* @@ -238,7 +238,7 @@ \w אֵלָי⁠ו֙|lemma="אֵל" strong="H0413" x-morph="He,R:Sp3ms"\w* \w דָּוִ֔ד|lemma="דָּוִד" strong="H1732" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/david"\w* \w דָּמְךָ֖|lemma="דָּם" strong="H1818" x-morph="He,Ncmsc:Sp2ms" x-tw="rc://*/tw/dict/bible/kt/blood"\w* -\f + \ft K \w דמי⁠ך|lemma="דָּם" strong="H1818" x-morph="He,Ncmpc:Sp2ms"\w*\f* +\f + \ft K \+w דמי⁠ך|lemma="דָּם" strong="H1818" x-morph="He,Ncmpc:Sp2ms"\+w*\f* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w רֹאשֶׁ֑⁠ךָ|lemma="רֹאשׁ" strong="H7218a" x-morph="He,Ncmsc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/head"\w* \w כִּ֣י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* \w פִ֗י⁠ךָ|lemma="פֶּה" strong="H6310" x-morph="He,Ncmsc:Sp2ms"\w* @@ -744,7 +744,7 @@ \w וַ⁠יִּפָּל|lemma="נָפַל" strong="c:H5307" x-morph="He,C:Vqw3ms" x-tw="rc://*/tw/dict/bible/other/bow"\w*־\w שָׁ֖ם|lemma="שָׁם" strong="H8033" x-morph="He,D"\w* \w וַ⁠יָּ֣מָת|lemma="מוּת" strong="c:H4191" x-morph="He,C:Vqw3ms" x-tw="rc://*/tw/dict/bible/other/death"\w* \w תחת⁠ו|lemma="תַּחַת" strong="H8478" x-morph="He,R:Sp3ms"\w* -\f + \ft Q \w תַּחְתָּ֑יו|lemma="תַּחַת" strong="H8478" x-morph="He,R:Sp3ms"\w*\f* +\f + \ft Q \+w תַּחְתָּ֑יו|lemma="תַּחַת" strong="H8478" x-morph="He,R:Sp3ms"\+w*\f* \w וַ⁠יְהִ֡י|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqw3ms"\w* \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w הַ⁠בָּ֣א|lemma="בּוֹא" strong="d:H0935" x-morph="He,Td:Vqrmsa"\w* \w אֶֽל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w הַ⁠מָּקוֹם֩|lemma="מָקוֹם" strong="d:H4725" x-morph="He,Td:Ncmsa"\w* @@ -917,7 +917,7 @@ \v 2 \w ו⁠ילדו|lemma="יָלַד" strong="c:H3205" x-morph="He,C:VPw3mp"\w* -\f + \ft Q \w וַיִּוָּלְד֧וּ|lemma="יָלַד" strong="c:H3205" x-morph="He,C:VNw3mp"\w*\f* +\f + \ft Q \+w וַיִּוָּלְד֧וּ|lemma="יָלַד" strong="c:H3205" x-morph="He,C:VNw3mp"\+w*\f* \w לְ⁠דָוִ֛ד|lemma="דָּוִד" strong="l:H1732" x-morph="He,R:Np"\w* \w בָּנִ֖ים|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w בְּ⁠חֶבְר֑וֹן|lemma="חֶבְרוֹן" strong="b:H2275a" x-morph="He,R:Np"\w* @@ -931,7 +931,7 @@ \w וּ⁠מִשְׁנֵ֣⁠הוּ|lemma="מִשְׁנֶה" strong="c:H4932" x-morph="He,C:Ncmsc:Sp3ms"\w* \w כִלְאָ֔ב|lemma="כִּלְאָב" strong="H3609" x-morph="He,Np"\w* \w לַאֲֽבִיגַ֕יִל|lemma="אֲבִיגַיִל" strong="l:H0026" x-morph="He,R:Np"\w* -\f + \ft K \w ל⁠אביגל|lemma="אֲבִיגַיִל" strong="l:H0026" x-morph="He,R:Np"\w*\f* +\f + \ft K \+w ל⁠אביגל|lemma="אֲבִיגַיִל" strong="l:H0026" x-morph="He,R:Np"\+w*\f* \w אֵ֖שֶׁת|lemma="אִשָּׁה" strong="H0802" x-morph="He,Ncfsc"\w* \w נָבָ֣ל|lemma="נָבָל" strong="H5037" x-morph="He,Np"\w* \w הַֽ⁠כַּרְמְלִ֑י|lemma="כַּרְמְלִי" strong="d:H3761" x-morph="He,Td:Ngmsa"\w* @@ -1062,7 +1062,7 @@ \w מַלְאָכִ֧ים|lemma="מַלְאָךְ" strong="H4397" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/other/messenger"\w* ׀ \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w דָּוִ֛ד|lemma="דָּוִד" strong="H1732" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/david"\w* \w תַּחְתָּ֥יו|lemma="תַּחַת" strong="H8478" x-morph="He,R:Sp3ms"\w* -\f + \ft Q \w תחת⁠ו|lemma="תַּחַת" strong="H8478" x-morph="He,R:Sp3ms"\w*\f* +\f + \ft Q \+w תחת⁠ו|lemma="תַּחַת" strong="H8478" x-morph="He,R:Sp3ms"\+w*\f* \w לֵ⁠אמֹ֖ר|lemma="אָמַר" strong="l:H0559" x-morph="He,R:Vqc"\w* \w לְ⁠מִי|lemma="מִי" strong="l:H4310" x-morph="He,R:Ti"\w*־\w אָ֑רֶץ|lemma="אֶרֶץ" strong="H0776" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w* \w לֵ⁠אמֹ֗ר|lemma="אָמַר" strong="l:H0559" x-morph="He,R:Vqc"\w* @@ -1129,7 +1129,7 @@ \w מֵ⁠עִ֖ם|lemma="עִם" strong="m:H5973b" x-morph="He,R:R"\w* \w פַּלְטִיאֵ֥ל|lemma="פַּלְטִיאֵל" strong="H6409" x-morph="He,Np"\w* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w לָֽיִשׁ|lemma="לוּשׁ" strong="H3919" x-morph="He,Np"\w*׃ -\f + \ft K \w לוש|lemma="לָֽיִשׁ" strong="H3919" x-morph="He,Np"\w*\f* +\f + \ft K \+w לוש|lemma="לָֽיִשׁ" strong="H3919" x-morph="He,Np"\+w*\f* \v 16 \w וַ⁠יֵּ֨לֶךְ|lemma="יָלַךְ" strong="c:H3212" x-morph="He,C:Vqw3ms"\w* @@ -1296,7 +1296,7 @@ \w וְ⁠לָ⁠דַ֜עַת|lemma="יָדַע" strong="c:l:H3045" x-morph="He,C:R:Vqc"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w מוֹצָֽאֲ⁠ךָ֙|lemma="מוֹצָא" strong="H4161" x-morph="He,Ncmsc:Sp2ms"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w מבוא⁠ך|lemma="מָבוֹא" strong="H3996" x-morph="He,Ncmsc:Sp2ms"\w* -\f + \ft Q \w מ֣וֹבָאֶ֔ךָ|lemma="מָבוֹא" strong="H3996" x-morph="He,Ncmsc:Sp2ms"\w*\f* +\f + \ft Q \+w מ֣וֹבָאֶ֔ךָ|lemma="מָבוֹא" strong="H3996" x-morph="He,Ncmsc:Sp2ms"\+w*\f* \w וְ⁠לָ⁠דַ֕עַת|lemma="יָדַע" strong="c:l:H3045" x-morph="He,C:R:Vqc"\w* \w אֵ֛ת|lemma="אֵת" strong="H0853" x-morph="He,To"\w* \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w אֲשֶׁ֥ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* @@ -1767,11 +1767,11 @@ \w עָלֵ֔י⁠נוּ|lemma="עַל" strong="H5921a" x-morph="He,R:Sp1cp"\w* \w אַתָּ֗ה|lemma="אַתָּה" strong="H0859a" x-morph="He,Pp2ms"\w* \w הָיִ֛יתָ|lemma="הָיָה" strong="H1961" x-morph="He,Vqp2ms"\w* -\f + \ft K \w הייתה|lemma="הָיָה" strong="H1961" x-morph="He,Vqp2ms"\w*\f* +\f + \ft K \+w הייתה|lemma="הָיָה" strong="H1961" x-morph="He,Vqp2ms"\+w*\f* \w הַמּוֹצִ֥יא|lemma="יָצָא" strong="d:H3318" x-morph="He,Td:Vhrmsa"\w* -\f + \ft K \w מוציא|lemma="יָצָא" strong="H3318" x-morph="He,Vhrmsa"\w*\f* +\f + \ft K \+w מוציא|lemma="יָצָא" strong="H3318" x-morph="He,Vhrmsa"\+w*\f* \w וְהַמֵּבִ֖יא|lemma="בּוֹא" strong="c:d:H0935" x-morph="He,C:Td:Vhrmsa"\w* -\f + \ft K \w ו⁠ה⁠מבי|lemma="בּוֹא" strong="c:d:H0935" x-morph="He,C:Td:Vhrmsa"\w*\f* +\f + \ft K \+w ו⁠ה⁠מבי|lemma="בּוֹא" strong="c:d:H0935" x-morph="He,C:Td:Vhrmsa"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w יִשְׂרָאֵ֑ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w וַ⁠יֹּ֨אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* \w יְהוָ֜ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* @@ -1875,8 +1875,8 @@ \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w הַ֣⁠עִוְרִ֔ים|lemma="עִוֵּר" strong="d:H5787" x-morph="He,Td:Aampa"\w* \w שנאה|lemma="שָׂנֵא" strong="H8130" x-morph="He,Vqp3fs"\w* \f + \ft From Qumran manuscript 4Q51\f* -\f + \ft Q \w שְׂנֻאֵ֖י|lemma="שָׂנֵא" strong="H8130" x-morph="He,Vqsmpc"\w*\f* -\f + \ft K \w שנאו|lemma="שָׂנֵא" strong="H8130" x-morph="He,Vqp3cp"\w*\f* +\f + \ft Q \+w שְׂנֻאֵ֖י|lemma="שָׂנֵא" strong="H8130" x-morph="He,Vqsmpc"\+w*\f* +\f + \ft K \+w שנאו|lemma="שָׂנֵא" strong="H8130" x-morph="He,Vqp3cp"\+w*\f* \w נֶ֣פֶשׁ|lemma="נֶפֶשׁ" strong="H5315" x-morph="He,Ncbsc" x-tw="rc://*/tw/dict/bible/kt/life"\w* \w דָּוִ֑ד|lemma="דָּוִד" strong="H1732" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/david"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w כֵּן֙|lemma="כֵּן" strong="H3651c" x-morph="He,Tm"\w* @@ -2073,7 +2073,7 @@ \v 24 \w וִ֠⁠יהִי|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqj3ms"\w* \w ב⁠שמע⁠ך|lemma="שָׁמַע" strong="b:H8085" x-morph="He,R:Vqc:Sp2ms"\w* -\f + \ft Q \w כְּֽשָׁמְעֲךָ֞|lemma="שָׁמַע" strong="k:H8085" x-morph="He,R:Vqc:Sp2ms"\w*\f* +\f + \ft Q \+w כְּֽשָׁמְעֲךָ֞|lemma="שָׁמַע" strong="k:H8085" x-morph="He,R:Vqc:Sp2ms"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w ק֧וֹל|lemma="קוֹל" strong="H6963a" x-morph="He,Ncmsc"\w* \w צְעָדָ֛ה|lemma="צְעָדָה" strong="H6807a" x-morph="He,Ncfsa"\w* \w בְּ⁠רָאשֵׁ֥י|lemma="רֹאשׁ" strong="b:H7218a" x-morph="He,R:Ncmpc" x-tw="rc://*/tw/dict/bible/other/head"\w* @@ -3568,7 +3568,7 @@ \w מִ⁠כֹּל֙|lemma="כֹּל" strong="m:H3605" x-morph="He,R:Ncmsc"\w* \w בְּחוּרֵ֣י|lemma="בָּחַר" strong="H0977" x-morph="He,Vqsmpc"\w* \w יִשְׂרָאֵ֔ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* -\f + \ft K \w ב⁠ישראל|lemma="יִשְׂרָאֵל" strong="b:H3478" x-morph="He,R:Np"\w*\f* +\f + \ft K \+w ב⁠ישראל|lemma="יִשְׂרָאֵל" strong="b:H3478" x-morph="He,R:Np"\+w*\f* \w וַֽ⁠יַּעֲרֹ֖ךְ|lemma="עָרַךְ" strong="c:H6186a" x-morph="He,C:Vqw3ms"\w* \w לִ⁠קְרַ֥את|lemma="קִרְאָה" strong="l:H7125" x-morph="He,R:Vqc"\w* \w אֲרָֽם|lemma="אֲרָם" strong="H0758" x-morph="He,Np"\w*׃ @@ -4089,9 +4089,9 @@ \v 24 \w וַיֹּר֨וּ|lemma="יָרָה" strong="c:H3384a" x-morph="He,C:Vhw3mp"\w* -\f + \ft K \w ו⁠יראו|lemma="יָרָה" strong="c:H3384a" x-morph="He,C:Vhw3mp"\w*\f* +\f + \ft K \+w ו⁠יראו|lemma="יָרָה" strong="c:H3384a" x-morph="He,C:Vhw3mp"\+w*\f* \w הַמּוֹרִ֤ים|lemma="יָרָה" strong="d:H3384a" x-morph="He,Td:Vhrmpa"\w* -\f + \ft K \w ה⁠מוראים|lemma="יָרָה" strong="d:H3384a" x-morph="He,Td:Vhrmpa"\w*\f* +\f + \ft K \+w ה⁠מוראים|lemma="יָרָה" strong="d:H3384a" x-morph="He,Td:Vhrmpa"\+w*\f* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w עֲבָדֶ֨⁠ךָ֙|lemma="עֶבֶד" strong="H5650" x-morph="He,Ncmpc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/servant"\w* \w מֵ⁠עַ֣ל|lemma="עַל" strong="m:H5921a" x-morph="He,R:R"\w* \w הַ⁠חוֹמָ֔ה|lemma="חוֹמָה" strong="d:H2346" x-morph="He,Td:Ncfsa"\w* @@ -4300,7 +4300,7 @@ \w לַ⁠עֲשׂ֣וֹת|lemma="עָשָׂה" strong="l:H6213a" x-morph="He,R:Vqc"\w* \w הָ⁠רַע֮|lemma="רַע" strong="d:H7451a" x-morph="He,Td:Aamsa" x-tw="rc://*/tw/dict/bible/kt/evil"\w* \w בְּעֵינַי֒|lemma="עַיִן" strong="b:H5869a" x-morph="He,R:Ncbdc:Sp1cs"\w* -\f + \ft K \w ב⁠עינ⁠ו|lemma="עַיִן" strong="b:H5869a" x-morph="He,R:Ncbdc:Sp3ms"\w*\f* +\f + \ft K \+w ב⁠עינ⁠ו|lemma="עַיִן" strong="b:H5869a" x-morph="He,R:Ncbdc:Sp3ms"\+w*\f* \w אֵ֣ת|lemma="אֵת" strong="H0853" x-morph="He,To"\w* \w אוּרִיָּ֤ה|lemma="אוּרִיָּה" strong="H0223a" x-morph="He,Np"\w* \w הַֽ⁠חִתִּי֙|lemma="חִתִּי" strong="d:H2850" x-morph="He,Td:Ngmsa" x-tw="rc://*/tw/dict/bible/names/hittite"\w* @@ -4495,7 +4495,7 @@ \w וַ⁠יָּ֗סֶךְ|lemma="סוּךְ" strong="c:H5480" x-morph="He,C:Vqw3ms" x-tw="rc://*/tw/dict/bible/kt/anoint"\w* \w וַ⁠יְחַלֵּף֙|lemma="חָלַף" strong="c:H2498" x-morph="He,C:Vpw3ms"\w* \w שִׂמְלֹתָ֔יו|lemma="שִׂמְלָה" strong="H8071" x-morph="He,Ncfpc:Sp3ms"\w* -\f + \ft K \w שמלת⁠ו|lemma="שִׂמְלָה" strong="H8071" x-morph="He,Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w שמלת⁠ו|lemma="שִׂמְלָה" strong="H8071" x-morph="He,Ncfsc:Sp3ms"\+w*\f* \w וַ⁠יָּבֹ֥א|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3ms"\w* \w בֵית|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w*־\w יְהוָ֖ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w וַ⁠יִּשְׁתָּ֑חוּ|lemma="שָׁחָה" strong="c:H7812" x-morph="He,C:Vtw3ms" x-tw="rc://*/tw/dict/bible/kt/worship"\w* @@ -4539,7 +4539,7 @@ \w מִ֣י|lemma="מִי" strong="H4310" x-morph="He,Ti"\w* \w יוֹדֵ֔עַ|lemma="יָדַע" strong="H3045" x-morph="He,Vqrmsa" x-tw="rc://*/tw/dict/bible/other/know"\w* \w יחנ⁠ני|lemma="חָנַן" strong="H2603a" x-morph="He,Vqi3ms:Sp1cs"\w* -\f + \ft Q \w וְחַנַּ֥נִי|lemma="חָנַן" strong="H2603a" x-morph="He,Vqq3ms:Sp1cs"\w*\f* +\f + \ft Q \+w וְחַנַּ֥נִי|lemma="חָנַן" strong="H2603a" x-morph="He,Vqq3ms:Sp1cs"\+w*\f* \w יְהוָ֖ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w וְ⁠חַ֥י|lemma="חַי" strong="c:H2416a" x-morph="He,C:Vqq3ms"\w* \w הַ⁠יָּֽלֶד|lemma="יֶלֶד" strong="d:H3206" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/kt/children"\w*׃ @@ -4574,7 +4574,7 @@ \w וַ⁠תֵּ֣לֶד|lemma="יָלַד" strong="c:H3205" x-morph="He,C:Vqw3fs"\w* \w בֵּ֗ן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w ו⁠יקרא|lemma="קָרָא" strong="c:H7121" x-morph="He,C:Vqw3ms" x-tw="rc://*/tw/dict/bible/other/declare"\w* -\f + \ft Q \w וַתִּקְרָ֤א|lemma="קָרָא" strong="c:H7121" x-morph="He,C:Vqw3fs"\w*\f* +\f + \ft Q \+w וַתִּקְרָ֤א|lemma="קָרָא" strong="c:H7121" x-morph="He,C:Vqw3fs"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w שְׁמ⁠וֹ֙|lemma="שֵׁם" strong="H8034" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/name"\w* \w שְׁלֹמֹ֔ה|lemma="שְׁלֹמֹה" strong="H8010" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/solomon"\w* \w וַ⁠יהוָ֖ה|lemma="יְהֹוָה" strong="c:H3068" x-morph="He,C:Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* @@ -4670,7 +4670,7 @@ \w וְ⁠הֶעֱבִ֤יר|lemma="עָבַר" strong="c:H5674a" x-morph="He,C:Vhp3ms" x-tw="rc://*/tw/dict/bible/other/preach"\w* \w אוֹתָ⁠ם֙|lemma="אֵת" strong="H0853" x-morph="He,To:Sp3mp"\w* \w בַּמַּלְבֵּ֔ן|lemma="מַלְבֵּן" strong="b:H4404" x-morph="He,Rd:Ncmsa"\w* -\f + \ft K \w ב⁠מלכן|lemma="מַלְבֵּן" strong="b:H4404" x-morph="He,Rd:Ncmsa"\w*\f* +\f + \ft K \+w ב⁠מלכן|lemma="מַלְבֵּן" strong="b:H4404" x-morph="He,Rd:Ncmsa"\+w*\f* \w וְ⁠כֵ֣ן|lemma="כֵּן" strong="c:H3651c" x-morph="He,C:Tm"\w* \w יַעֲשֶׂ֔ה|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqi3ms"\w* \w לְ⁠כֹ֖ל|lemma="כֹּל" strong="l:H3605" x-morph="He,R:Ncmsc"\w* @@ -4822,7 +4822,7 @@ \w וַ⁠תִּקַּ֨ח|lemma="לָקַח" strong="c:H3947" x-morph="He,C:Vqw3fs"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ⁠בָּצֵ֤ק|lemma="בָּצֵק" strong="d:H1217" x-morph="He,Td:Ncmsa"\w* \w וַתָּ֙לָשׁ֙|lemma="לוּשׁ" strong="c:H3888" x-morph="He,C:Vqw3fs"\w* -\f + \ft K \w ו⁠תלוש|lemma="לוּשׁ" strong="c:H3888" x-morph="He,C:Vqw3fs"\w*\f* +\f + \ft K \+w ו⁠תלוש|lemma="לוּשׁ" strong="c:H3888" x-morph="He,C:Vqw3fs"\+w*\f* \w וַ⁠תְּלַבֵּ֣ב|lemma="לָבַב" strong="c:H3823b" x-morph="He,C:Vpw3fs"\w* \w לְ⁠עֵינָ֔י⁠ו|lemma="עַיִן" strong="l:H5869a" x-morph="He,R:Ncbdc:Sp3ms"\w* \w וַ⁠תְּבַשֵּׁ֖ל|lemma="בָּשַׁל" strong="c:H1310" x-morph="He,C:Vpw3fs"\w* @@ -5239,7 +5239,7 @@ \w הַ⁠נַּ֤עַר|lemma="נַעַר" strong="d:H5288" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/servant"\w* \w הַ⁠צֹּפֶה֙|lemma="צָפָה" strong="d:H6822" x-morph="He,Td:Vqrmsa"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w עֵינָ֔יו|lemma="עַיִן" strong="H5869a" x-morph="He,Ncbdc:Sp3ms"\w* -\f + \ft K \w עינ⁠ו|lemma="עַיִן" strong="H5869a" x-morph="He,Ncbsc:Sp3ms"\w*\f* +\f + \ft K \+w עינ⁠ו|lemma="עַיִן" strong="H5869a" x-morph="He,Ncbsc:Sp3ms"\+w*\f* \w וַ⁠יַּ֗רְא|lemma="רָאָה" strong="c:H7200" x-morph="He,C:Vqw3ms"\w* \w וְ⁠הִנֵּ֨ה|lemma="הִנֵּה" strong="c:H2009" x-morph="He,C:Tm"\w* \w עַם|lemma="עַם" strong="H5971a" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w*־\w רַ֜ב|lemma="רַב" strong="H7227a" x-morph="He,Aamsa"\w* @@ -5284,7 +5284,7 @@ \w וַ⁠יֵּ֛לֶךְ|lemma="יָלַךְ" strong="c:H3212" x-morph="He,C:Vqw3ms"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w תַּלְמַ֥י|lemma="תַּלְמַי" strong="H8526" x-morph="He,Np"\w* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w עַמִּיה֖וּד|lemma="עַמִּיחוּר" strong="H5991" x-morph="He,Np"\w* -\f + \ft K \w עמיחור|lemma="עַמִּיחוּר" strong="H5991" x-morph="He,Np"\w*\f* +\f + \ft K \+w עמיחור|lemma="עַמִּיחוּר" strong="H5991" x-morph="He,Np"\+w*\f* \w מֶ֣לֶךְ|lemma="מֶלֶךְ" strong="H4428" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/king"\w* \w גְּשׁ֑וּר|lemma="גְּשׁוּר" strong="H1650" x-morph="He,Np"\w* \w וַ⁠יִּתְאַבֵּ֥ל|lemma="אָבַל" strong="c:H0056" x-morph="He,C:Vtw3ms" x-tw="rc://*/tw/dict/bible/other/mourn"\w* @@ -5419,7 +5419,7 @@ \w נִשְׁאָ֔רָה|lemma="שָׁאַר" strong="H7604" x-morph="He,VNp3fs"\w* \w לְ⁠בִלְתִּ֧י|lemma="בִּלְתִּי" strong="l:H1115" x-morph="He,R:C"\w* \w שום|lemma="שׂוּם" strong="H7760a" x-morph="He,Vqc"\w*־\w לְ⁠אִישִׁ֛⁠י|lemma="אִישׁ" strong="l:H0376" x-morph="He,R:Ncmsc:Sp1cs"\w* -\f + \ft Q \w שִׂים|lemma="שׂוּם" strong="H7760a" x-morph="He,Vqc"\w*\f* +\f + \ft Q \+w שִׂים|lemma="שׂוּם" strong="H7760a" x-morph="He,Vqc"\+w*\f* \w שֵׁ֥ם|lemma="שֵׁם" strong="H8034" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/kt/name"\w* \w וּ⁠שְׁאֵרִ֖ית|lemma="שְׁאֵרִית" strong="c:H7611" x-morph="He,C:Ncfsa"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w פְּנֵ֥י|lemma="פָּנִים" strong="H6440" x-morph="He,Ncbpc" x-tw="rc://*/tw/dict/bible/other/face"\w* @@ -5469,7 +5469,7 @@ \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w יְהוָ֣ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w אֱלֹהֶ֗י⁠ךָ|lemma="אֱלֹהִים" strong="H0430" x-morph="He,Ncmpc:Sp2ms" x-tw="rc://*/tw/dict/bible/kt/god"\w* \w מ⁠הרבית|lemma="רָבָה" strong="m:H7235a" x-morph="He,R:Vhc"\w* -\f + \ft Q \w מֵהַרְבַּ֞ת|lemma="רָבָה" strong="m:H7235a" x-morph="He,R:Vhc"\w*\f* +\f + \ft Q \+w מֵהַרְבַּ֞ת|lemma="רָבָה" strong="m:H7235a" x-morph="He,R:Vhc"\+w*\f* \w גֹּאֵ֤ל|lemma="גָּאַל" strong="H1350a" x-morph="He,Vqrmsc" x-tw="rc://*/tw/dict/bible/kt/redeem"\w* \w הַ⁠דָּם֙|lemma="דָּם" strong="d:H1818" x-morph="He,Td:Ncmsa"\w* \w לְ⁠שַׁחֵ֔ת|lemma="שָׁחַת" strong="l:H7843" x-morph="He,R:Vpc"\w* @@ -5693,7 +5693,7 @@ \w הַ⁠מֶּ֖לֶךְ|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w דְּבַ֥ר|lemma="דָּבָר" strong="H1697" x-morph="He,Ncmsc"\w* \w עַבְדֶּֽךָ|lemma="עֶבֶד" strong="H5650" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/servant"\w*׃ -\f + \ft K \w עבד⁠ו|lemma="עֶבֶד" strong="H5650" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w עבד⁠ו|lemma="עֶבֶד" strong="H5650" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \v 23 \w וַ⁠יָּ֥קָם|lemma="קוּם" strong="c:H6965b" x-morph="He,C:Vqw3ms"\w* @@ -5810,7 +5810,7 @@ \w שְׂעֹרִ֔ים|lemma="שְׂעֹרָה" strong="H8184" x-morph="He,Ncfpa" x-tw="rc://*/tw/dict/bible/other/barley"\w* \w לְכ֖וּ|lemma="יָלַךְ" strong="H3212" x-morph="He,Vqv2mp" x-tw="rc://*/tw/dict/bible/other/walk"\w* \w וְהַצִּית֣וּהָ|lemma="יָצַת" strong="c:H3341" x-morph="He,C:Vhv2mp:Sp3fs"\w* -\f + \ft K \w ו⁠הוצתי⁠ה|lemma="יָצַת" strong="c:H3341" x-morph="He,C:Vhq1cs:Sp3fs"\w*\f* +\f + \ft K \+w ו⁠הוצתי⁠ה|lemma="יָצַת" strong="c:H3341" x-morph="He,C:Vhq1cs:Sp3fs"\+w*\f* \w בָ⁠אֵ֑שׁ|lemma="אֵשׁ" strong="b:H0784" x-morph="He,Rd:Ncbsa" x-tw="rc://*/tw/dict/bible/other/fire"\w* \w וַ⁠יַּצִּ֜תוּ|lemma="יָצַת" strong="c:H3341" x-morph="He,C:Vhw3mp"\w* \w עַבְדֵ֧י|lemma="עֶבֶד" strong="H5650" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/other/servant"\w* @@ -6001,7 +6001,7 @@ \w בַּ⁠אֲרָ֖ם|lemma="אֲרָם" strong="b:H0758" x-morph="He,R:Np"\w* \w לֵ⁠אמֹ֑ר|lemma="אָמַר" strong="l:H0559" x-morph="He,R:Vqc"\w* \w אִם|lemma="אִם" strong="H0518a" x-morph="He,C"\w*־\w יָשׁ֨וֹב|lemma="שׁוּב" strong="H7725" x-morph="He,Vqi3ms" x-tw="rc://*/tw/dict/bible/kt/restore"\w* -\f + \ft K \w ישיב|lemma="שׁוּב" strong="H7725" x-morph="He,Vhi3ms"\w*\f* +\f + \ft K \+w ישיב|lemma="שׁוּב" strong="H7725" x-morph="He,Vhi3ms"\+w*\f* \w יְשִׁיבֵ֤⁠נִי|lemma="שׁוּב" strong="H7725" x-morph="He,Vhi3ms:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/restore"\w* \w יְהוָה֙|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w יְר֣וּשָׁלִַ֔ם|lemma="יְרוּשָׁלִַ͏ם" strong="H3389" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jerusalem"\w* @@ -6172,7 +6172,7 @@ \w בּוֹאֶ֗⁠ךָ|lemma="בּוֹא" strong="H0935" x-morph="He,Vqc:Sp2ms"\w* \w וְ⁠הַ⁠יּ֞וֹם|lemma="יוֹם" strong="c:d:H3117" x-morph="He,C:Td:Ncmsa"\w* \w אֲנִֽיעֲךָ֤|lemma="נוּעַ" strong="H5128" x-morph="He,Vhi1cs:Sp2ms"\w* -\f + \ft K \w אנוע⁠ך|lemma="נוּעַ" strong="H5128" x-morph="He,Vqi1cs:Sp2ms"\w*\f* +\f + \ft K \+w אנוע⁠ך|lemma="נוּעַ" strong="H5128" x-morph="He,Vqi1cs:Sp2ms"\+w*\f* \w עִמָּ֨⁠נוּ֙|lemma="עִם" strong="H5973a" x-morph="He,R:Sp1cp"\w* \w לָ⁠לֶ֔כֶת|lemma="יָלַךְ" strong="l:H3212" x-morph="He,R:Vqc"\w* \w וַ⁠אֲנִ֣י|lemma="אֲנִי" strong="c:H0589" x-morph="He,C:Pp1cs"\w* @@ -6310,7 +6310,7 @@ \w אָנֹכִ֣י|lemma="אָנֹכִי" strong="H0595" x-morph="He,Pp1cs" x-tw="rc://*/tw/dict/bible/kt/pray"\w* \w מִתְמַהְמֵ֔הַּ|lemma="מָהַהּ" strong="H4102" x-morph="He,Vfrmsa"\w* \w ב⁠עברות|lemma="עֲבָרָה" strong="b:H5679" x-morph="He,R:Ncfpc"\w* -\f + \ft Q \w בְּעַֽרְב֖וֹת|lemma="עֲבָרָה" strong="b:H6160" x-morph="He,R:Ncfpc"\w*\f* +\f + \ft Q \+w בְּעַֽרְב֖וֹת|lemma="עֲבָרָה" strong="b:H6160" x-morph="He,R:Ncfpc"\+w*\f* \w הַ⁠מִּדְבָּ֑ר|lemma="מִדְבָּר" strong="d:H4057b" x-morph="He,Td:Ncmsa"\w* \w עַ֣ד|lemma="עַד" strong="H5704" x-morph="He,R"\w* \w בּ֥וֹא|lemma="בּוֹא" strong="H0935" x-morph="He,Vqc"\w* @@ -6497,7 +6497,7 @@ \w לְ⁠בֵית|lemma="בַּיִת" strong="l:H1004b" x-morph="He,R:Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w*־\w הַ⁠מֶּ֜לֶךְ|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* \w לִ⁠רְכֹּ֗ב|lemma="רָכַב" strong="l:H7392" x-morph="He,R:Vqc"\w* \w וְהַלֶּ֤חֶם|lemma="לֶחֶם" strong="c:d:H3899" x-morph="He,C:R:Td:Ncbsa"\w* -\f + \ft K \w ו⁠ל⁠ה⁠לחם|lemma="לֶחֶם" strong="c:l:d:H3899" x-morph="He,C:R:Td:Ncbsa"\w*\f* +\f + \ft K \+w ו⁠ל⁠ה⁠לחם|lemma="לֶחֶם" strong="c:l:d:H3899" x-morph="He,C:R:Td:Ncbsa"\+w*\f* \w וְ⁠הַ⁠קַּ֨יִץ֙|lemma="קַיִץ" strong="c:d:H7019" x-morph="He,C:Td:Ncmsa"\w* \w לֶ⁠אֱכ֣וֹל|lemma="אָכַל" strong="l:H0398" x-morph="He,R:Vqc"\w* \w הַ⁠נְּעָרִ֔ים|lemma="נַעַר" strong="d:H5288" x-morph="He,Td:Ncmpa" x-tw="rc://*/tw/dict/bible/other/servant"\w* @@ -6596,7 +6596,7 @@ \w אֲשֶׁ֤ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w מָלַ֨כְתָּ֙|lemma="מָלַךְ" strong="H4427a" x-morph="He,Vqp2ms"\w* \w תחת⁠ו|lemma="תַּחַת" strong="H8478" x-morph="He,R:Sp3ms"\w* -\f + \ft Q \w תַּחְתָּ֔יו|lemma="תַּחַת" strong="H8478" x-morph="He,R:Sp3ms"\w*\f* +\f + \ft Q \+w תַּחְתָּ֔יו|lemma="תַּחַת" strong="H8478" x-morph="He,R:Sp3ms"\+w*\f* \w וַ⁠יִּתֵּ֤ן|lemma="נָתַן" strong="c:H5414" x-morph="He,C:Vqw3ms"\w* \w יְהוָה֙|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ⁠מְּלוּכָ֔ה|lemma="מְלוּכָה" strong="d:H4410" x-morph="He,Td:Ncfsa"\w* @@ -6634,10 +6634,10 @@ \w בְּנֵ֣י|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w צְרֻיָ֑ה|lemma="צְרוּיָה" strong="H6870" x-morph="He,Np"\w* \w כי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* -\f + \ft Q \w כֹּ֣ה|lemma="כֹּה" strong="H3541" x-morph="He,R"\w*\f* +\f + \ft Q \+w כֹּ֣ה|lemma="כֹּה" strong="H3541" x-morph="He,R"\+w*\f* \w יְקַלֵּ֗ל|lemma="קָלַל" strong="H7043" x-morph="He,Vpi3ms"\w* \w כִּ֤י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* -\f + \ft K \w ו⁠כי|lemma="כִּי" strong="c:H3588a" x-morph="He,C:C"\w*\f* +\f + \ft K \+w ו⁠כי|lemma="כִּי" strong="c:H3588a" x-morph="He,C:C"\+w*\f* \w יְהוָה֙|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w אָ֤מַר|lemma="אָמַר" strong="H0559" x-morph="He,Vqp3ms"\w* \w ל⁠וֹ֙|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* @@ -6675,7 +6675,7 @@ \w יִרְאֶ֥ה|lemma="רָאָה" strong="H7200" x-morph="He,Vqi3ms"\w* \w יְהוָ֖ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w ב⁠עונ⁠י|lemma="עָוֹן" strong="b:H5771" x-morph="He,R:Ncbsc:Sp1cs"\w* -\f + \ft Q \w בְּעֵינִ֑י|lemma="עַיִן" strong="b:H5869" x-morph="He,R:Ncbsc:Sp1cs"\w*\f* +\f + \ft Q \+w בְּעֵינִ֑י|lemma="עַיִן" strong="b:H5869" x-morph="He,R:Ncbsc:Sp1cs"\+w*\f* \w וְ⁠הֵשִׁ֨יב|lemma="שׁוּב" strong="c:H7725" x-morph="He,C:Vhq3ms" x-tw="rc://*/tw/dict/bible/other/return"\w* \w יְהוָ֥ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w לִ⁠י֙|lemma="" strong="l" x-morph="He,R:Sp1cs"\w* @@ -6763,7 +6763,7 @@ \w וְ⁠כָל|lemma="כֹּל" strong="c:H3605" x-morph="He,C:Ncmsc"\w*־\w אִ֣ישׁ|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsc"\w* \w יִשְׂרָאֵ֑ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w ל֥וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* -\f + \ft K \w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*\f* +\f + \ft K \+w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\+w*\f* \w אֶהְיֶ֖ה|lemma="הָיָה" strong="H1961" x-morph="He,Vqi1cs"\w* \w וְ⁠אִתּ֥⁠וֹ|lemma="אֵת" strong="c:H0854" x-morph="He,C:R:Sp3ms"\w* \w אֵשֵֽׁב|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqi1cs"\w*׃ @@ -7023,7 +7023,7 @@ \w וּ⁠בָ֣אנוּ|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqq1cp"\w* \w אֵלָ֗י⁠ו|lemma="אֵל" strong="H0413" x-morph="He,R:Sp3ms"\w* \w בְּאַחַ֤ד|lemma="אֶחָד" strong="b:H0259" x-morph="He,R:Acmsc"\w* -\f + \ft K \w ב⁠אחת|lemma="אֶחָד" strong="b:H0259" x-morph="He,R:Acfsc"\w*\f* +\f + \ft K \+w ב⁠אחת|lemma="אֶחָד" strong="b:H0259" x-morph="He,R:Acfsc"\+w*\f* \w הַ⁠מְּקוֹמֹת֙|lemma="מָקוֹם" strong="d:H4725" x-morph="He,Td:Ncmpa"\w* \w אֲשֶׁ֣ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w נִמְצָ֣א|lemma="מָצָא" strong="H4672" x-morph="He,VNp3ms"\w* @@ -7406,7 +7406,7 @@ \w כִּי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w תִֽהְיֶה|lemma="הָיָה" strong="H1961" x-morph="He,Vqi2ms"\w*־\w לָּ֥⁠נוּ|lemma="" strong="l" x-morph="He,R:Sp1cp"\w* \w מֵ⁠עִ֖יר|lemma="עִיר" strong="m:H5892b" x-morph="He,R:Ncfsa"\w* \w לַעְזֽוֹר|lemma="עָזַר" strong="l:H5826" x-morph="He,R:Vqc"\w*׃ס -\f + \ft K \w ל⁠עזיר|lemma="עָזַר" strong="l:H5826" x-morph="He,R:Vhc"\w*\f* +\f + \ft K \+w ל⁠עזיר|lemma="עָזַר" strong="l:H5826" x-morph="He,R:Vhc"\+w*\f* \v 4 \w וַ⁠יֹּ֤אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* @@ -7473,7 +7473,7 @@ \w וַ⁠תְּהִי|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqw3fs"\w*־\w שָׁ֧ם|lemma="שָׁם" strong="H8033" x-morph="He,D"\w* \w הַ⁠מִּלְחָמָ֛ה|lemma="מִלְחָמָה" strong="d:H4421" x-morph="He,Td:Ncfsa"\w* \w נָפֹ֖צֶת|lemma="פּוּץ" strong="H6327a" x-morph="He,VNsfsa"\w* -\f + \ft K \w נפצית|lemma="פּוּץ" strong="H6327a" x-morph="He,VNsfpa"\w*\f* +\f + \ft K \+w נפצית|lemma="פּוּץ" strong="H6327a" x-morph="He,VNsfpa"\+w*\f* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w פְּנֵ֣י|lemma="פָּנִים" strong="H6440" x-morph="He,Ncbpc" x-tw="rc://*/tw/dict/bible/other/face"\w* \w כָל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w הָ⁠אָ֑רֶץ|lemma="אֶרֶץ" strong="d:H0776" x-morph="He,Td:Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w* \w וַ⁠יֶּ֤רֶב|lemma="רָבָה" strong="c:H7235a" x-morph="He,C:Vhw3ms"\w* @@ -7551,7 +7551,7 @@ \w הָ⁠אִישׁ֙|lemma="אִישׁ" strong="d:H0376" x-morph="He,Td:Ncmsa"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w יוֹאָ֔ב|lemma="יוֹאָב" strong="H3097" x-morph="He,Np"\w* \w וְל֨וּא|lemma="לוּא" strong="c:H3863" x-morph="He,C:C"\w* -\f + \ft K \w ו⁠לא|lemma="לא" strong="c:H3808" x-morph="He,C:Tn"\w*\f* +\f + \ft K \+w ו⁠לא|lemma="לא" strong="c:H3808" x-morph="He,C:Tn"\+w*\f* \w אָנֹכִ֜י|lemma="אָנֹכִי" strong="H0595" x-morph="He,Pp1cs" x-tw="rc://*/tw/dict/bible/kt/pray"\w* \w שֹׁקֵ֤ל|lemma="שָׁקַל" strong="H8254" x-morph="He,Vqrmsa"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w כַּפַּ⁠י֙|lemma="כַּף" strong="H3709" x-morph="He,Ncfdc:Sp1cs" x-tw="rc://*/tw/dict/bible/other/hand"\w* @@ -7575,7 +7575,7 @@ \v 13 \w אֽוֹ|lemma="אוֹ" strong="H0176a" x-morph="He,C"\w*־\w עָשִׂ֤יתִי|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqp1cs"\w* \w בְנַפְשִׁי֙|lemma="נֶפֶשׁ" strong="b:H5315" x-morph="He,R:Ncbsc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/heart"\w* -\f + \ft K \w ב⁠נפש⁠ו|lemma="נֶפֶשׁ" strong="b:H5315" x-morph="He,R:Ncbsc:Sp3ms"\w*\f* +\f + \ft K \+w ב⁠נפש⁠ו|lemma="נֶפֶשׁ" strong="b:H5315" x-morph="He,R:Ncbsc:Sp3ms"\+w*\f* \w שֶׁ֔קֶר|lemma="שֶׁקֶר" strong="H8267" x-morph="He,Ncmsa"\w* \w וְ⁠כָל|lemma="כֹּל" strong="c:H3605" x-morph="He,C:Ncmsc"\w*־\w דָּבָ֖ר|lemma="דָּבָר" strong="H1697" x-morph="He,Ncmsa"\w* \w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w יִכָּחֵ֣ד|lemma="כָּחַד" strong="H3582" x-morph="He,VNi3ms"\w* @@ -7643,14 +7643,14 @@ \w נָ֖סוּ|lemma="נוּס" strong="H5127" x-morph="He,Vqp3cp"\w* \w אִ֥ישׁ|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsa"\w* \w ל⁠אהל⁠ו|lemma="אֹהֶל" strong="l:H0168" x-morph="He,R:Ncmsc:Sp3ms"\w*׃ס -\f + \ft Q \w לְאֹהָלָֽיו|lemma="אֹהֶל" strong="l:H0168" x-morph="He,R:Ncmsc:Sp3ms"\w*\f* +\f + \ft Q \+w לְאֹהָלָֽיו|lemma="אֹהֶל" strong="l:H0168" x-morph="He,R:Ncmsc:Sp3ms"\+w*\f* \v 18 \w וְ⁠אַבְשָׁלֹ֣ם|lemma="אֲבִישָׁלוֹם" strong="c:H0053" x-morph="He,C:Np"\w* \w לָקַ֗ח|lemma="לָקַח" strong="H3947" x-morph="He,Vqp3ms"\w* \w וַ⁠יַּצֶּב|lemma="נָצַב" strong="c:H5324" x-morph="He,C:Vhw3ms"\w*־\w ל֤⁠וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* \w בְחַיָּיו֙|lemma="חַי" strong="b:H2416e" x-morph="He,R:Ncmsc:Sp3ms"\w* -\f + \ft K \w ב⁠חי⁠ו|lemma="חַי" strong="b:H2416e" x-morph="He,R:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ב⁠חי⁠ו|lemma="חַי" strong="b:H2416e" x-morph="He,R:Ncmsc:Sp3ms"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w מַצֶּ֨בֶת֙|lemma="מַצֶּבֶת" strong="H4678" x-morph="He,Ncfsa"\w* \w אֲשֶׁ֣ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w בְּ⁠עֵֽמֶק|lemma="עֵמֶק" strong="b:H6010" x-morph="He,R:Ncmsc"\w*־\w הַ⁠מֶּ֔לֶךְ|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* @@ -8036,7 +8036,7 @@ \w הַ⁠יּ֗וֹם|lemma="יוֹם" strong="d:H3117" x-morph="He,Td:Ncmsa"\w* \w כִּ֠י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* \w ל֣וּ|lemma="לוּ" strong="H3863" x-morph="He,C"\w* -\f + \ft Q \w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*\f* +\f + \ft Q \+w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\+w*\f* \w אַבְשָׁל֥וֹם|lemma="אֲבִישָׁלוֹם" strong="H0053" x-morph="He,Np"\w* \w חַי֙|lemma="חַי" strong="H2416a" x-morph="He,Aamsa" x-tw="rc://*/tw/dict/bible/kt/life"\w* \w וְ⁠כֻלָּ֤⁠נוּ|lemma="כֹּל" strong="c:H3605" x-morph="He,C:Ncmsc:Sp1cp"\w* @@ -8265,7 +8265,7 @@ \w וְ⁠לַ⁠עֲשׂ֥וֹת|lemma="עָשָׂה" strong="c:l:H6213a" x-morph="He,C:R:Vqc"\w* \w הַ⁠טּ֖וֹב|lemma="טוֹב" strong="d:H2896a" x-morph="He,Td:Aamsa" x-tw="rc://*/tw/dict/bible/kt/good"\w* \w בְּעֵינָ֑יו|lemma="עַיִן" strong="b:H5869a" x-morph="He,R:Ncbdc:Sp3ms"\w* -\f + \ft K \w ב⁠עינ⁠ו|lemma="עַיִן" strong="b:H5869a" x-morph="He,R:Ncbsc:Sp3ms"\w*\f* +\f + \ft K \+w ב⁠עינ⁠ו|lemma="עַיִן" strong="b:H5869a" x-morph="He,R:Ncbsc:Sp3ms"\+w*\f* \w וְ⁠שִׁמְעִ֣י|lemma="שִׁמְעִי" strong="c:H8096" x-morph="He,C:Np"\w* \w בֶן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w גֵּרָ֗א|lemma="גֵּרָא" strong="H1617" x-morph="He,Np"\w* \w נָפַל֙|lemma="נָפַל" strong="H5307" x-morph="He,Vqp3ms"\w* @@ -8494,7 +8494,7 @@ \w הַ⁠יַּרְדֵּ֔ן|lemma="יַרְדֵּן" strong="d:H3383" x-morph="He,Td:Np" x-tw="rc://*/tw/dict/bible/names/jordanriver"\w* \w לְ⁠שַׁלְּח֖⁠וֹ|lemma="שָׁלַח" strong="l:H7971" x-morph="He,R:Vpc:Sp3ms"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַיַּרְדֵּֽן|lemma="יַרְדֵּן" strong="d:H3383" x-morph="He,Td:Np" x-tw="rc://*/tw/dict/bible/names/jordanriver"\w*׃ -\f + \ft K \w ב⁠ירדן|lemma="יַרְדֵּן" strong="b:H3383" x-morph="He,R:Np"\w*\f* +\f + \ft K \+w ב⁠ירדן|lemma="יַרְדֵּן" strong="b:H3383" x-morph="He,R:Np"\+w*\f* \v 32 \va 33\va* @@ -8642,7 +8642,7 @@ \w יְהוּדָה֙|lemma="יְהוּדָה" strong="H3063" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/judea"\w* \w הֶעֱבִ֣ירוּ|lemma="עָבַר" strong="c:H5674a" x-morph="He,C:Vhp3mp" x-tw="rc://*/tw/dict/bible/other/preach"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ⁠מֶּ֔לֶךְ|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* -\f + \ft K \w ו⁠יעברו|lemma="עָבַר" strong="c:H5674a" x-morph="He,C:Vqw3mp"\w* \w אֶת|lemma="אֵת" strong="H0854" x-morph="He,R"\w*־\w הַ⁠מֶּ֔לֶךְ|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa"\w*\f* +\f + \ft K \+w ו⁠יעברו|lemma="עָבַר" strong="c:H5674a" x-morph="He,C:Vqw3mp"\w* \w אֶת|lemma="אֵת" strong="H0854" x-morph="He,R"\w*־\w הַ⁠מֶּ֔לֶךְ|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa"\+w*\f* \w וְ⁠גַ֕ם|lemma="גַּם" strong="c:H1571" x-morph="He,C:Ta"\w* \w חֲצִ֖י|lemma="חֵצִי" strong="H2677" x-morph="He,Ncmsc"\w* \w עַ֥ם|lemma="עַם" strong="H5971a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* @@ -8807,7 +8807,7 @@ \w לְ⁠הַזְעִ֣יק|lemma="זָעַק" strong="l:H2199" x-morph="He,R:Vhc"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w יְהוּדָ֑ה|lemma="יְהוּדָה" strong="H3063" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/judea"\w* \w וַיּ֕וֹחֶר|lemma="אָחַר" strong="c:H0309" x-morph="He,C:Vhw3ms"\w* -\f + \ft K \w ו⁠ייחר|lemma="אָחַר" strong="c:H0309" x-morph="He,C:Vhw3ms"\w*\f* +\f + \ft K \+w ו⁠ייחר|lemma="אָחַר" strong="c:H0309" x-morph="He,C:Vhw3ms"\+w*\f* \w מִן|lemma="מִן" strong="H4480a" x-morph="He,R"\w*־\w הַ⁠מּוֹעֵ֖ד|lemma="מוֹעֵד" strong="d:H4150" x-morph="He,Td:Ncmsa"\w* \w אֲשֶׁ֥ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w יְעָדֽ⁠וֹ|lemma="יָעַד" strong="H3259" x-morph="He,Vqp3ms:Sp3ms"\w*׃ס @@ -8864,7 +8864,7 @@ \w מִדּ֣⁠וֹ|lemma="מַד" strong="H4055" x-morph="He,Ncmsc:Sp3ms"\w* \w לְבֻשׁ֗⁠וּ|lemma="לְבוּשׁ" strong="H3830" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/robe"\w* \w ו⁠על⁠ו|lemma="עַל" strong="c:H5921a" x-morph="He,C:R:Sp3ms"\w* -\f + \ft Q \w וְעָלָ֞יו|lemma="עַל" strong="c:H5921a" x-morph="He,C:R:Sp3ms"\w*\f* +\f + \ft Q \+w וְעָלָ֞יו|lemma="עַל" strong="c:H5921a" x-morph="He,C:R:Sp3ms"\+w*\f* \w חֲג֥וֹר|lemma="חֲגוֹר" strong="H2290a" x-morph="He,Ncmsc"\w* \w חֶ֨רֶב֙|lemma="חֶרֶב" strong="H2719" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/other/sword"\w* \w מְצֻמֶּ֤דֶת|lemma="צָמַד" strong="H6775" x-morph="He,VPsfsa"\w* @@ -8972,7 +8972,7 @@ \w מַעֲכָ֖ה|lemma="בֵּית מַעֲכָה" strong="H1038" x-morph="He,Np"\w* \w וְ⁠כָל|lemma="כֹּל" strong="c:H3605" x-morph="He,C:Ncmsc"\w*־\w הַ⁠בֵּרִ֑ים|lemma="בֵּרִי" strong="d:H1276" x-morph="He,Td:Ngmpa"\w* ס \w וַיִּקָּ֣הֲל֔וּ|lemma="קָהַל" strong="c:H6950" x-morph="He,C:VNw3mp"\w* -\f + \ft K \w ו⁠יקלהו|lemma="קָהַל" strong="c:H6950" x-morph="He,C:VNw3mp"\w*\f* +\f + \ft K \+w ו⁠יקלהו|lemma="קָהַל" strong="c:H6950" x-morph="He,C:VNw3mp"\+w*\f* \w וַ⁠יָּבֹ֖אוּ|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3mp"\w* \w אַף|lemma="אַף" strong="H0637" x-morph="He,Ta"\w*־\w אַחֲרָֽי⁠ו|lemma="אַחַר" strong="H0310a" x-morph="He,R:Sp3ms"\w*׃ @@ -9125,7 +9125,7 @@ \w וּ⁠בְנָיָה֙|lemma="בְּנָיָה" strong="c:H1141" x-morph="He,C:Np"\w* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w יְה֣וֹיָדָ֔ע|lemma="יְהוֹיָדָע" strong="H3077" x-morph="He,Np"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w הַכְּרֵתִ֖י|lemma="כְּרֵתִי" strong="d:H3774" x-morph="He,Td:Ngmsa"\w* -\f + \ft K \w ה⁠כרי|lemma="כָּרִי" strong="d:H3746" x-morph="He,Td:Ngmsa"\w*\f* +\f + \ft K \+w ה⁠כרי|lemma="כָּרִי" strong="d:H3746" x-morph="He,Td:Ngmsa"\+w*\f* \w וְ⁠עַל|lemma="עַל" strong="c:H5921a" x-morph="He,C:R"\w*־\w הַ⁠פְּלֵתִֽי|lemma="פְּלֵתִי" strong="d:H6432" x-morph="He,Td:Ngmsa"\w*׃ \v 24 @@ -9137,7 +9137,7 @@ \v 25 \w וּשְׁוָ֖א|lemma="שְׁוָא" strong="c:H7864" x-morph="He,C:Np"\w* -\f + \ft K \w ו⁠שיא|lemma="שְׁוָא" strong="c:H7864" x-morph="He,C:Np"\w*\f* +\f + \ft K \+w ו⁠שיא|lemma="שְׁוָא" strong="c:H7864" x-morph="He,C:Np"\+w*\f* \w סֹפֵ֑ר|lemma="סָפַר" strong="H5608b" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/kt/scribe"\w* \w וְ⁠צָד֥וֹק|lemma="צָדוֹק" strong="c:H6659" x-morph="He,C:Np"\w* \w וְ⁠אֶבְיָתָ֖ר|lemma="אֶבְיָתָר" strong="c:H0054" x-morph="He,C:Np"\w* @@ -9219,7 +9219,7 @@ \w ל֣⁠וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* \w הַ⁠גִּבְעֹנִ֗ים|lemma="גִּבְעֹנִי" strong="d:H1393" x-morph="He,Td:Ngmpa" x-tw="rc://*/tw/dict/bible/names/gibeon"\w* \w אֵֽין|lemma="אַיִן" strong="H0369" x-morph="He,Tn"\w*־\w לָ֜נוּ|lemma="" strong="l" x-morph="He,R:Sp1cp"\w* -\f + \ft K \w ל⁠י|lemma="" strong="l" x-morph="He,R:Sp1cs"\w*\f* +\f + \ft K \+w ל⁠י|lemma="" strong="l" x-morph="He,R:Sp1cs"\+w*\f* \w כֶּ֤סֶף|lemma="כֶּסֶף" strong="H3701" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/silver"\w* \w וְ⁠זָהָב֙|lemma="זָהָב" strong="c:H2091" x-morph="He,C:Ncmsa" x-tw="rc://*/tw/dict/bible/other/gold"\w* \w עִם|lemma="עִם" strong="H5973a" x-morph="He,R"\w*־\w שָׁא֣וּל|lemma="שָׁאוּל" strong="H7586" x-morph="He,Np"\w* @@ -9249,7 +9249,7 @@ \v 6 \w ינתן|lemma="נָתַן" strong="H5414" x-morph="He,VNj3ms"\w*־\w לָ֜⁠נוּ|lemma="" strong="l" x-morph="He,R:Sp1cp"\w* -\f + \ft Q \w יֻתַּן|lemma="נָתַן" strong="H5414" x-morph="He,VQj3ms"\w*\f* +\f + \ft Q \+w יֻתַּן|lemma="נָתַן" strong="H5414" x-morph="He,VQj3ms"\+w*\f* \w שִׁבְעָ֤ה|lemma="שֶׁבַע" strong="H7651" x-morph="He,Acmsa"\w* \w אֲנָשִׁים֙|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmpa"\w* \w מִ⁠בָּנָ֔י⁠ו|lemma="בֵּן" strong="m:H1121a" x-morph="He,R:Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/son"\w* @@ -9312,16 +9312,16 @@ \w יְהוָ֔ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w וַ⁠יִּפְּל֥וּ|lemma="נָפַל" strong="c:H5307" x-morph="He,C:Vqw3mp" x-tw="rc://*/tw/dict/bible/other/bow"\w* \w שְׁבַעְתָּ֖ם|lemma="שֶׁבַע" strong="H7651" x-morph="He,Acfsa:Sp3mp"\w* -\f + \ft K \w שבעתים|lemma="שֶׁבַע" strong="H7651" x-morph="He,Acfda"\w*\f* +\f + \ft K \+w שבעתים|lemma="שֶׁבַע" strong="H7651" x-morph="He,Acfda"\+w*\f* \w יָ֑חַד|lemma="יַחַד" strong="H3162a" x-morph="He,Ncmsa"\w* \w ו⁠הם|lemma="הֵם" strong="c:H1992" x-morph="He,C:Pp3mp"\w* -\f + \ft Q \w וְהֵ֨מָּה|lemma="הֵם" strong="c:H1992" x-morph="He,C:Pp3mp"\w*\f* +\f + \ft Q \+w וְהֵ֨מָּה|lemma="הֵם" strong="c:H1992" x-morph="He,C:Pp3mp"\+w*\f* \w הֻמְת֜וּ|lemma="מוּת" strong="H4191" x-morph="He,VHp3cp"\w* \w בִּ⁠ימֵ֤י|lemma="יוֹם" strong="b:H3117" x-morph="He,R:Ncmpc"\w* \w קָצִיר֙|lemma="קָצִיר" strong="H7105a" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/harvest"\w* \w בָּ⁠רִ֣אשֹׁנִ֔ים|lemma="רִאשׁוֹן" strong="b:H7223" x-morph="He,Rd:Aampa"\w* \w בִּתְחִלַּ֖ת|lemma="תְּחִלָּה" strong="b:H8462" x-morph="He,R:Ncfsc"\w* -\f + \ft K \w תחלת|lemma="תְּחִלָּה" strong="H8462" x-morph="He,Ncfsc"\w*\f* +\f + \ft K \+w תחלת|lemma="תְּחִלָּה" strong="H8462" x-morph="He,Ncfsc"\+w*\f* \w קְצִ֥יר|lemma="קָצִיר" strong="H7105a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/harvest"\w* \w שְׂעֹרִֽים|lemma="שְׂעֹרָה" strong="H8184" x-morph="He,Ncfpa" x-tw="rc://*/tw/dict/bible/other/barley"\w*׃ @@ -9379,7 +9379,7 @@ \w בֵּֽית|lemma="בֵּית שְׁאָן" strong="H1052" x-morph="He,Np"\w*־\w שַׁ֗ן|lemma="בֵּית שְׁאָן" strong="H1052" x-morph="He,Np"\w* \w אֲשֶׁ֨ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w תלו⁠ם|lemma="תָּלָה" strong="H8518" x-morph="He,Vqp3cp:Sp3mp" x-tw="rc://*/tw/dict/bible/other/hang"\w* -\f + \ft Q \w תְּלָא֥וּם|lemma="תָּלָה" strong="H8518" x-morph="He,Vqp3cp:Sp3mp"\w*\f* +\f + \ft Q \+w תְּלָא֥וּם|lemma="תָּלָה" strong="H8518" x-morph="He,Vqp3cp:Sp3mp"\+w*\f* \w שם|lemma="שָׁם" strong="H8033" x-morph="He,D"\w* \w ה⁠פלשתים|lemma="פְּלִשְׁתִּי" strong="d:H6430" x-morph="He,Td:Ngmpa"\w* \w בְּ⁠י֨וֹם|lemma="יוֹם" strong="b:H3117" x-morph="He,R:Ncmsc"\w* @@ -9435,7 +9435,7 @@ \v 16 \w וְיִשְׁבִּ֨י|lemma="יִשְׁבּוֹ בְּנֹב" strong="c:H3430" x-morph="He,C:Np"\w* -\f + \ft K \w ו⁠ישבו|lemma="יִשְׁבּוֹ בְּנֹב" strong="c:H3430" x-morph="He,C:Np"\w*\f* +\f + \ft K \+w ו⁠ישבו|lemma="יִשְׁבּוֹ בְּנֹב" strong="c:H3430" x-morph="He,C:Np"\+w*\f* \w בְּנֹ֜ב|lemma="יִשְׁבּוֹ בְּנֹב" strong="H3430" x-morph="He,Np"\w* \w אֲשֶׁ֣ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* ׀ \w בִּ⁠ילִידֵ֣י|lemma="יָלִיד" strong="b:H3211" x-morph="He,R:Ncmpc"\w* @@ -9516,7 +9516,7 @@ \w וַ⁠יְהִ֣י|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqw3ms"\w* ׀ \w אִ֣ישׁ|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsc"\w* \w מדין|lemma="מַד" strong="H4055" x-morph="He,Ncmpa"\w* -\f + \ft Q \w מָד֗וֹן|lemma="מַד" strong="H4055" x-morph="He,Ncfpa"\w*\f* +\f + \ft Q \+w מָד֗וֹן|lemma="מַד" strong="H4055" x-morph="He,Ncfpa"\+w*\f* \w וְ⁠אֶצְבְּעֹ֣ת|lemma="אֶצְבַּע" strong="c:H0676" x-morph="He,C:Ncfpc"\w* \w יָדָי⁠ו֩|lemma="יָד" strong="H3027" x-morph="He,Ncbdc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w וְ⁠אֶצְבְּעֹ֨ת|lemma="אֶצְבַּע" strong="c:H0676" x-morph="He,C:Ncfpc"\w* @@ -9536,7 +9536,7 @@ \w וַ⁠יַּכֵּ֨⁠הוּ֙|lemma="נָכָה" strong="c:H5221" x-morph="He,C:Vhw3ms:Sp3ms"\w* \w יְה֣וֹנָתָ֔ן|lemma="יְהוֹנָתָן" strong="H3083" x-morph="He,Np"\w* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w שמעי|lemma="שִׁמְעִי" strong="H8096" x-morph="He,Np"\w* -\f + \ft Q \w שִׁמְעָ֖ה|lemma="שִׁמְעִי" strong="H8093" x-morph="He,Np"\w*\f* +\f + \ft Q \+w שִׁמְעָ֖ה|lemma="שִׁמְעִי" strong="H8093" x-morph="He,Np"\+w*\f* \w אֲחִ֥י|lemma="אָח" strong="H0251" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/brother"\w* \w דָוִֽד|lemma="דָּוִד" strong="H1732" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/david"\w*׃ @@ -9626,7 +9626,7 @@ \v 8 \w ו⁠תגעש|lemma="גָּעַשׁ" strong="c:H1607" x-morph="He,C:Vqw3fs"\w* -\f + \ft Q \w וַיִּתְגָּעַ֤שׁ|lemma="גָּעַשׁ" strong="c:H1607" x-morph="He,C:Vtw3ms"\w*\f* +\f + \ft Q \+w וַיִּתְגָּעַ֤שׁ|lemma="גָּעַשׁ" strong="c:H1607" x-morph="He,C:Vtw3ms"\+w*\f* \f + \w ו⁠תתגעש|lemma="גָּעַשׁ" strong="c:H1607" x-morph="He,C:Vtw3fs"\w* some manuscripts read\f* \w וַ⁠תִּרְעַשׁ֙|lemma="רָעַשׁ" strong="c:H7493" x-morph="He,C:Vqw3fs"\w* \w הָ⁠אָ֔רֶץ|lemma="אֶרֶץ" strong="d:H0776" x-morph="He,Td:Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w* @@ -9692,7 +9692,7 @@ \w וַ⁠יְפִיצֵ֑⁠ם|lemma="פּוּץ" strong="c:H6327a" x-morph="He,C:Vhw3ms:Sp3mp"\w* \w בָּרָ֖ק|lemma="בָּרָק" strong="H1300a" x-morph="He,Ncmsa"\w* \w ו⁠יהמ⁠ם|lemma="הָמַם" strong="c:H2000" x-morph="He,C:Vqw3ms:Sp3mp"\w*׃ -\f + \ft Q \w וַיָּהֹֽם|lemma="הָמַם" strong="c:H2000" x-morph="He,C:Vqw3ms"\w*\f* +\f + \ft Q \+w וַיָּהֹֽם|lemma="הָמַם" strong="c:H2000" x-morph="He,C:Vqw3ms"\+w*\f* \v 16 \w וַ⁠יֵּֽרָאוּ֙|lemma="רָאָה" strong="c:H7200" x-morph="He,C:VNw3mp"\w* @@ -9762,7 +9762,7 @@ \v 23 \w כִּ֥י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* \w כָל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w מִשְׁפָּטָ֖יו|lemma="מִשְׁפָּט" strong="H4941" x-morph="He,Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/judge"\w* -\f + \ft K \w משפט⁠ו|lemma="מִשְׁפָּט" strong="H4941" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w משפט⁠ו|lemma="מִשְׁפָּט" strong="H4941" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w לְ⁠נֶגְדִּ֑⁠י|lemma="נֶגֶד" strong="l:H5048" x-morph="He,R:R:Sp1cs"\w* \w וְ⁠חֻקֹּתָ֖י⁠ו|lemma="חֻקָּה" strong="c:H2708" x-morph="He,C:Ncbpc:Sp3ms"\w* \w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w אָס֥וּר|lemma="סוּר" strong="H5493" x-morph="He,Vqi1cs"\w* @@ -9851,12 +9851,12 @@ \w וַ⁠יַּתֵּ֥ר|lemma="נָתַר" strong="c:H5425b" x-morph="He,C:Vhw3ms"\w* \w תָּמִ֖ים|lemma="תָּמִים" strong="H8549" x-morph="He,Aamsa"\w* \w דַּרְכִּֽי|lemma="דֶּרֶךְ" strong="H1870" x-morph="He,Ncbsc:Sp1cs"\w*׃ -\f + \ft K \w דרכ⁠ו|lemma="דֶּרֶךְ" strong="H1870" x-morph="He,Ncbsc:Sp3ms"\w*\f* +\f + \ft K \+w דרכ⁠ו|lemma="דֶּרֶךְ" strong="H1870" x-morph="He,Ncbsc:Sp3ms"\+w*\f* \v 34 \w מְשַׁוֶּ֥ה|lemma="שָׁוָה" strong="H7737b" x-morph="He,Vprmsa"\w* \w רַגְלַ֖י|lemma="רֶגֶל" strong="H7272" x-morph="He,Ncfdc:Sp1cs"\w* -\f + \ft K \w רגלי⁠ו|lemma="רֶגֶל" strong="H7272" x-morph="He,Ncfdc:Sp3ms"\w*\f* +\f + \ft K \+w רגלי⁠ו|lemma="רֶגֶל" strong="H7272" x-morph="He,Ncfdc:Sp3ms"\+w*\f* \w כָּ⁠אַיָּל֑וֹת|lemma="אַיָּלָה" strong="k:H0355" x-morph="He,Rd:Ncfpa"\w* \w וְ⁠עַ֥ל|lemma="עַל" strong="c:H5921a" x-morph="He,C:R"\w* \w בָּמוֹתַ֖⁠י|lemma="בָּמָה" strong="H1116" x-morph="He,Ncfpc:Sp1cs"\w* @@ -9997,7 +9997,7 @@ \v 51 \w מגדיל|lemma="גָּדַל" strong="H1431" x-morph="He,Vhrmsc" x-tw="rc://*/tw/dict/bible/other/proud"\w* -\f + \ft Q \w מִגְדּ֖וֹל|lemma="מִגְדָל" strong="H4026" x-morph="He,Vhrmsc"\w*\f* +\f + \ft Q \+w מִגְדּ֖וֹל|lemma="מִגְדָל" strong="H4026" x-morph="He,Vhrmsc"\+w*\f* \w יְשׁוּע֣וֹת|lemma="יְשׁוּעָה" strong="H3444" x-morph="He,Ncfpc"\w* \w מַלְכּ֑⁠וֹ|lemma="מֶלֶךְ" strong="H4428" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/king"\w* \w וְ⁠עֹֽשֶׂה|lemma="עָשָׂה" strong="c:H6213a" x-morph="He,C:Vqrmsa"\w*־\w חֶ֧סֶד|lemma="חֶסֶד" strong="H2617a" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/kt/covenantfaith"\w* @@ -10115,25 +10115,25 @@ \w הֽוּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w*־\w עוֹרֵ֧ר|lemma="עוּר" strong="H5782" x-morph="He,Vop3ms" x-tw="rc://*/tw/dict/bible/other/raise"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w חֲנִית֛⁠וֹ|lemma="חֲנִית" strong="H2595" x-morph="He,Ncfsc:Sp3ms"\w* \f + \ft Text supplied from 1 Chronicles 11:11\f* -\f + \ft Q \w ה֚וּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w* \w עֲדִינ֣⁠וֹ|lemma="עֲדִינוֹ" strong="H5722" x-morph="He,Np:Sp3ms"\w* \w הָֽעֶצְנִ֔י|lemma="עֵצֶן" strong="d:H6112" x-morph="He,Td:Ngmsc"\w*\f* -\f + \ft K \w ה֚וּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w* \w עֲדִינ֣⁠וֹ|lemma="עֲדִינוֹ" strong="H5722" x-morph="He,Np:Sp3ms"\w* \w ה⁠עצנ⁠ו|lemma="עֵצֶן" strong="d:H6112" x-morph="He,Td:Ngmsc:Sp3ms"\w*\f* +\f + \ft Q \+w ה֚וּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w* \w עֲדִינ֣⁠וֹ|lemma="עֲדִינוֹ" strong="H5722" x-morph="He,Np:Sp3ms"\w* \w הָֽעֶצְנִ֔י|lemma="עֵצֶן" strong="d:H6112" x-morph="He,Td:Ngmsc"\+w*\f* +\f + \ft K \+w ה֚וּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w* \w עֲדִינ֣⁠וֹ|lemma="עֲדִינוֹ" strong="H5722" x-morph="He,Np:Sp3ms"\w* \w ה⁠עצנ⁠ו|lemma="עֵצֶן" strong="d:H6112" x-morph="He,Td:Ngmsc:Sp3ms"\+w*\f* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w שְׁמֹנֶ֥ה|lemma="שְׁמֹנֶה" strong="H8083" x-morph="He,Acfsa"\w* \w מֵא֛וֹת|lemma="מֵאָה" strong="H3967" x-morph="He,Acbpa"\w* \w חָלָ֖ל|lemma="חָלָל" strong="H2491a" x-morph="He,Aamsa"\w* \w בְּ⁠פַ֥עַם|lemma="פַּעַם" strong="b:H6471" x-morph="He,R:Ncfsa"\w* \w אֶחָֽת|lemma="אֶחָד" strong="H0259" x-morph="He,Acfsa"\w*׃ס -\f + \ft K \w אחד|lemma="אֶחָד" strong="H0259" x-morph="He,Acmsa"\w*\f* +\f + \ft K \+w אחד|lemma="אֶחָד" strong="H0259" x-morph="He,Acmsa"\+w*\f* \v 9 \w ו⁠אחר⁠ו|lemma="אַחַר" strong="c:H0310a" x-morph="He,C:R:Sp3ms"\w* -\f + \ft Q \w וְאַחֲרָ֛יו|lemma="אַחַר" strong="c:H0310a" x-morph="He,C:R:Sp3ms"\w*\f* +\f + \ft Q \+w וְאַחֲרָ֛יו|lemma="אַחַר" strong="c:H0310a" x-morph="He,C:R:Sp3ms"\+w*\f* \w אֶלְעָזָ֥ר|lemma="אֶלְעָזָר" strong="H0499" x-morph="He,Np"\w* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w דֹּד֖וֹ|lemma="דּוֹדוֹ" strong="H1734" x-morph="He,Np"\w* -\f + \ft K \w דדי|lemma="דּוֹדוֹ" strong="H1734" x-morph="He,Np"\w*\f* +\f + \ft K \+w דדי|lemma="דּוֹדוֹ" strong="H1734" x-morph="He,Np"\+w*\f* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w אֲחֹחִ֑י|lemma="אֲחוֹחִי" strong="H0266" x-morph="He,Ngmsa"\w* \w בִּ⁠שְׁלֹשָׁ֨ה|lemma="שָׁלוֹשׁ" strong="b:H7969" x-morph="He,R:Acmsa"\w* \w הַגִּבֹּרִ֜ים|lemma="גִּבּוֹר" strong="d:H1368" x-morph="He,Td:Aampa" x-tw="rc://*/tw/dict/bible/other/mighty"\w* -\f + \ft K \w גברים|lemma="גִּבּוֹר" strong="H1368" x-morph="He,Aampa"\w*\f* +\f + \ft K \+w גברים|lemma="גִּבּוֹר" strong="H1368" x-morph="He,Aampa"\+w*\f* \w עִם|lemma="עִם" strong="H5973a" x-morph="He,R"\w*־\w דָּוִ֗ד|lemma="דָּוִד" strong="H1732" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/david"\w* \w בְּ⁠חָֽרְפָ֤⁠ם|lemma="חָרַף" strong="b:H2778a" x-morph="He,R:Vpc:Sp3mp"\w* \w בַּ⁠פְּלִשְׁתִּים|lemma="פְּלִשְׁתִּי" strong="b:H6430" x-morph="He,Rd:Ngmpa"\w* @@ -10197,7 +10197,7 @@ \v 13 \w וַ⁠יֵּרְד֨וּ|lemma="יָרַד" strong="c:H3381" x-morph="He,C:Vqw3mp"\w* \w שְׁלֹשָׁ֜ה|lemma="שְׁלוֹשׁ" strong="H7969" x-morph="He,Acbpa"\w* -\f + \ft K \w שלשים|lemma="שְׁלוֹשִׁים" strong="H7970" x-morph="He,Acbpa"\w*\f* +\f + \ft K \+w שלשים|lemma="שְׁלוֹשִׁים" strong="H7970" x-morph="He,Acbpa"\+w*\f* \w מֵ⁠הַ⁠שְּׁלֹשִׁ֣ים|lemma="שְׁלוֹשִׁים" strong="m:d:H7970" x-morph="He,R:Td:Acbpa"\w* \w רֹ֗אשׁ|lemma="רֹאשׁ" strong="H7218a" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/head"\w* \w וַ⁠יָּבֹ֤אוּ|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3mp"\w* @@ -10281,7 +10281,7 @@ \w ה֚וּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w* \w רֹ֣אשׁ|lemma="רֹאשׁ" strong="H7218a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/head"\w* \w הַשְּׁלֹשָׁ֔ה|lemma="שָׁלוֹשׁ" strong="d:H7969" x-morph="He,Td:Acbsa"\w* -\f + \ft K \w ה⁠שלשי|lemma="שְׁלִישִׁי" strong="d:H7992" x-morph="He,Td:Aomsa"\w*\f* +\f + \ft K \+w ה⁠שלשי|lemma="שְׁלִישִׁי" strong="d:H7992" x-morph="He,Td:Aomsa"\+w*\f* \w וְ⁠הוּא֙|lemma="הוּא" strong="c:H1931" x-morph="He,C:Pp3ms"\w* \w עוֹרֵ֣ר|lemma="עוּר" strong="H5782" x-morph="He,Vop3ms" x-tw="rc://*/tw/dict/bible/other/raise"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w חֲנִית֔⁠וֹ|lemma="חֲנִית" strong="H2595" x-morph="He,Ncfsc:Sp3ms"\w* @@ -10305,7 +10305,7 @@ \w וּ⁠בְנָיָ֨הוּ|lemma="בְּנָיָה" strong="c:H1141" x-morph="He,C:Np"\w* \w בֶן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w יְהוֹיָדָ֧ע|lemma="יְהוֹיָדָע" strong="H3077" x-morph="He,Np"\w* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w אִֽישׁ|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsc"\w*־\w חַ֛יִל|lemma="חַיִל" strong="H2428" x-morph="He,Aamsa"\w* -\f + \ft K \w חי|lemma="חַי" strong="H2416a" x-morph="He,Aamsa"\w*\f* +\f + \ft K \+w חי|lemma="חַי" strong="H2416a" x-morph="He,Aamsa"\+w*\f* \w רַב|lemma="רַב" strong="H7227a" x-morph="He,Aamsc"\w*־\w פְּעָלִ֖ים|lemma="פֹּעַל" strong="H6467" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/kt/works"\w* \w מִֽ⁠קַּבְצְאֵ֑ל|lemma="קַבְצְאֵל" strong="m:H6909" x-morph="He,R:Np"\w* \w ה֣וּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w* @@ -10318,7 +10318,7 @@ \w יָרַ֞ד|lemma="יָרַד" strong="H3381" x-morph="He,Vqp3ms"\w* \w וְ⁠הִכָּ֧ה|lemma="נָכָה" strong="c:H5221" x-morph="He,C:Vhp3ms"\w* \w אֶֽת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w ה⁠אריה|lemma="אֲרִי" strong="d:H0738b" x-morph="He,Td:Ncmsa"\w* -\f + \ft Q \w הָאֲרִ֛י|lemma="אֲרִי" strong="d:H0738a" x-morph="He,Td:Ncmsa"\w*\f* +\f + \ft Q \+w הָאֲרִ֛י|lemma="אֲרִי" strong="d:H0738a" x-morph="He,Td:Ncmsa"\+w*\f* \w בְּ⁠ת֥וֹךְ|lemma="תָּוֶךְ" strong="b:H8432" x-morph="He,R:Ncmsc"\w* \w הַ⁠בֹּ֖אר|lemma="בּוֹר" strong="d:H0953a" x-morph="He,Td:Ncmsa"\w* \w בְּ⁠י֥וֹם|lemma="יוֹם" strong="b:H3117" x-morph="He,R:Ncmsc"\w* @@ -10329,7 +10329,7 @@ \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w אִ֨ישׁ|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsa"\w* \w מִצְרִ֜י|lemma="מִצְרִי" strong="H4713" x-morph="He,Ngmsa"\w* \w אִ֣ישׁ|lemma="אֲשֶׁר" strong="H0376" x-morph="He,Ncmsc"\w* -\f + \ft K \w אשר|lemma="אֲשֶׁר" strong="H0834" x-morph="He,Tr"\w*\f* +\f + \ft K \+w אשר|lemma="אֲשֶׁר" strong="H0834" x-morph="He,Tr"\+w*\f* \w מַרְאֶ֗ה|lemma="מַרְאֶה" strong="H4758" x-morph="He,Ncmsa"\w* \w וּ⁠בְ⁠יַ֤ד|lemma="יָד" strong="c:b:H3027" x-morph="He,C:R:Ncbsc" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w הַ⁠מִּצְרִי֙|lemma="מִצְרִי" strong="d:H4713" x-morph="He,Td:Ngmsa" x-tw="rc://*/tw/dict/bible/names/egypt"\w* @@ -10443,7 +10443,7 @@ \v 35 \w חצרו|lemma="חֶצְרוֹ" strong="H2695" x-morph="He,Np"\w* -\f + \ft Q \w חֶצְרַי֙|lemma="חֶצְרוֹ" strong="H2695" x-morph="He,Np"\w*\f* +\f + \ft Q \+w חֶצְרַי֙|lemma="חֶצְרוֹ" strong="H2695" x-morph="He,Np"\+w*\f* \w הַֽ⁠כַּרְמְלִ֔י|lemma="כַּרְמְלִי" strong="d:H3761" x-morph="He,Td:Ngmsa"\w* \w פַּעֲרַ֖י|lemma="פַּעֲרַי" strong="H6474" x-morph="He,Np"\w* \w הָ⁠אַרְבִּֽי|lemma="אַרְבִּי" strong="d:H0701" x-morph="He,Td:Ngmsa"\w*׃ס @@ -10461,7 +10461,7 @@ \w נַחְרַי֙|lemma="נַחֲרַי" strong="H5171" x-morph="He,Np"\w* \w הַ⁠בְּאֵ֣רֹתִ֔י|lemma="בְּאֵרֹתִי" strong="d:H0886" x-morph="He,Td:Ngmsa"\w* \w נֹשֵׂ֕א|lemma="נָשָׂא" strong="H5375" x-morph="He,Vqrmpa"\w* -\f + \ft K \w נשאי|lemma="נָשָׂא" strong="H5375" x-morph="He,Vqrmpc"\w*\f* +\f + \ft K \+w נשאי|lemma="נָשָׂא" strong="H5375" x-morph="He,Vqrmpc"\+w*\f* \w כְּלֵ֖י|lemma="כְּלִי" strong="H3627" x-morph="He,Ncmpc"\w* \w יוֹאָ֥ב|lemma="יוֹאָב" strong="H3097" x-morph="He,Np"\w* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w צְרֻיָֽה|lemma="צְרוּיָה" strong="H6870" x-morph="He,Np"\w*׃ס @@ -10711,7 +10711,7 @@ \w בְ⁠יַד|lemma="יָד" strong="b:H3027" x-morph="He,R:Ncbsc" x-tw="rc://*/tw/dict/bible/other/hand"\w*־\w יְהוָה֙|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w רַבִּ֣ים|lemma="רַב" strong="H7227a" x-morph="He,Aampa"\w* \w רחמ⁠ו|lemma="רַחַם" strong="H7356b" x-morph="He,Ncmsc:Sp3ms"\w* -\f + \ft Q \w רַֽחֲמָ֔יו|lemma="רַחַם" strong="H7356b" x-morph="He,Ncmpc:Sp3ms"\w*\f* +\f + \ft Q \+w רַֽחֲמָ֔יו|lemma="רַחַם" strong="H7356b" x-morph="He,Ncmpc:Sp3ms"\+w*\f* \w וּ⁠בְ⁠יַד|lemma="יָד" strong="c:b:H3027" x-morph="He,C:R:Ncbsc" x-tw="rc://*/tw/dict/bible/other/hand"\w*־\w אָדָ֖ם|lemma="אָדָם" strong="H0120" x-morph="He,Ncmsa"\w* \w אַל|lemma="אַל" strong="H0408" x-morph="He,Tn"\w*־\w אֶפֹּֽלָה|lemma="נָפַל" strong="H5307" x-morph="He,Vqh1cs"\w*׃ @@ -10754,7 +10754,7 @@ \w הָיָ֔ה|lemma="הָיָה" strong="H1961" x-morph="He,Vqp3ms"\w* \w עִם|lemma="עִם" strong="H5973a" x-morph="He,R"\w*־\w גֹּ֖רֶן|lemma="גֹּרֶן" strong="H1637" x-morph="He,Ncbsc" x-tw="rc://*/tw/dict/bible/other/thresh"\w* \w הָאֲרַ֥וְנָה|lemma="אֲרַוְנָה" strong="d:H0728" x-morph="He,Td:Np"\w* -\f + \ft K \w ה⁠אורנה|lemma="אֲרַוְנָה" strong="d:H0728" x-morph="He,Td:Np"\w*\f* +\f + \ft K \+w ה⁠אורנה|lemma="אֲרַוְנָה" strong="d:H0728" x-morph="He,Td:Np"\+w*\f* \w הַ⁠יְבֻסִֽי|lemma="יְבוּסִי" strong="d:H2983" x-morph="He,Td:Ngmsa" x-tw="rc://*/tw/dict/bible/names/jebusites"\w*׃ס \v 17 @@ -10795,7 +10795,7 @@ \w מִזְבֵּ֔חַ|lemma="מִזְבֵּחַ" strong="H4196" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/kt/altar"\w* \w בְּ⁠גֹ֖רֶן|lemma="גֹּרֶן" strong="b:H1637" x-morph="He,R:Ncbsc"\w* \w אֲרַ֥וְנָה|lemma="אֲרַוְנָה" strong="H0728" x-morph="He,Np"\w* -\f + \ft K \w ארניה|lemma="אֲרַוְנָה" strong="H0728" x-morph="He,Np"\w*\f* +\f + \ft K \+w ארניה|lemma="אֲרַוְנָה" strong="H0728" x-morph="He,Np"\+w*\f* \w הַ⁠יְבֻסִֽי|lemma="יְבוּסִי" strong="d:H2983" x-morph="He,Td:Ngmsa" x-tw="rc://*/tw/dict/bible/names/jebusites"\w*׃ \v 19 @@ -10851,7 +10851,7 @@ \w הַ⁠מֶּ֖לֶךְ|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* \w הַ⁠טּ֣וֹב|lemma="טוֹב" strong="d:H2896a" x-morph="He,Td:Aamsa" x-tw="rc://*/tw/dict/bible/kt/good"\w* \w בְּעֵינָ֑יו|lemma="עַיִן" strong="b:H5869a" x-morph="He,R:Ncbdc:Sp3ms"\w* -\f + \ft K \w ב⁠עינ⁠ו|lemma="עַיִן" strong="b:H5869a" x-morph="He,R:Ncbsc:Sp3ms"\w*\f* +\f + \ft K \+w ב⁠עינ⁠ו|lemma="עַיִן" strong="b:H5869a" x-morph="He,R:Ncbsc:Sp3ms"\+w*\f* \w רְאֵה֙|lemma="רָאָה" strong="H7200" x-morph="He,Vqv2ms"\w* \w הַ⁠בָּקָ֣ר|lemma="בָּקָר" strong="d:H1241" x-morph="He,Td:Ncbsa"\w* \w לָ⁠עֹלָ֔ה|lemma="עֹלָה" strong="l:H5930a" x-morph="He,Rd:Ncfsa"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/11-1KI.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/11-1KI.usfm index 6faf6774..cf77c4ef 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/11-1KI.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/11-1KI.usfm @@ -404,7 +404,7 @@ \w וְ⁠לֹ֤א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w* \w הוֹדַ֨עְתָּ֙|lemma="יָדַע" strong="H3045" x-morph="He,Vhp2ms" x-tw="rc://*/tw/dict/bible/other/know"\w* \w אֶֽת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w עבדי⁠ך|lemma="עֶבֶד" strong="H5650" x-morph="He,Ncmpc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/servant"\w* -\f + \ft Q \w עַבְדְּךָ֔|lemma="עֶבֶד" strong="H5650" x-morph="He,Ncmsc:Sp2ms"\w*\f* +\f + \ft Q \+w עַבְדְּךָ֔|lemma="עֶבֶד" strong="H5650" x-morph="He,Ncmsc:Sp2ms"\+w*\f* \w מִ֗י|lemma="מִי" strong="H4310" x-morph="He,Ti"\w* \w יֵשֵׁ֛ב|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqi3ms"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w כִּסֵּ֥א|lemma="כִּסֵּא" strong="H3678" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/throne"\w* @@ -558,7 +558,7 @@ \w הַ⁠מֶּ֔לֶךְ|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* \w כֵּ֖ן|lemma="כֵּן" strong="H3651c" x-morph="He,Tm"\w* \w יהי|lemma="הָיָה" strong="H1961" x-morph="He,Vqj3ms"\w* -\f + \ft Q \w יִֽהְיֶ֣ה|lemma="הָיָה" strong="H1961" x-morph="He,Vqi3ms"\w*\f* +\f + \ft Q \+w יִֽהְיֶ֣ה|lemma="הָיָה" strong="H1961" x-morph="He,Vqi3ms"\+w*\f* \w עִם|lemma="עִם" strong="H5973a" x-morph="He,R"\w*־\w שְׁלֹמֹ֑ה|lemma="שְׁלֹמֹה" strong="H8010" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/solomon"\w* \w וִֽ⁠יגַדֵּל֙|lemma="גָּדַל" strong="c:H1431" x-morph="He,C:Vpi3ms"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w כִּסְא֔⁠וֹ|lemma="כִּסֵּא" strong="H3678" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/throne"\w* @@ -719,7 +719,7 @@ \w לֵ⁠אמֹר֒|lemma="אָמַר" strong="l:H0559" x-morph="He,R:Vqc"\w* \w יֵיטֵ֨ב|lemma="יָטַב" strong="H3190" x-morph="He,Vhj3ms" x-tw="rc://*/tw/dict/bible/kt/favor"\w* \w אֱלֹהִ֜ים|lemma="אֱלֹהִים" strong="H0430" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/kt/god"\w* -\f + \ft K \w אלהי⁠ך|lemma="אֱלֹהִים" strong="H0430" x-morph="He,Ncmpc:Sp2ms"\w*\f* +\f + \ft K \+w אלהי⁠ך|lemma="אֱלֹהִים" strong="H0430" x-morph="He,Ncmpc:Sp2ms"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w שֵׁ֤ם|lemma="שֵׁם" strong="H8034" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/name"\w* \w שְׁלֹמֹה֙|lemma="שְׁלֹמֹה" strong="H8010" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/solomon"\w* \w מִ⁠שְּׁמֶ֔⁠ךָ|lemma="שֵׁם" strong="m:H8034" x-morph="He,R:Ncmsc:Sp2ms"\w* @@ -1194,7 +1194,7 @@ \w אֲשֶׁ֣ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w הֱכִינַ֗⁠נִי|lemma="כּוּן" strong="H3559a" x-morph="He,Vhp3ms:Sp1cs"\w* \w וַיּֽוֹשִׁיבַ֙נִי֙|lemma="יָשַׁב" strong="c:H3427" x-morph="He,C:Vhw3ms:Sp1cs"\w* -\f + \ft K \w ו⁠יושיבי⁠ני|lemma="יָשַׁב" strong="c:H3427" x-morph="He,C:Vhw3ms:Sp1cs"\w*\f* +\f + \ft K \+w ו⁠יושיבי⁠ני|lemma="יָשַׁב" strong="c:H3427" x-morph="He,C:Vhw3ms:Sp1cs"\+w*\f* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w כִּסֵּא֙|lemma="כִּסֵּא" strong="H3678" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/throne"\w* \w דָּוִ֣ד|lemma="דָּוִד" strong="H1732" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/david"\w* \w אָבִ֔⁠י|lemma="אָב" strong="H0001" x-morph="He,Ncmsc:Sp1cs" x-tw="rc://*/tw/dict/bible/other/father"\w* @@ -2128,7 +2128,7 @@ \w בַּ⁠שָּׁנָ֛ה|lemma="שָׁנֶה" strong="b:H8141" x-morph="He,Rd:Ncfsa"\w* \w יִהְיֶ֥ה|lemma="הָיָה" strong="H1961" x-morph="He,Vqi3ms"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w הָאֶחָ֖ד|lemma="אֶחָד" strong="d:H0259" x-morph="He,Td:Acmsa"\w* -\f + \ft K \w אחד|lemma="אֶחָד" strong="H0259" x-morph="He,Acmsa"\w*\f* +\f + \ft K \+w אחד|lemma="אֶחָד" strong="H0259" x-morph="He,Acmsa"\+w*\f* \w לְ⁠כַלְכֵּֽל|lemma="כּוּל" strong="l:H3557" x-morph="He,R:Vlc"\w*׃ס \v 8 @@ -2538,7 +2538,7 @@ \w תַּ֖חַת|lemma="תַּחַת" strong="H8478" x-morph="He,R"\w* \w כַּפּ֥וֹת|lemma="כַּף" strong="H3709" x-morph="He,Ncfpc" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w רגל⁠ו|lemma="רֶגֶל" strong="H7272" x-morph="He,Ncfsc:Sp3ms"\w*׃ -\f + \ft Q \w רַגְלָֽי|lemma="רֶגֶל" strong="H7272" x-morph="He,Ncfdc:Sp1cs"\w*\f* +\f + \ft Q \+w רַגְלָֽי|lemma="רֶגֶל" strong="H7272" x-morph="He,Ncfdc:Sp1cs"\+w*\f* \v 4 \va 18\va* @@ -2880,7 +2880,7 @@ \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w קִ֨יר|lemma="קִיר" strong="H7023" x-morph="He,Ncmsc"\w* \w הַ⁠בַּ֤יִת|lemma="בַּיִת" strong="d:H1004b" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/house"\w* \w יצוע|lemma="יָצוּעַ" strong="H3326a" x-morph="He,Ncmsa"\w* -\f + \ft Q \w יָצִ֙יעַ֙|lemma="יָצוּעַ" strong="H3326b" x-morph="He,Ncmsa"\w*\f* +\f + \ft Q \+w יָצִ֙יעַ֙|lemma="יָצוּעַ" strong="H3326b" x-morph="He,Ncmsa"\+w*\f* \w סָבִ֔יב|lemma="סָבִיב" strong="H5439" x-morph="He,Ncbsa"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w קִיר֤וֹת|lemma="קִיר" strong="H7023" x-morph="He,Ncmpc"\w* \w הַ⁠בַּ֨יִת֙|lemma="בַּיִת" strong="d:H1004b" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/house"\w* @@ -2893,7 +2893,7 @@ \v 6 \w ה⁠יצוע|lemma="יָצוּעַ" strong="d:H3326a" x-morph="He,Td:Ncmsa"\w* -\f + \ft Q \w הַיָּצִ֨יעַ|lemma="יָצוּעַ" strong="d:H3326b" x-morph="He,Td:Ncmsa"\w*\f* +\f + \ft Q \+w הַיָּצִ֨יעַ|lemma="יָצוּעַ" strong="d:H3326b" x-morph="He,Td:Ncmsa"\+w*\f* \w הַ⁠תַּחְתֹּנָ֜ה|lemma="תַּחְתּוֹן" strong="d:H8481" x-morph="He,Td:Aafsa"\w* \w חָמֵ֧שׁ|lemma="חָמֵשׁ" strong="H2568" x-morph="He,Acfsa"\w* \w בָּ⁠אַמָּ֣ה|lemma="אַמָּה" strong="b:H0520a" x-morph="He,Rd:Ncfsa"\w* @@ -2956,7 +2956,7 @@ \v 10 \w וַ⁠יִּ֤בֶן|lemma="בָּנָה" strong="c:H1129" x-morph="He,C:Vqw3ms"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w ה⁠יצוע|lemma="יָצוּעַ" strong="d:H3326a" x-morph="He,Td:Ncmsa"\w* -\f + \ft Q \w הַיָּצִ֙יעַ֙|lemma="יָצוּעַ" strong="d:H3326b" x-morph="He,Td:Ncmsa"\w*\f* +\f + \ft Q \+w הַיָּצִ֙יעַ֙|lemma="יָצוּעַ" strong="d:H3326b" x-morph="He,Td:Ncmsa"\+w*\f* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w הַ⁠בַּ֔יִת|lemma="בַּיִת" strong="d:H1004b" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/house"\w* \w חָמֵ֥שׁ|lemma="חָמֵשׁ" strong="H2568" x-morph="He,Acfsa"\w* \w אַמּ֖וֹת|lemma="אַמָּה" strong="H0520a" x-morph="He,Ncfpa"\w* @@ -3034,7 +3034,7 @@ \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w עֶשְׂרִ֨ים|lemma="עֶשְׂרִים" strong="H6242" x-morph="He,Acbpa"\w* \w אַמָּ֜ה|lemma="אַמָּה" strong="H0520a" x-morph="He,Ncfsa"\w* \w מ⁠ירכותי|lemma="יְרֵכָה" strong="m:H3411" x-morph="He,R:Ncfdc"\w* -\f + \ft Q \w מִֽיַּרְכְּתֵ֤י|lemma="יְרֵכָה" strong="m:H3411" x-morph="He,R:Ncfdc"\w*\f* +\f + \ft Q \+w מִֽיַּרְכְּתֵ֤י|lemma="יְרֵכָה" strong="m:H3411" x-morph="He,R:Ncfdc"\+w*\f* \w הַ⁠בַּ֨יִת֙|lemma="בַּיִת" strong="d:H1004b" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/house"\w* \w בְּ⁠צַלְע֣וֹת|lemma="צֵלָע" strong="b:H6763" x-morph="He,R:Ncbpc"\w* \w אֲרָזִ֔ים|lemma="אֶרֶז" strong="H0730" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/other/cedar"\w* @@ -3109,7 +3109,7 @@ \w סָג֑וּר|lemma="סָגַר" strong="H5462" x-morph="He,Ncmsa"\w* \w וַ⁠יְעַבֵּ֞ר|lemma="עָבַר" strong="c:H5674a" x-morph="He,C:Vpw3ms" x-tw="rc://*/tw/dict/bible/other/preach"\w* \w ב⁠רתיקות|lemma="רַתּוֹק" strong="b:H7569" x-morph="He,R:Ncbpc"\w* -\f + \ft K \w ב⁠רתיקות|lemma="רַתּוֹק" strong="b:H7569" x-morph="He,R:Ncbpc"\w*\f* +\f + \ft K \+w ב⁠רתיקות|lemma="רַתּוֹק" strong="b:H7569" x-morph="He,R:Ncbpc"\+w*\f* \w זָהָב֙|lemma="זָהָב" strong="H2091" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/gold"\w* \w לִ⁠פְנֵ֣י|lemma="פָּנִים" strong="l:H6440" x-morph="He,R:Ncbpc"\w* \w הַ⁠דְּבִ֔יר|lemma="דְּבִיר" strong="d:H1687" x-morph="He,Td:Ncmsa"\w* @@ -3329,7 +3329,7 @@ \w הַ⁠בַּ֔יִת|lemma="בַּיִת" strong="d:H1004b" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/house"\w* \w לְ⁠כָל|lemma="כֹּל" strong="l:H3605" x-morph="He,R:Ncmsc"\w*־\w דְּבָרָ֖י⁠ו|lemma="דָּבָר" strong="H1697" x-morph="He,Ncmpc:Sp3ms"\w* \w וּ⁠לְ⁠כָל|lemma="כֹּל" strong="c:l:H3605" x-morph="He,C:R:Ncmsc"\w*־\w מִשְׁפָּטָ֑יו|lemma="מִשְׁפָּט" strong="H4941" x-morph="He,Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/judge"\w* -\f + \ft K \w משפט⁠ו|lemma="מִשְׁפָּט" strong="H4941" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w משפט⁠ו|lemma="מִשְׁפָּט" strong="H4941" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w וַ⁠יִּבְנֵ֖⁠הוּ|lemma="בָּנָה" strong="c:H1129" x-morph="He,C:Vqw3ms:Sp3ms"\w* \w שֶׁ֥בַע|lemma="שֶׁבַע" strong="H7651" x-morph="He,Acfsa"\w* \w שָׁנִֽים|lemma="שָׁנֶה" strong="H8141" x-morph="He,Ncfpa"\w*׃ @@ -3632,7 +3632,7 @@ \w אֲשֶׁ֖ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w לְ⁠עֵ֣בֶר|lemma="עֵבֶר" strong="l:H5676" x-morph="He,R:Ncmsc"\w* \w הַ/שְּׂבָכָ֑ה|lemma="שְׂבָכָה" strong="d:H7639" x-morph="Td:He,Ncfsa"\w* -\f + \ft K \w שבכה|lemma="שְׂבָכָה" strong="H7639" x-morph="He,Ncfsa"\w*\f* +\f + \ft K \+w שבכה|lemma="שְׂבָכָה" strong="H7639" x-morph="He,Ncfsa"\+w*\f* \w וְ⁠הָ⁠רִמּוֹנִ֤ים|lemma="רִמּוֹן" strong="c:d:H7416" x-morph="He,C:Td:Ncmpa"\w* \w מָאתַ֨יִם֙|lemma="מֵאָה" strong="H3967" x-morph="He,Acbda"\w* \w טֻרִ֣ים|lemma="טוּר" strong="H2905" x-morph="He,Ncmpa"\w* @@ -3683,7 +3683,7 @@ \w בָּֽ⁠אַמָּה֙|lemma="אַמָּה" strong="b:H0520a" x-morph="He,Rd:Ncfsa"\w* \w קוֹמָת֔⁠וֹ|lemma="קוֹמָה" strong="H6967" x-morph="He,Ncfsc:Sp3ms"\w* \w וְקָו֙|lemma="קַו" strong="c:H6957" x-morph="He,C:Ncmsa"\w* -\f + \ft K \w ו⁠קוה|lemma="קָוֶה" strong="c:H6957" x-morph="He,C:Ncmsa"\w*\f* +\f + \ft K \+w ו⁠קוה|lemma="קָוֶה" strong="c:H6957" x-morph="He,C:Ncmsa"\+w*\f* \w שְׁלֹשִׁ֣ים|lemma="שְׁלוֹשִׁים" strong="H7970" x-morph="He,Acbpa"\w* \w בָּֽ⁠אַמָּ֔ה|lemma="אַמָּה" strong="b:H0520a" x-morph="He,Rd:Ncfsa"\w* \w יָסֹ֥ב|lemma="סָבַב" strong="H5437" x-morph="He,Vqi3ms"\w* @@ -3887,7 +3887,7 @@ \w יְדֹתֶ֔י⁠הָ|lemma="יָד" strong="H3027" x-morph="He,Ncbpc:Sp3fs" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w וְ⁠עַל֙|lemma="עַל" strong="c:H5921a" x-morph="He,C:R"\w* \w ו⁠מסגרתי⁠ה|lemma="מִסְגֶּרֶת" strong="c:H4526" x-morph="He,C:Ncfpc:Sp3fs"\w* -\f + \ft Q \w מִסְגְּרֹתֶ֔יהָ|lemma="מִסְגֶּרֶת" strong="c:H4526" x-morph="He,C:Ncfpc:Sp3fs"\w*\f* +\f + \ft Q \+w מִסְגְּרֹתֶ֔יהָ|lemma="מִסְגֶּרֶת" strong="c:H4526" x-morph="He,C:Ncfpc:Sp3fs"\+w*\f* \w כְּרוּבִ֖ים|lemma="כְּרוּב" strong="H3742" x-morph="He,Ncmpa"\w* \w אֲרָי֣וֹת|lemma="אֲרִי" strong="H0738a" x-morph="He,Ncmpa"\w* \w וְ⁠תִמֹרֹ֑ת|lemma="תִּמֹּר" strong="c:H8561" x-morph="He,C:Ncfpa"\w* @@ -4025,7 +4025,7 @@ \w וְ⁠אֵת֙|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w* \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w הַ⁠כֵּלִ֣ים|lemma="כְּלִי" strong="d:H3627" x-morph="He,Td:Ncmpa"\w* \w הָאֵ֔לֶּה|lemma="אֵלֶּה" strong="d:H0428" x-morph="He,Td:Pdxcp"\w* -\f + \ft K \w ה⁠אהל|lemma="אֹהֶל" strong="d:H0168" x-morph="He,Td:Ncmsa"\w*\f* +\f + \ft K \+w ה⁠אהל|lemma="אֹהֶל" strong="d:H0168" x-morph="He,Td:Ncmsa"\+w*\f* \w אֲשֶׁ֨ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w עָשָׂ֥ה|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqp3ms"\w* \w חִירָ֛ם|lemma="חִירָם" strong="H2438" x-morph="He,Np"\w* @@ -4542,7 +4542,7 @@ \w יֵאָ֤מֶן|lemma="אָמַן" strong="H0539" x-morph="He,VNj3ms" x-tw="rc://*/tw/dict/bible/kt/faithful"\w* \w נָא֙|lemma="נָא" strong="H4994" x-morph="He,Te"\w* \w דְּבָ֣רְךָ֔|lemma="דָּבָר" strong="H1697" x-morph="He,Ncmsc:Sp2ms"\w* -\f + \ft K \w דברי⁠ך|lemma="דָּבָר" strong="H1697" x-morph="He,Ncmpc:Sp2ms"\w*\f* +\f + \ft K \+w דברי⁠ך|lemma="דָּבָר" strong="H1697" x-morph="He,Ncmpc:Sp2ms"\+w*\f* \w אֲשֶׁ֣ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w דִּבַּ֔רְתָּ|lemma="דָבַר" strong="H1696" x-morph="He,Vpp2ms"\w* \w לְ⁠עַבְדְּ⁠ךָ֖|lemma="עֶבֶד" strong="l:H5650" x-morph="He,R:Ncmsc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/servant"\w* @@ -4940,7 +4940,7 @@ \w בָּחַ֔רְתָּ|lemma="בָּחַר" strong="H0977" x-morph="He,Vqp2ms"\w* \w וְ⁠הַ⁠בַּ֖יִת|lemma="בַּיִת" strong="c:d:H1004b" x-morph="He,C:Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/household"\w* \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w בָּנִ֥יתִי|lemma="בָּנָה" strong="H1129" x-morph="He,Vqp1cs"\w* -\f + \ft K \w בנית|lemma="בָּנָה" strong="H1129" x-morph="He,Vqp2ms"\w*\f* +\f + \ft K \+w בנית|lemma="בָּנָה" strong="H1129" x-morph="He,Vqp2ms"\+w*\f* \w לִ⁠שְׁמֶֽ⁠ךָ|lemma="שֵׁם" strong="l:H8034" x-morph="He,R:Ncmsc:Sp2ms"\w*׃ \v 49 @@ -5412,7 +5412,7 @@ \w בֵּ⁠אלֹהִ֣ים|lemma="אֱלֹהִים" strong="b:H0430" x-morph="He,R:Ncmpa" x-tw="rc://*/tw/dict/bible/kt/god"\w* \w אֲחֵרִ֔ים|lemma="אַחֵר" strong="H0312" x-morph="He,Aampa"\w* \w ו⁠ישתחו|lemma="שָׁחָה" strong="c:H7812" x-morph="He,C:Vvw3ms" x-tw="rc://*/tw/dict/bible/kt/worship"\w* -\f + \ft Q \w וַיִּשְׁתַּחֲו֥וּ|lemma="שָׁחָה" strong="c:H7812" x-morph="He,C:Vvw3ms"\w*\f* +\f + \ft Q \+w וַיִּשְׁתַּחֲו֥וּ|lemma="שָׁחָה" strong="c:H7812" x-morph="He,C:Vvw3ms"\+w*\f* \w לָ⁠הֶ֖ם|lemma="" strong="l" x-morph="He,R:Sp3mp"\w* \w וַ⁠יַּעַבְדֻ֑⁠ם|lemma="עָבַד" strong="c:H5647" x-morph="He,C:Vqw3mp:Sp3mp"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w כֵּ֗ן|lemma="כֵּן" strong="H3651c" x-morph="He,Tm"\w* @@ -5543,7 +5543,7 @@ \v 18 \w וְ⁠אֶֽת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w בַּעֲלָ֛ת|lemma="בַּעֲלָת" strong="H1191" x-morph="He,Np"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w תַּדְמֹ֥ר|lemma="תַּדְמֹר" strong="H8412" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/tamar"\w* -\f + \ft K \w תמר|lemma="תָּמָר" strong="H8559" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/tamar"\w*\f* +\f + \ft K \+w תמר|lemma="תָּמָר" strong="H8559" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/tamar"\+w*\f* \w בַּ⁠מִּדְבָּ֖ר|lemma="מִדְבָּר" strong="b:H4057b" x-morph="He,Rd:Ncmsa" x-tw="rc://*/tw/dict/bible/other/desert"\w* \w בָּ⁠אָֽרֶץ|lemma="אֶרֶץ" strong="b:H0776" x-morph="He,Rd:Ncbsa"\w*׃ @@ -5772,7 +5772,7 @@ \w עֲבָדָי⁠ו֩|lemma="עֶבֶד" strong="H5650" x-morph="He,Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/servant"\w* \w וּ⁠מַעֲמַ֨ד|lemma="מַעֲמָד" strong="c:H4612" x-morph="He,C:Ncmsc"\w* \w מְשָׁרְתָ֜יו|lemma="שָׁרַת" strong="H8334" x-morph="He,Vprmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/servant"\w* -\f + \ft K \w משרת⁠ו|lemma="שָׁרַת" strong="H8334" x-morph="He,Vprmsc:Sp3ms"\w*\f* +\f + \ft K \+w משרת⁠ו|lemma="שָׁרַת" strong="H8334" x-morph="He,Vprmsc:Sp3ms"\+w*\f* \w וּ⁠מַלְבֻּֽשֵׁי⁠הֶם֙|lemma="מַלְבּוּשׁ" strong="c:H4403" x-morph="He,C:Ncmpc:Sp3mp"\w* \w וּ⁠מַשְׁקָ֔י⁠ו|lemma="מַשְׁקֶה" strong="c:H4945a" x-morph="He,C:Ncmpc:Sp3ms"\w* \w וְ⁠עֹ֣לָת֔⁠וֹ|lemma="עֹלָה" strong="c:H5930a" x-morph="He,C:Ncfsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/burntoffering"\w* @@ -6893,7 +6893,7 @@ \w וַֽ⁠יִּשְׁלְחוּ֙|lemma="שָׁלַח" strong="c:H7971" x-morph="He,C:Vqw3mp"\w* \w וַ⁠יִּקְרְאוּ|lemma="קָרָא" strong="c:H7121" x-morph="He,C:Vqw3mp" x-tw="rc://*/tw/dict/bible/other/declare"\w*־\w ל֔⁠וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* \w ו⁠יבאו|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3mp"\w* -\f + \ft Q \w וַיָּבֹ֥א|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3ms"\w*\f* +\f + \ft Q \+w וַיָּבֹ֥א|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3ms"\+w*\f* \w יָרָבְעָ֖ם|lemma="יָרׇבְעָם" strong="H3379" x-morph="He,Np"\w* \w וְ⁠כָל|lemma="כֹּל" strong="c:H3605" x-morph="He,C:Ncmsc"\w*־\w קְהַ֣ל|lemma="קָהָל" strong="H6951" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/assembly"\w* \w יִשְׂרָאֵ֑ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* @@ -6951,7 +6951,7 @@ \v 7 \w וַיְדַבְּר֨וּ|lemma="דָבַר" strong="c:H1696" x-morph="He,C:Vpw3ms"\w* -\f + \ft K \w ו⁠ידבר|lemma="דָבַר" strong="c:H1696" x-morph="He,C:Vpw3ms"\w*\f* +\f + \ft K \+w ו⁠ידבר|lemma="דָבַר" strong="c:H1696" x-morph="He,C:Vpw3ms"\+w*\f* \w אֵלָ֜י⁠ו|lemma="אֵל" strong="H0413" x-morph="He,R:Sp3ms"\w* \w לֵ⁠אמֹ֗ר|lemma="אָמַר" strong="l:H0559" x-morph="He,R:Vqc"\w* \w אִם|lemma="אִם" strong="H0518a" x-morph="He,C"\w*־\w הַ֠⁠יּוֹם|lemma="יוֹם" strong="d:H3117" x-morph="He,Td:Ncmsa"\w* @@ -7054,8 +7054,8 @@ \v 12 \w ו⁠יבו|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3mx"\w* -\f + \ft Q \w וַיָּב֨וֹא|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3ms"\w*\f* -\f + \ft Some manuscripts read \w ו⁠יבאו|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3mp"\w*\f* +\f + \ft Q \+w וַיָּב֨וֹא|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3ms"\+w*\f* +\f + \ft Some manuscripts read \w ו⁠יבאו|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3mp"\+w*\f* \w יָרָבְעָ֧ם|lemma="יָרׇבְעָם" strong="H3379" x-morph="He,Np"\w* \w וְ⁠כָל|lemma="כֹּל" strong="c:H3605" x-morph="He,C:Ncmsc"\w*־\w הָ⁠עָ֛ם|lemma="עַם" strong="d:H5971a" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w רְחַבְעָ֖ם|lemma="רְחַבְעָם" strong="H7346" x-morph="He,Np"\w* @@ -7414,7 +7414,7 @@ \w בַּ⁠חֹ֖דֶשׁ|lemma="חֹדֶשׁ" strong="b:H2320" x-morph="He,Rd:Ncmsa"\w* \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w בָּדָ֣א|lemma="בָּדָא" strong="H0908" x-morph="He,Vqp3ms"\w* \w מִלִּבּ֑וֹ|lemma="בַּד" strong="m:H3820" x-morph="He,R:Ncbsa:Sp3ms"\w* -\f + \ft K \w מ⁠ל⁠בד|lemma="בַּד" strong="m:l:H0905" x-morph="He,R:R:Ncmsa"\w*\f* +\f + \ft K \+w מ⁠ל⁠בד|lemma="בַּד" strong="m:l:H0905" x-morph="He,R:R:Ncmsa"\+w*\f* \w וַ⁠יַּ֤עַשׂ|lemma="עָשָׂה" strong="c:H6213a" x-morph="He,C:Vqw3ms"\w* \w חָג֙|lemma="חַג" strong="H2282" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/feast"\w* \w לִ⁠בְנֵ֣י|lemma="בֵּן" strong="l:H1121a" x-morph="He,R:Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* @@ -8020,7 +8020,7 @@ \w וְ⁠לֹ֣א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w* \w יֵֽדְע֔וּ|lemma="יָדַע" strong="H3045" x-morph="He,Vqi3mp" x-tw="rc://*/tw/dict/bible/other/know"\w* \w כִּי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w אתי|lemma="אַתְּ" strong="H0859b" x-morph="He,Pp2fs"\w* -\f + \ft Q \w אַ֖תְּ|lemma="אַתְּ" strong="H0859b" x-morph="He,Pp2fs"\w*\f* +\f + \ft Q \+w אַ֖תְּ|lemma="אַתְּ" strong="H0859b" x-morph="He,Pp2fs"\+w*\f* \w אֵ֣שֶׁת|lemma="אִשָּׁה" strong="H0802" x-morph="He,Ncfsc"\w* \w יָרָבְעָ֑ם|lemma="יָרׇבְעָם" strong="H3379" x-morph="He,Np"\w* \w וְ⁠הָלַ֣כְתְּ|lemma="הָלַךְ" strong="c:H1980" x-morph="He,C:Vqq2fs"\w* @@ -8431,7 +8431,7 @@ \w רְחַבְעָ֑ם|lemma="רְחַבְעָם" strong="H7346" x-morph="He,Np"\w* \w עָלָ֛ה|lemma="עָלָה" strong="H5927" x-morph="He,Vqp3ms"\w* \w שִׁישַׁ֥ק|lemma="שִׁישַׁק" strong="H7895" x-morph="He,Np"\w* -\f + \ft K \w שושק|lemma="שִׁישַׁק" strong="H7895" x-morph="He,Np"\w*\f* +\f + \ft K \+w שושק|lemma="שִׁישַׁק" strong="H7895" x-morph="He,Np"\+w*\f* \w מֶֽלֶךְ|lemma="מֶלֶךְ" strong="H4428" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/king"\w*־\w מִצְרַ֖יִם|lemma="מִצְרַיִם" strong="H4714" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/egypt"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w יְרוּשָׁלִָֽם|lemma="יְרוּשָׁלִַ͏ם" strong="H3389" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jerusalem"\w*׃ @@ -8705,7 +8705,7 @@ \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w קָדְשֵׁ֣י|lemma="קֹדֶשׁ" strong="H6944" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/holy"\w* \w אָבִ֔י⁠ו|lemma="אָב" strong="H0001" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/father"\w* \w ו⁠קדש⁠ו|lemma="קֹדֶשׁ" strong="c:H6944" x-morph="He,C:Ncmsc:Sp3ms"\w* -\f + \ft Q \w וְקָדְשֵׁ֖י|lemma="קֹדֶשׁ" strong="c:H6944" x-morph="He,C:Ncmpc"\w*\f* +\f + \ft Q \+w וְקָדְשֵׁ֖י|lemma="קֹדֶשׁ" strong="c:H6944" x-morph="He,C:Ncmpc"\+w*\f* \w בֵּ֣ית|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w* \w יְהוָ֑ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w כֶּ֥סֶף|lemma="כֶּסֶף" strong="H3701" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/silver"\w* @@ -8748,7 +8748,7 @@ \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w אֽוֹצְרוֹת֙|lemma="אוֹצָר" strong="H0214" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/other/storehouse"\w* \w בֵּ֣ית|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w* \w הַמֶּ֔לֶךְ|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* -\f + \ft K \w מלך|lemma="מֶלֶךְ" strong="H4428" x-morph="He,Ncmsa"\w*\f* +\f + \ft K \+w מלך|lemma="מֶלֶךְ" strong="H4428" x-morph="He,Ncmsa"\+w*\f* \w וַֽ⁠יִּתְּנֵ֖⁠ם|lemma="נָתַן" strong="c:H5414" x-morph="He,C:Vqw3ms:Sp3mp"\w* \w בְּ⁠יַד|lemma="יָד" strong="b:H3027" x-morph="He,R:Ncbsc" x-tw="rc://*/tw/dict/bible/other/hand"\w*־\w עֲבָדָ֑י⁠ו|lemma="עֶבֶד" strong="H5650" x-morph="He,Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/servant"\w* \w וַ⁠יִּשְׁלָחֵ֞⁠ם|lemma="שָׁלַח" strong="c:H7971" x-morph="He,C:Vqw3ms:Sp3mp"\w* @@ -9295,7 +9295,7 @@ \v 19 \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w חטאת⁠ו|lemma="חַטָּאָה" strong="H2403b" x-morph="He,Ncfsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/sin"\w* -\f + \ft Q \w חַטֹּאתָיו֙|lemma="חַטָּאָה" strong="H2403b" x-morph="He,Ncfpc:Sp3ms"\w*\f* +\f + \ft Q \+w חַטֹּאתָיו֙|lemma="חַטָּאָה" strong="H2403b" x-morph="He,Ncfpc:Sp3ms"\+w*\f* \w אֲשֶׁ֣ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w חָטָ֔א|lemma="חָטָא" strong="H2398" x-morph="He,Vqp3ms" x-tw="rc://*/tw/dict/bible/kt/sin"\w* \w לַ⁠עֲשׂ֥וֹת|lemma="עָשָׂה" strong="l:H6213a" x-morph="He,R:Vqc"\w* @@ -9415,7 +9415,7 @@ \w יָרָבְעָ֣ם|lemma="יָרׇבְעָם" strong="H3379" x-morph="He,Np"\w* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w נְבָ֔ט|lemma="נְבָט" strong="H5028" x-morph="He,Np"\w* \w ו⁠ב⁠חטאתי⁠ו|lemma="חַטָּאָה" strong="c:b:H2403b" x-morph="He,C:R:Ncfpc:Sp3ms"\w* -\f + \ft Q \w וּבְחַטָּאת֔וֹ|lemma="חַטָּאָה" strong="c:b:H2403b" x-morph="He,C:R:Ncfsc:Sp3ms"\w*\f* +\f + \ft Q \+w וּבְחַטָּאת֔וֹ|lemma="חַטָּאָה" strong="c:b:H2403b" x-morph="He,C:R:Ncfsc:Sp3ms"\+w*\f* \w אֲשֶׁ֥ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w הֶחֱטִ֖יא|lemma="חָטָא" strong="H2398" x-morph="He,Vhp3ms" x-tw="rc://*/tw/dict/bible/kt/sin"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w יִשְׂרָאֵ֑ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* @@ -9543,7 +9543,7 @@ \w בְּכֹר֜⁠וֹ|lemma="בְּכוֹר" strong="H1060" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/firstborn"\w* \w יִסְּדָ֗⁠הּ|lemma="יָסַד" strong="H3245" x-morph="He,Vpp3ms:Sp3fs" x-tw="rc://*/tw/dict/bible/other/foundation"\w* \w וּבִשְׂג֤וּב|lemma="שְׂגוּב" strong="c:b:H7687" x-morph="He,C:R:Np"\w* -\f + \ft K \w ו⁠ב⁠שגיב|lemma="שְׂגוּב" strong="c:b:H7687" x-morph="He,C:R:Np"\w*\f* +\f + \ft K \+w ו⁠ב⁠שגיב|lemma="שְׂגוּב" strong="c:b:H7687" x-morph="He,C:R:Np"\+w*\f* \w צְעִיר⁠וֹ֙|lemma="צָעִיר" strong="H6810" x-morph="He,Aamsc:Sp3ms"\w* \w הִצִּ֣יב|lemma="נָצַב" strong="H5324" x-morph="He,Vhp3ms"\w* \w דְּלָתֶ֔י⁠הָ|lemma="דֶּלֶת" strong="H1817c" x-morph="He,Ncfdc:Sp3fs" x-tw="rc://*/tw/dict/bible/other/gate"\w* @@ -9760,7 +9760,7 @@ \w עַ֠ד|lemma="עַד" strong="H5704" x-morph="He,R"\w* \w י֧וֹם|lemma="יוֹם" strong="H3117" x-morph="He,Ncmsc"\w* \w תתן|lemma="נָתַן" strong="H5414" x-morph="He,Vqc"\w*־\w יְהוָ֛ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* -\f + \ft Q \w תֵּת|lemma="נָתַן" strong="H5414" x-morph="He,Vqc"\w*\f* +\f + \ft Q \+w תֵּת|lemma="נָתַן" strong="H5414" x-morph="He,Vqc"\+w*\f* \w גֶּ֖שֶׁם|lemma="גֶּשֶׁם" strong="H1653" x-morph="He,Ncmsa"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w פְּנֵ֥י|lemma="פָּנִים" strong="H6440" x-morph="He,Ncbpc" x-tw="rc://*/tw/dict/bible/other/face"\w* \w הָ⁠אֲדָמָֽה|lemma="אֲדָמָה" strong="d:H0127" x-morph="He,Td:Ncfsa"\w*׃ @@ -10481,7 +10481,7 @@ \w וַ⁠אֲנִ֣י|lemma="אֲנִי" strong="c:H0589" x-morph="He,C:Pp1cs"\w* \w עַבְדֶּ֑⁠ךָ|lemma="עֶבֶד" strong="H5650" x-morph="He,Ncmsc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/servant"\w* \w וּבִדְבָרְךָ֣|lemma="דָּבָר" strong="c:b:H1697" x-morph="He,C:R:Ncmsc:Sp2ms"\w* -\f + \ft K \w ו⁠ב⁠דברי⁠ך|lemma="דָּבָר" strong="c:b:H1697" x-morph="He,C:R:Ncmpc:Sp2ms"\w*\f* +\f + \ft K \+w ו⁠ב⁠דברי⁠ך|lemma="דָּבָר" strong="c:b:H1697" x-morph="He,C:R:Ncmpc:Sp2ms"\+w*\f* \w עָשִׂ֔יתִי|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqp1cs"\w* \w אֵ֥ת|lemma="אֵת" strong="H0853" x-morph="He,To"\w* \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w הַ⁠דְּבָרִ֖ים|lemma="דָּבָר" strong="d:H1697" x-morph="He,Td:Ncmpa"\w* @@ -10571,7 +10571,7 @@ \w פָּנָ֖י⁠ו|lemma="פָּנִים" strong="H6440" x-morph="He,Ncbpc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/face"\w* \w בֵּ֥ין|lemma="בֵּין" strong="H0996" x-morph="He,R"\w* \w בִּרְכָּֽיו|lemma="בֶּרֶךְ" strong="H1290" x-morph="He,Ncfdc:Sp3ms"\w*׃ -\f + \ft K \w ברכ⁠ו|lemma="בֶּרֶךְ" strong="H1290" x-morph="He,Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w ברכ⁠ו|lemma="בֶּרֶךְ" strong="H1290" x-morph="He,Ncfsc:Sp3ms"\+w*\f* \v 43 \w וַ⁠יֹּ֣אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* @@ -10695,7 +10695,7 @@ \w תַּ֖חַת|lemma="תַּחַת" strong="H8478" x-morph="He,R"\w* \w רֹ֣תֶם|lemma="רֶתֶם" strong="H7574" x-morph="He,Ncmsa"\w* \w אֶחָ֑ד|lemma="אֶחָד" strong="H0259" x-morph="He,Acmsa"\w* -\f + \ft K \w אחת|lemma="אֶחָד" strong="H0259" x-morph="He,Acfsa"\w*\f* +\f + \ft K \+w אחת|lemma="אֶחָד" strong="H0259" x-morph="He,Acfsa"\+w*\f* \w וַ⁠יִּשְׁאַ֤ל|lemma="שָׁאַל" strong="c:H7592" x-morph="He,C:Vqw3ms"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w נַפְשׁ⁠וֹ֙|lemma="נֶפֶשׁ" strong="H5315" x-morph="He,Ncbsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/life"\w* \w לָ⁠מ֔וּת|lemma="מוּת" strong="l:H4191" x-morph="He,R:Vqc" x-tw="rc://*/tw/dict/bible/other/death"\w* @@ -11692,7 +11692,7 @@ \w וַ⁠יָּ֨סַר֙|lemma="סוּר" strong="c:H5493" x-morph="He,C:Vhw3ms"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הָ֣⁠אֲפֵ֔ר|lemma="אֲפֵר" strong="d:H0666" x-morph="He,Td:Ncmsa"\w* \w מ⁠על|lemma="עַל" strong="m:H5921a" x-morph="He,R:R"\w* -\f + \ft Q \w מֵעֲלֵ֖י|lemma="עַל" strong="m:H5921a" x-morph="He,R:R"\w*\f* +\f + \ft Q \+w מֵעֲלֵ֖י|lemma="עַל" strong="m:H5921a" x-morph="He,R:R"\+w*\f* \w עֵינָ֑י⁠ו|lemma="עַיִן" strong="H5869a" x-morph="He,Ncbdc:Sp3ms"\w* \w וַ⁠יַּכֵּ֤ר|lemma="נָכַר" strong="c:H5234a" x-morph="He,C:Vhw3ms"\w* \w אֹת⁠וֹ֙|lemma="אֵת" strong="H0853" x-morph="He,To:Sp3ms"\w* @@ -11878,7 +11878,7 @@ \w בְּ⁠חֹתָמ֑⁠וֹ|lemma="חוֹתָם" strong="b:H2368" x-morph="He,R:Ncmsc:Sp3ms"\w* \w וַ⁠תִּשְׁלַ֣ח|lemma="שָׁלַח" strong="c:H7971" x-morph="He,C:Vqw3fs"\w* \w ה⁠ספרים|lemma="סֵפֶר" strong="d:H5612a" x-morph="He,Td:Ncmpa"\w* -\f + \ft Q \w סְפָרִ֗ים|lemma="סֵפֶר" strong="d:H5612a" x-morph="He,Ncmpa"\w*\f* +\f + \ft Q \+w סְפָרִ֗ים|lemma="סֵפֶר" strong="d:H5612a" x-morph="He,Ncmpa"\+w*\f* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w הַ⁠זְקֵנִ֤ים|lemma="זָקֵן" strong="d:H2205" x-morph="He,Td:Aampa" x-tw="rc://*/tw/dict/bible/other/elder"\w* \w וְ⁠אֶל|lemma="אֵל" strong="c:H0413" x-morph="He,C:R"\w*־\w הַֽ⁠חֹרִים֙|lemma="חֹר" strong="d:H2715" x-morph="He,Td:Ncmpa" x-tw="rc://*/tw/dict/bible/other/noble"\w* \w אֲשֶׁ֣ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* @@ -12078,7 +12078,7 @@ \v 21 \w הִנְ⁠נִ֨י|lemma="הֵן" strong="H2005" x-morph="He,Tm:Sp1cs"\w* \w מֵבִ֤יא|lemma="בּוֹא" strong="H0935" x-morph="He,Vhrmsa"\w* -\f + \ft K \w מבי|lemma="בּוֹא" strong="H0935" x-morph="He,Vhrmsa"\w*\f* +\f + \ft K \+w מבי|lemma="בּוֹא" strong="H0935" x-morph="He,Vhrmsa"\+w*\f* \w אֵלֶ֨י⁠ךָ֙|lemma="אֵל" strong="H0413" x-morph="He,R:Sp2ms"\w* \w רָעָ֔ה|lemma="רַע" strong="H7451c" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/kt/evil"\w* \w וּ⁠בִעַרְתִּ֖י|lemma="בָּעַר" strong="c:H1197a" x-morph="He,C:Vpq1cs"\w* @@ -12193,7 +12193,7 @@ \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w נִכְנַ֣ע|lemma="כָּנַע" strong="H3665" x-morph="He,VNp3ms"\w* \w מִ⁠פָּנַ֗⁠י|lemma="פָּנִים" strong="m:H6440" x-morph="He,R:Ncbpc:Sp1cs"\w* \w לֹֽא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w אָבִ֤יא|lemma="בּוֹא" strong="H0935" x-morph="He,Vhi1cs"\w* -\f + \ft K \w אבי|lemma="בּוֹא" strong="H0935" x-morph="He,Vhi1cs"\w*\f* +\f + \ft K \+w אבי|lemma="בּוֹא" strong="H0935" x-morph="He,Vhi1cs"\+w*\f* \w הָֽ⁠רָעָה֙|lemma="רַע" strong="d:H7451c" x-morph="He,Td:Ncfsa" x-tw="rc://*/tw/dict/bible/kt/evil"\w* \w בְּ⁠יָמָ֔י⁠ו|lemma="יוֹם" strong="b:H3117" x-morph="He,R:Ncmpc:Sp3ms"\w* \w בִּ⁠ימֵ֣י|lemma="יוֹם" strong="b:H3117" x-morph="He,R:Ncmpc"\w* @@ -12402,7 +12402,7 @@ \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w הַ⁠מֶּ֑לֶךְ|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* \w יְהִֽי|lemma="הָיָה" strong="H1961" x-morph="He,Vqj3ms"\w*־\w נָ֣א|lemma="נָא" strong="H4994" x-morph="He,Te"\w* \w דְבָרְךָ֗|lemma="דָּבָר" strong="H1697" x-morph="He,Ncmsc:Sp2ms"\w* -\f + \ft K \w דברי⁠ך|lemma="דָּבָר" strong="H1697" x-morph="He,Ncmpc:Sp2ms"\w*\f* +\f + \ft K \+w דברי⁠ך|lemma="דָּבָר" strong="H1697" x-morph="He,Ncmpc:Sp2ms"\+w*\f* \w כִּ⁠דְבַ֛ר|lemma="דָּבָר" strong="k:H1697" x-morph="He,R:Ncmsc"\w* \w אַחַ֥ד|lemma="אֶחָד" strong="H0259" x-morph="He,Acmsa"\w* \w מֵ⁠הֶ֖ם|lemma="" strong="m" x-morph="He,R:Sp3mp"\w* @@ -12911,7 +12911,7 @@ \va 49\va* \w יְהוֹשָׁפָ֡ט|lemma="יְהוֹשָׁפָט" strong="H3092" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jehoshaphat"\w* \w עָשָׂה֩|lemma="עָשָׂה" strong="H6213" x-morph="He,Vqp3ms"\w* -\f + \ft K \w עשר|lemma="עָשָׂר" strong="H6240" x-morph="He,Acmsa"\w*\f* +\f + \ft K \+w עשר|lemma="עָשָׂר" strong="H6240" x-morph="He,Acmsa"\+w*\f* \w אֳנִיּ֨וֹת|lemma="אֳנִיָּה" strong="H0591" x-morph="He,Ncfpc"\w* \w תַּרְשִׁ֜ישׁ|lemma="תַּרְשִׁישׁ" strong="H8659" x-morph="He,Np"\w* \w לָ⁠לֶ֧כֶת|lemma="יָלַךְ" strong="l:H3212" x-morph="He,R:Vqc"\w* @@ -12920,7 +12920,7 @@ \w וְ⁠לֹ֣א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w* \w הָלָ֑ךְ|lemma="הָלַךְ" strong="H1980" x-morph="He,Vqp3ms" x-tw="rc://*/tw/dict/bible/other/walk"\w* \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w נִשְׁבְּר֥וּ|lemma="שָׁבַר" strong="H7665" x-morph="He,VNp3cp"\w* -\f + \ft K \w נשברה|lemma="שָׁבַר" strong="H7665" x-morph="He,VNp3fs"\w*\f* +\f + \ft K \+w נשברה|lemma="שָׁבַר" strong="H7665" x-morph="He,VNp3fs"\+w*\f* \w אֳנִיּ֖וֹת|lemma="אֳנִיָּה" strong="H0591" x-morph="He,Ncfpa"\w* \w בְּ⁠עֶצְי֥וֹן|lemma="עֶצְיוֹן גֶּבֶר" strong="b:H6100" x-morph="He,R:Np"\w* \w גָּֽבֶר|lemma="עֶצְיוֹן גֶּבֶר" strong="H6100" x-morph="He,Np"\w*׃ diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/12-2KI.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/12-2KI.usfm index 3f462ae1..5e804181 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/12-2KI.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/12-2KI.usfm @@ -628,7 +628,7 @@ \w א֖וֹ|lemma="אוֹ" strong="H0176a" x-morph="He,C"\w* \w בְּ⁠אַחַ֣ת|lemma="אֶחָד" strong="b:H0259" x-morph="He,R:Acfsc"\w* \w ה⁠גיאות|lemma="גַּיְא" strong="d:H1516" x-morph="He,Td:Ncbpa"\w* -\f + \ft Q \w הַגֵּאָי֑וֹת|lemma="גַּיְא" strong="d:H1516" x-morph="He,Td:Ncbpa"\w*\f* +\f + \ft Q \+w הַגֵּאָי֑וֹת|lemma="גַּיְא" strong="d:H1516" x-morph="He,Td:Ncbpa"\+w*\f* \w וַ⁠יֹּ֖אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* \w לֹ֥א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w תִשְׁלָֽחוּ|lemma="שָׁלַח" strong="H7971" x-morph="He,Vqi2mp"\w*׃ @@ -1117,7 +1117,7 @@ \w וַ⁠יָּנֻ֖סוּ|lemma="נוּס" strong="c:H5127" x-morph="He,C:Vqw3mp"\w* \w מִ⁠פְּנֵי⁠הֶ֑ם|lemma="פָּנִים" strong="m:H6440" x-morph="He,R:Ncbpc:Sp3mp"\w* \w ו⁠יבו|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3mp"\w*־\w בָ֔⁠הּ|lemma="נָכָה" strong="b:H5221" x-morph="He,R:Sp3fs"\w* -\f + \ft Q \w וַיַּכּוּ|lemma="נָכָה" strong="c:H5221" x-morph="He,C:Vqw3mp"\w*\f* +\f + \ft Q \+w וַיַּכּוּ|lemma="נָכָה" strong="c:H5221" x-morph="He,C:Vqw3mp"\+w*\f* \w וְ⁠הַכּ֖וֹת|lemma="נָכָה" strong="c:H5221" x-morph="He,C:Vhc"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w מוֹאָֽב|lemma="מוֹאָב" strong="H4124" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/moab"\w*׃ @@ -1215,7 +1215,7 @@ \w הַגִּ֣ידִי|lemma="נָגַד" strong="H5046" x-morph="He,Vhv2fs"\w* \w לִ֔⁠י|lemma="" strong="l" x-morph="He,R:Sp1cs"\w* \w מַה|lemma="מָה" strong="H4100" x-morph="He,Ti"\w*־\w יֶּשׁ|lemma="יֵשׁ" strong="H3426" x-morph="He,Tm"\w*־\w לָ֖ךְ|lemma="" strong="l" x-morph="He,R:Sp2fs"\w* -\f + \ft K \w ל⁠כי|lemma="" strong="l" x-morph="He,R:Sp2fs"\w*\f* +\f + \ft K \+w ל⁠כי|lemma="" strong="l" x-morph="He,R:Sp2fs"\+w*\f* \w בַּ⁠בָּ֑יִת|lemma="בַּיִת" strong="b:H1004b" x-morph="He,Rd:Ncmsa" x-tw="rc://*/tw/dict/bible/kt/temple"\w* \w וַ⁠תֹּ֗אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3fs"\w* \w אֵ֣ין|lemma="אַיִן" strong="H0369" x-morph="He,Tn"\w* @@ -1234,7 +1234,7 @@ \w מִן|lemma="מִן" strong="H4480a" x-morph="He,R"\w*־\w הַ⁠ח֔וּץ|lemma="חוּץ" strong="d:H2351" x-morph="He,Td:Ncmsa"\w* \w מֵ⁠אֵ֖ת|lemma="אֵת" strong="m:H0854" x-morph="He,R:R"\w* \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w שְׁכֵנָ֑יִךְ|lemma="שָׁכֵן" strong="H7934" x-morph="He,Aampc:Sp2fs"\w* -\f + \ft K \w שכנ⁠כי|lemma="שָׁכֵן" strong="H7934" x-morph="He,Aampc:Sp2fs"\w*\f* +\f + \ft K \+w שכנ⁠כי|lemma="שָׁכֵן" strong="H7934" x-morph="He,Aampc:Sp2fs"\+w*\f* \w כֵּלִ֥ים|lemma="כְּלִי" strong="H3627" x-morph="He,Ncmpa"\w* \w רֵקִ֖ים|lemma="רֵיק" strong="H7386" x-morph="He,Aampa"\w* \w אַל|lemma="אַל" strong="H0408" x-morph="He,Tn"\w*־\w תַּמְעִֽיטִי|lemma="מָעַט" strong="H4591" x-morph="He,Vhj2fs"\w*׃ @@ -1265,7 +1265,7 @@ \w אֵלֶ֖י⁠הָ|lemma="אֵל" strong="H0413" x-morph="He,R:Sp3fs"\w* \w וְ⁠הִ֥יא|lemma="הוּא" strong="c:H1931" x-morph="He,C:Pp3fs"\w* \w מוֹצָֽקֶת|lemma="יָצַק" strong="H3332" x-morph="He,Vhrfsa"\w*׃ -\f + \ft K \w מיצקת|lemma="יָצַק" strong="H3332" x-morph="He,Vhrfsa"\w*\f* +\f + \ft K \+w מיצקת|lemma="יָצַק" strong="H3332" x-morph="He,Vhrfsa"\+w*\f* \v 6 \w וַ⁠יְהִ֣י|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqw3ms"\w* ׀ @@ -1296,10 +1296,10 @@ \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ⁠שֶּׁ֔מֶן|lemma="שֶׁמֶן" strong="d:H8081" x-morph="He,Td:Ncmsa"\w* \w וְ⁠שַׁלְּמִ֖י|lemma="שָׁלַם" strong="c:H7999a" x-morph="He,C:Vpv2fs"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w נִשְׁיֵ֑ךְ|lemma="נְשִׁי" strong="H5386" x-morph="He,Ncmsc:Sp2fs"\w* -\f + \ft K \w נשי⁠כי|lemma="נְשִׁי" strong="H5386" x-morph="He,Ncmsc:Sp2fs"\w*\f* +\f + \ft K \+w נשי⁠כי|lemma="נְשִׁי" strong="H5386" x-morph="He,Ncmsc:Sp2fs"\+w*\f* \w וְ⁠אַ֣תְּ|lemma="אַתָּה" strong="c:H0859c" x-morph="He,C:Pp2fs"\w* \w וּבָנַ֔יִךְ|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc:Sp2fs" x-tw="rc://*/tw/dict/bible/kt/son"\w* -\f + \ft K \w בני⁠כי|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc:Sp2fs"\w*\f* +\f + \ft K \+w בני⁠כי|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc:Sp2fs"\+w*\f* \w תִֽחְיִ֖י|lemma="חָיָה" strong="H2421" x-morph="He,Vqi2fs" x-tw="rc://*/tw/dict/bible/kt/life"\w* \w בַּ⁠נּוֹתָֽר|lemma="יָתַר" strong="b:H3498" x-morph="He,Rd:VNrmsa"\w*׃פ @@ -1424,7 +1424,7 @@ \w כָּ⁠עֵ֣ת|lemma="עֵת" strong="k:H6256" x-morph="He,Rd:Ncbsa"\w* \w חַיָּ֔ה|lemma="חַי" strong="H2416a" x-morph="He,Aafsa" x-tw="rc://*/tw/dict/bible/kt/life"\w* \w אַ֖תְּ|lemma="אַתָּה" strong="H0859b" x-morph="He,Pp2fs"\w* -\f + \ft K \w אתי|lemma="אַתָּה" strong="H0859b" x-morph="He,Pp2fs"\w*\f* +\f + \ft K \+w אתי|lemma="אַתָּה" strong="H0859b" x-morph="He,Pp2fs"\+w*\f* \w חֹבֶ֣קֶת|lemma="חָבַק" strong="H2263" x-morph="He,Vqrfsa"\w* \w בֵּ֑ן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w וַ⁠תֹּ֗אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3fs"\w* @@ -1505,9 +1505,9 @@ \w וַ⁠יֹּ֗אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* \w מַ֠דּוּעַ|lemma="מַדּוּעַ" strong="H4069" x-morph="He,Ti"\w* \w אַ֣תְּ|lemma="אַתָּה" strong="H0859b" x-morph="He,Pp2fs"\w* -\f + \ft K \w אתי|lemma="אַתָּה" strong="H0859b" x-morph="He,Pp2fs"\w*\f* +\f + \ft K \+w אתי|lemma="אַתָּה" strong="H0859b" x-morph="He,Pp2fs"\+w*\f* \w הֹלֶ֤כֶת|lemma="הָלַךְ" strong="H1980" x-morph="He,Vqrfsa" x-tw="rc://*/tw/dict/bible/other/walk"\w* -\f + \ft K \w הלכתי|lemma="הָלַךְ" strong="H1980" x-morph="He,Vqrfsa"\w*\f* +\f + \ft K \+w הלכתי|lemma="הָלַךְ" strong="H1980" x-morph="He,Vqrfsa"\+w*\f* \w אֵלָי⁠ו֙|lemma="אֵל" strong="H0413" x-morph="He,R:Sp3ms"\w* \w הַ⁠יּ֔וֹם|lemma="יוֹם" strong="d:H3117" x-morph="He,Td:Ncmsa"\w* \w לֹֽא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w חֹ֖דֶשׁ|lemma="חֹדֶשׁ" strong="H2320" x-morph="He,Ncmsa"\w* @@ -1680,7 +1680,7 @@ \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w עֵינָי⁠ו֙|lemma="עַיִן" strong="H5869a" x-morph="He,Ncbdc:Sp3ms"\w* \w וְ⁠כַפָּ֣י⁠ו|lemma="כַּף" strong="c:H3709" x-morph="He,C:Ncfdc:Sp3ms"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w כַּפָּ֔יו|lemma="כַּף" strong="H3709" x-morph="He,Ncfdc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/hand"\w* -\f + \ft K \w כפ⁠ו|lemma="כַּף" strong="H3709" x-morph="He,Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w כפ⁠ו|lemma="כַּף" strong="H3709" x-morph="He,Ncfsc:Sp3ms"\+w*\f* \w וַ⁠יִּגְהַ֖ר|lemma="גָּהַר" strong="c:H1457" x-morph="He,C:Vqw3ms"\w* \w עָלָ֑י⁠ו|lemma="עַל" strong="H5921a" x-morph="He,R:Sp3ms"\w* \w וַ⁠יָּ֖חָם|lemma="חָמַם" strong="c:H2552" x-morph="He,C:Vqw3ms"\w* @@ -2007,7 +2007,7 @@ \w וַ⁠יָּבֹ֥א|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3ms"\w* \w נַעֲמָ֖ן|lemma="נַעֲמָן" strong="H5283" x-morph="He,Np"\w* \w בְּסוּסָ֣יו|lemma="סוּס" strong="b:H5483b" x-morph="He,R:Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/horse"\w* -\f + \ft K \w ב⁠סוס⁠ו|lemma="סוּס" strong="b:H5483b" x-morph="He,R:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ב⁠סוס⁠ו|lemma="סוּס" strong="b:H5483b" x-morph="He,R:Ncmsc:Sp3ms"\+w*\f* \w וּ⁠בְ⁠רִכְבּ֑⁠וֹ|lemma="רֶכֶב" strong="c:b:H7393" x-morph="He,C:R:Ncmsc:Sp3ms"\w* \w וַ⁠יַּעֲמֹ֥ד|lemma="עָמַד" strong="c:H5975" x-morph="He,C:Vqw3ms"\w* \w פֶּֽתַח|lemma="פֶּתַח" strong="H6607" x-morph="He,Ncmsc"\w*־\w הַ⁠בַּ֖יִת|lemma="בַּיִת" strong="d:H1004b" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/house"\w* @@ -2052,7 +2052,7 @@ \w הֲ⁠לֹ֡א|lemma="לֹא" strong="i:H3808" x-morph="He,Ti:Tn"\w* \w טוֹב֩|lemma="טוֹב" strong="H2896a" x-morph="He,Aamsa" x-tw="rc://*/tw/dict/bible/kt/good"\w* \w אבנה|lemma="אֲבָנָה" strong="H0071" x-morph="He,Np"\w* -\f + \ft Q \w אֲמָנָ֨ה|lemma="אֲבָנָה" strong="H0071" x-morph="He,Np"\w*\f* +\f + \ft Q \+w אֲמָנָ֨ה|lemma="אֲבָנָה" strong="H0071" x-morph="He,Np"\+w*\f* \w וּ⁠פַרְפַּ֜ר|lemma="פַּרְפַּר" strong="c:H6554" x-morph="He,C:Np"\w* \w נַהֲר֣וֹת|lemma="נָהָר" strong="H5104" x-morph="He,Ncmpc"\w* \w דַּמֶּ֗שֶׂק|lemma="דַּמֶּשֶׂק" strong="H1834" x-morph="He,Np"\w* @@ -2293,7 +2293,7 @@ \w אֵלָי⁠ו֙|lemma="אֵל" strong="H0413" x-morph="He,R:Sp3ms"\w* \w אֱלִישָׁ֔ע|lemma="אֱלִישָׁע" strong="H0477" x-morph="He,Np"\w* \w מ⁠אן|lemma="אָן" strong="m:H0575" x-morph="He,R:Ti"\w* -\f + \ft Q \w מֵאַ֖יִן|lemma="אָן" strong="m:H0370" x-morph="He,R:Ti"\w*\f* +\f + \ft Q \+w מֵאַ֖יִן|lemma="אָן" strong="m:H0370" x-morph="He,R:Ti"\+w*\f* \w גֵּחֲזִ֑י|lemma="גֵּיחֲזִי" strong="H1522" x-morph="He,Np"\w* \w וַ⁠יֹּ֕אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* \w לֹֽא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w הָלַ֥ךְ|lemma="הָלַךְ" strong="H1980" x-morph="He,Vqp3ms" x-tw="rc://*/tw/dict/bible/other/walk"\w* @@ -2459,7 +2459,7 @@ \w אָֽמַר|lemma="אָמַר" strong="H0559" x-morph="He,Vqp3ms"\w*־\w ל֧⁠וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* \w אִישׁ|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsc"\w*־\w הָ⁠אֱלֹהִ֛ים|lemma="אֱלֹהִים" strong="d:H0430" x-morph="He,Td:Ncmpa" x-tw="rc://*/tw/dict/bible/kt/god"\w* \w וְהִזְהִיר֖וֹ|lemma="זָהַר" strong="c:H2094b" x-morph="He,C:Vhp3ms:Sp3ms"\w* -\f + \ft K \w ו⁠הזהיר⁠ה|lemma="זָהַר" strong="c:H2094b" x-morph="He,C:Vhp3ms:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠הזהיר⁠ה|lemma="זָהַר" strong="c:H2094b" x-morph="He,C:Vhp3ms:Sp3ms"\+w*\f* \w וְ⁠נִשְׁמַ֣ר|lemma="שָׁמַר" strong="c:H8104" x-morph="He,C:VNq3ms"\w* \w שָׁ֑ם|lemma="שָׁם" strong="H8033" x-morph="He,D"\w* \w לֹ֥א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* @@ -2710,7 +2710,7 @@ \w הַ⁠קַּ֥ב|lemma="קַב" strong="d:H6894" x-morph="He,Td:Ncmsa"\w* \w חרי|lemma="חֲרֵי־יוֹנִים" strong="H2755" x-morph="He,Ncmsc"\w* \w יונים|lemma="יוֹנָה" strong="H3123" x-morph="He,Ncfpa"\w* -\f + \ft Q \w דִּבְיוֹנִ֖ים|lemma="יוֹנָה" strong="H1686" x-morph="He,Ncfpa"\w*\f* +\f + \ft Q \+w דִּבְיוֹנִ֖ים|lemma="יוֹנָה" strong="H1686" x-morph="He,Ncfpa"\+w*\f* \w בַּ⁠חֲמִשָּׁה|lemma="חָמֵשׁ" strong="b:H2568" x-morph="He,Rd:Acmsa"\w*־\w כָֽסֶף|lemma="כֶּסֶף" strong="H3701" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/silver"\w*׃ \v 26 @@ -3092,7 +3092,7 @@ \w מִן|lemma="מִן" strong="H4480a" x-morph="He,R"\w*־\w הַֽ⁠מַּחֲנֶה֙|lemma="מַחֲנֶה" strong="d:H4264" x-morph="He,Td:Ncbsa"\w* \w לְ⁠הֵחָבֵ֤ה|lemma="חָבָה" strong="l:H2247" x-morph="He,R:VNc"\w* \w בַשָּׂדֶה֙|lemma="שָׂדֶה" strong="b:d:H7704b" x-morph="He,Rd:Ncmsa"\w* -\f + \ft K \w ב⁠ה⁠שדה|lemma="שָׂדֶה" strong="b:d:H7704b" x-morph="He,R:Td:Ncmsa"\w*\f* +\f + \ft K \+w ב⁠ה⁠שדה|lemma="שָׂדֶה" strong="b:d:H7704b" x-morph="He,R:Td:Ncmsa"\+w*\f* \w לֵ⁠אמֹ֔ר|lemma="אָמַר" strong="l:H0559" x-morph="He,R:Vqc"\w* \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w יֵצְא֤וּ|lemma="יָצָא" strong="H3318" x-morph="He,Vqi3mp" x-tw="rc://*/tw/dict/bible/other/know"\w* \w מִן|lemma="מִן" strong="H4480a" x-morph="He,R"\w*־\w הָ⁠עִיר֙|lemma="עִיר" strong="d:H5892b" x-morph="He,Td:Ncfsa"\w* @@ -3114,7 +3114,7 @@ \w נִשְׁאֲרוּ|lemma="שָׁאַר" strong="H7604" x-morph="He,VNp3cp"\w*־\w בָ⁠הּ֒|lemma="" strong="b" x-morph="He,R:Sp3fs"\w* \w הִנָּ֗⁠ם|lemma="הִנֵּה" strong="H2009" x-morph="He,Tm:Sp3mp"\w* \w כְּ⁠כָל|lemma="כֹּל" strong="k:H3605" x-morph="He,R:Ncmsc"\w*־\w הֲמ֤וֹן|lemma="הָמוֹן" strong="H1995a" x-morph="He,Ncmsc"\w* -\f + \ft K \w ה⁠המון|lemma="הָמוֹן" strong="d:H1995a" x-morph="He,Td:Ncmsa"\w*\f* +\f + \ft K \+w ה⁠המון|lemma="הָמוֹן" strong="d:H1995a" x-morph="He,Td:Ncmsa"\+w*\f* \w יִשְׂרָאֵל֙|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w אֲשֶׁ֣ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w נִשְׁאֲרוּ|lemma="שָׁאַר" strong="H7604" x-morph="He,VNp3cp"\w*־\w בָ֔⁠הּ|lemma="" strong="b" x-morph="He,R:Sp3fs"\w* @@ -3150,7 +3150,7 @@ \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w הִשְׁלִ֥יכוּ|lemma="שָׁלַךְ" strong="H7993" x-morph="He,Vhp3cp"\w* \w אֲרָ֖ם|lemma="אֲרָם" strong="H0758" x-morph="He,Np"\w* \w בהחפזם|lemma="חָפַז" strong="b:H2648" x-morph="He,R:VNc:Sp3mp"\w* -\f + \ft Q \w בְּחָפְזָ֑ם|lemma="חָפַז" strong="b:H2648" x-morph="He,R:Vqc:Sp3mp"\w*\f* +\f + \ft Q \+w בְּחָפְזָ֑ם|lemma="חָפַז" strong="b:H2648" x-morph="He,R:Vqc:Sp3mp"\+w*\f* \w וַ⁠יָּשֻׁ֨בוּ֙|lemma="שׁוּב" strong="c:H7725" x-morph="He,C:Vqw3mp" x-tw="rc://*/tw/dict/bible/other/return"\w* \w הַ⁠מַּלְאָכִ֔ים|lemma="מַלְאָךְ" strong="d:H4397" x-morph="He,Td:Ncmpa"\w* \w וַ⁠יַּגִּ֖דוּ|lemma="נָגַד" strong="c:H5046" x-morph="He,C:Vhw3mp"\w* @@ -3255,7 +3255,7 @@ \w ק֤וּמִי|lemma="קוּם" strong="H6965b" x-morph="He,Vqv2fs"\w* \w וּ⁠לְכִי֙|lemma="יָלַךְ" strong="c:H3212" x-morph="He,C:Vqv2fs"\w* \w אַ֣תְּ|lemma="אַתָּה" strong="H0859b" x-morph="He,Pp2fs"\w* -\f + \ft K \w אתי|lemma="אַתָּה" strong="H0859b" x-morph="He,Pp2fs"\w*\f* +\f + \ft K \+w אתי|lemma="אַתָּה" strong="H0859b" x-morph="He,Pp2fs"\+w*\f* \w וּ⁠בֵיתֵ֔⁠ךְ|lemma="בַּיִת" strong="c:H1004b" x-morph="He,C:Ncmsc:Sp2fs" x-tw="rc://*/tw/dict/bible/other/house"\w* \w וְ⁠ג֖וּרִי|lemma="גּוּר" strong="c:H1481a" x-morph="He,C:Vqv2fs"\w* \w בַּ⁠אֲשֶׁ֣ר|lemma="אֲשֶׁר" strong="b:H0834b" x-morph="He,R:Tr"\w* @@ -3423,7 +3423,7 @@ \w אֱלִישָׁ֔ע|lemma="אֱלִישָׁע" strong="H0477" x-morph="He,Np"\w* \w לֵ֥ךְ|lemma="יָלַךְ" strong="H3212" x-morph="He,Vqv2ms" x-tw="rc://*/tw/dict/bible/other/walk"\w* \w אֱמָר|lemma="אָמַר" strong="H0559" x-morph="He,Vqv2ms"\w*־\w ל֖וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* -\f + \ft K \w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*\f* +\f + \ft K \+w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\+w*\f* \w חָיֹ֣ה|lemma="חָיָה" strong="H2421" x-morph="He,Vqa" x-tw="rc://*/tw/dict/bible/kt/life"\w* \w תִחְיֶ֑ה|lemma="חָיָה" strong="H2421" x-morph="He,Vqi2ms" x-tw="rc://*/tw/dict/bible/kt/life"\w* \w וְ⁠הִרְאַ֥⁠נִי|lemma="רָאָה" strong="c:H7200" x-morph="He,C:Vhp3ms:Sp1cs"\w* @@ -3539,7 +3539,7 @@ \w בְ⁠מָלְכ֑⁠וֹ|lemma="מָלַךְ" strong="b:H4427a" x-morph="He,R:Vqc:Sp3ms"\w* \w וּ⁠שְׁמֹנֶ֣ה|lemma="שְׁמֹנֶה" strong="c:H8083" x-morph="He,C:Acfsa"\w* \w שָׁנִ֔ים|lemma="שָׁנֶה" strong="H8141" x-morph="He,Ncfpa"\w* -\f + \ft K \w שנה|lemma="שָׁנֶה" strong="H8141" x-morph="He,Ncfsa"\w*\f* +\f + \ft K \+w שנה|lemma="שָׁנֶה" strong="H8141" x-morph="He,Ncfsa"\+w*\f* \w מָלַ֖ךְ|lemma="מָלַךְ" strong="H4427a" x-morph="He,Vqp3ms"\w* \w בִּ⁠ירוּשָׁלִָֽם|lemma="יְרוּשָׁלִַ͏ם" strong="b:H3389" x-morph="He,R:Np" x-tw="rc://*/tw/dict/bible/names/jerusalem"\w*׃ @@ -3979,7 +3979,7 @@ \w מִן|lemma="מִן" strong="H4480a" x-morph="He,R"\w*־\w הָ⁠עִ֔יר|lemma="עִיר" strong="d:H5892b" x-morph="He,Td:Ncfsa"\w* \w לָ⁠לֶ֖כֶת|lemma="יָלַךְ" strong="l:H3212" x-morph="He,R:Vqc"\w* \w לְהַגִּ֥יד|lemma="נָגַד" strong="l:H5046" x-morph="He,R:Vhc"\w* -\f + \ft K \w ל⁠גיד|lemma="נָגַד" strong="l:H5046" x-morph="He,R:Vhc"\w*\f* +\f + \ft K \+w ל⁠גיד|lemma="נָגַד" strong="l:H5046" x-morph="He,R:Vhc"\+w*\f* \w בְּ⁠יִזְרְעֶֽאל|lemma="יִזְרְעֵאל" strong="b:H3157" x-morph="He,R:Np"\w*׃ \v 16 @@ -4142,7 +4142,7 @@ \w וַ⁠יֹּ֗אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w בִּדְקַר֙|lemma="בִּדְקַר" strong="H0920" x-morph="He,Np"\w* \w שָֽׁלִשׁ֔וֹ|lemma="שָׁלִישׁ" strong="H7991c" x-morph="He,Acmsc:Sp3ms"\w* -\f + \ft K \w שלשה|lemma="שָׁלִישׁ" strong="H7991c" x-morph="He,Acmsc:Sp3ms"\w*\f* +\f + \ft K \+w שלשה|lemma="שָׁלִישׁ" strong="H7991c" x-morph="He,Acmsc:Sp3ms"\+w*\f* \w שָׂ֚א|lemma="נָשָׂא" strong="H5375" x-morph="He,Vqv2ms"\w* \w הַשְׁלִכֵ֔⁠הוּ|lemma="שָׁלַךְ" strong="H7993" x-morph="He,Vhv2ms:Sp3ms"\w* \w בְּ⁠חֶלְקַ֕ת|lemma="חֶלְקָה" strong="b:H2513a" x-morph="He,R:Ncfsc"\w* @@ -4273,7 +4273,7 @@ \v 33 \w וַ⁠יֹּ֥אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* \w שִׁמְט֖וּהָ|lemma="שָׁמַט" strong="H8058" x-morph="He,Vqv2mp:Sp3fs"\w* -\f + \ft K \w שמט⁠הו|lemma="שָׁמַט" strong="H8058" x-morph="He,Vqv2ms:Sp3ms"\w*\f* +\f + \ft K \+w שמט⁠הו|lemma="שָׁמַט" strong="H8058" x-morph="He,Vqv2ms:Sp3ms"\+w*\f* \w וַֽ⁠יִּשְׁמְט֑וּ⁠הָ|lemma="שָׁמַט" strong="c:H8058" x-morph="He,C:Vqw3mp:Sp3fs"\w* \w וַ⁠יִּ֨ז|lemma="נָזָה" strong="c:H5137a" x-morph="He,C:Vqw3ms"\w* \w מִ⁠דָּמָ֧⁠הּ|lemma="דָּם" strong="m:H1818" x-morph="He,R:Ncmsc:Sp3fs"\w* @@ -4327,7 +4327,7 @@ \v 37 \w וְֽהָיְתָ֞ה|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3fs"\w* -\f + \ft K \w ו⁠הית|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3fs"\w*\f* +\f + \ft K \+w ו⁠הית|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3fs"\+w*\f* \w נִבְלַ֣ת|lemma="נְבֵלָה" strong="H5038" x-morph="He,Ncfsc"\w* \w אִיזֶ֗בֶל|lemma="אִיזֶבֶל" strong="H0348" x-morph="He,Np"\w* \w כְּ⁠דֹ֛מֶן|lemma="דֹּמֶן" strong="k:H1828" x-morph="He,R:Ncmsa"\w* @@ -4803,7 +4803,7 @@ \w הַ⁠בַּ֔עַל|lemma="בַּעַל" strong="d:H1168a" x-morph="He,Td:Np"\w* \w וַ⁠יְשִׂמֻ֥⁠הוּ|lemma="שׂוּם" strong="c:H7760a" x-morph="He,C:Vqw3mp:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/appoint"\w* \w ל⁠מחראות|lemma="מַחֲרָאָה" strong="l:H4280" x-morph="He,R:Ncfpa"\w* -\f + \ft Q \w לְמֽוֹצָא֖וֹת|lemma="מַחֲרָאָה" strong="l:H4161" x-morph="He,R:Ncbpa"\w*\f* +\f + \ft Q \+w לְמֽוֹצָא֖וֹת|lemma="מַחֲרָאָה" strong="l:H4161" x-morph="He,R:Ncbpa"\+w*\f* \w עַד|lemma="עַד" strong="H5704" x-morph="He,R"\w*־\w הַ⁠יּֽוֹם|lemma="יוֹם" strong="d:H3117" x-morph="He,Td:Ncmsa"\w*׃ \v 28 @@ -4943,7 +4943,7 @@ \w אֵ֣ם|lemma="אֵם" strong="H0517" x-morph="He,Ncfsc"\w* \w אֲחַזְיָ֔הוּ|lemma="אֲחַזְיָה" strong="H0274" x-morph="He,Np"\w* \w ו⁠ראתה|lemma="רָאָה" strong="H7200" x-morph="He,Vqp3fs"\w* -\f + \ft K \w ו⁠ראתה|lemma="רָאָה" strong="c:H7200" x-morph="He,C:Vqp3fs"\w*\f* +\f + \ft K \+w ו⁠ראתה|lemma="רָאָה" strong="c:H7200" x-morph="He,C:Vqp3fs"\+w*\f* \w כִּ֣י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* \w מֵ֣ת|lemma="מוּת" strong="H4191" x-morph="He,Vqp3ms"\w* \w בְּנָ֑⁠הּ|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc:Sp3fs" x-tw="rc://*/tw/dict/bible/kt/son"\w* @@ -4966,7 +4966,7 @@ \w מִ⁠תּ֤וֹךְ|lemma="תָּוֶךְ" strong="m:H8432" x-morph="He,R:Ncmsc"\w* \w בְּנֵֽי|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w הַ⁠מֶּ֨לֶךְ֙|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* \w ה⁠ממותתים|lemma="מָמוֹת" strong="d:H4191" x-morph="He,Td:VHsmpa"\w* -\f + \ft K \w ה⁠ממותתים|lemma="מָמוֹת" strong="d:H4191" x-morph="He,Td:VOsmpa"\w*\f* +\f + \ft K \+w ה⁠ממותתים|lemma="מָמוֹת" strong="d:H4191" x-morph="He,Td:VOsmpa"\+w*\f* \w אֹת֥⁠וֹ|lemma="אֵת" strong="H0853" x-morph="He,To:Sp3ms"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w מֵינִקְתּ֖⁠וֹ|lemma="יָנַק" strong="H3243" x-morph="He,Ncfsc:Sp3ms"\w* \w בַּ⁠חֲדַ֣ר|lemma="חֶדֶר" strong="b:H2315" x-morph="He,R:Ncmsc"\w* @@ -4998,7 +4998,7 @@ \w וַ⁠יִּקַּ֣ח|lemma="לָקַח" strong="c:H3947" x-morph="He,C:Vqw3ms"\w* ׀ \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w שָׂרֵ֣י|lemma="שַׂר" strong="H8269" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/other/prince"\w* \w ה⁠מאיות|lemma="מֵאָה" strong="d:H3967" x-morph="He,Td:Acbpa"\w* -\f + \ft Q \w הַמֵּא֗וֹת|lemma="מֵאָה" strong="d:H3967" x-morph="He,Td:Acbpa"\w*\f* +\f + \ft Q \+w הַמֵּא֗וֹת|lemma="מֵאָה" strong="d:H3967" x-morph="He,Td:Acbpa"\+w*\f* \w לַ⁠כָּרִי֙|lemma="כָּרִי" strong="l:H3746" x-morph="He,Rd:Ngmsa"\w* \w וְ⁠לָ֣⁠רָצִ֔ים|lemma="רוּץ" strong="c:l:H7323" x-morph="He,C:Rd:Vqrmpa"\w* \w וַ⁠יָּבֵ֥א|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vhw3ms"\w* @@ -5077,7 +5077,7 @@ \w וַֽ⁠יַּעֲשׂ֞וּ|lemma="עָשָׂה" strong="c:H6213a" x-morph="He,C:Vqw3mp"\w* \w שָׂרֵ֣י|lemma="שַׂר" strong="H8269" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/other/prince"\w* \w ה⁠מאיות|lemma="מֵאָה" strong="d:H3967" x-morph="He,Td:Acbpa"\w* -\f + \ft Q \w הַמֵּא֗וֹת|lemma="מֵאָה" strong="d:H3967" x-morph="He,Td:Acbpa"\w*\f* +\f + \ft Q \+w הַמֵּא֗וֹת|lemma="מֵאָה" strong="d:H3967" x-morph="He,Td:Acbpa"\+w*\f* \w כְּ⁠כֹ֣ל|lemma="כֹּל" strong="k:H3605" x-morph="He,R:Ncmsa"\w* \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w צִוָּה֮|lemma="צָוָה" strong="H6680" x-morph="He,Vpp3ms" x-tw="rc://*/tw/dict/bible/kt/command"\w* \w יְהוֹיָדָ֣ע|lemma="יְהוֹיָדָע" strong="H3077" x-morph="He,Np"\w* @@ -5099,7 +5099,7 @@ \w הַ⁠כֹּהֵ֜ן|lemma="כֹּהֵן" strong="d:H3548" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/kt/priest"\w* \w לְ⁠שָׂרֵ֣י|lemma="שַׂר" strong="l:H8269" x-morph="He,R:Ncmpc" x-tw="rc://*/tw/dict/bible/other/chief"\w* \w ה⁠מאיות|lemma="מֵאָה" strong="d:H3967" x-morph="He,Td:Acbpa"\w* -\f + \ft Q \w הַמֵּא֗וֹת|lemma="מֵאָה" strong="d:H3967" x-morph="He,Td:Acbpa"\w*\f* +\f + \ft Q \+w הַמֵּא֗וֹת|lemma="מֵאָה" strong="d:H3967" x-morph="He,Td:Acbpa"\+w*\f* \w אֶֽת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ⁠חֲנִית֙|lemma="חֲנִית" strong="d:H2595" x-morph="He,Td:Ncfsa"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w הַ⁠שְּׁלָטִ֔ים|lemma="שֶׁלֶט" strong="d:H7982" x-morph="He,Td:Ncmpa"\w* \w אֲשֶׁ֖ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* @@ -5180,7 +5180,7 @@ \w הַ⁠כֹּהֵ֜ן|lemma="כֹּהֵן" strong="d:H3548" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/kt/priest"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w שָׂרֵ֥י|lemma="שַׂר" strong="H8269" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/other/prince"\w* \w הַמֵּא֣וֹת|lemma="מֵאָה" strong="d:H3967" x-morph="He,Td:Acbpa"\w* ׀ -\f + \ft K \w ה⁠מיאות|lemma="מֵאָה" strong="d:H3967" x-morph="He,Td:Acbpa"\w*\f* +\f + \ft K \+w ה⁠מיאות|lemma="מֵאָה" strong="d:H3967" x-morph="He,Td:Acbpa"\+w*\f* \w פְּקֻדֵ֣י|lemma="פָּקַד" strong="H6485a" x-morph="He,Vqsmpc" x-tw="rc://*/tw/dict/bible/kt/command"\w* \w הַ⁠חַ֗יִל|lemma="חַיִל" strong="d:H2428" x-morph="He,Td:Ncmsa"\w* \w וַ⁠יֹּ֤אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* @@ -5237,7 +5237,7 @@ \w בֵּית|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w*־\w הַ⁠בַּ֜עַל|lemma="בַּעַל" strong="d:H1168a" x-morph="He,Td:Np"\w* \w וַֽ⁠יִּתְּצֻ֗⁠הוּ|lemma="נָתַץ" strong="c:H5422" x-morph="He,C:Vqw3mp:Sp3ms"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w מזבחת⁠ו|lemma="מִזְבֵּחַ" strong="H4196" x-morph="He,Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/altar"\w* -\f + \ft Q \w מִזְבְּחֹתָ֤יו|lemma="מִזְבֵּחַ" strong="H4196" x-morph="He,Ncmpc:Sp3ms"\w*\f* +\f + \ft Q \+w מִזְבְּחֹתָ֤יו|lemma="מִזְבֵּחַ" strong="H4196" x-morph="He,Ncmpc:Sp3ms"\+w*\f* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w צְלָמָי⁠ו֙|lemma="צֶלֶם" strong="H6754" x-morph="He,Ncmpc:Sp3ms"\w* \w שִׁבְּר֣וּ|lemma="שָׁבַר" strong="H7665" x-morph="He,Vpp3cp"\w* \w הֵיטֵ֔ב|lemma="יָטַב" strong="H3190" x-morph="He,Vha" x-tw="rc://*/tw/dict/bible/kt/favor"\w* @@ -5286,7 +5286,7 @@ \w בַ⁠חֶ֖רֶב|lemma="חֶרֶב" strong="b:H2719" x-morph="He,Rd:Ncfsa" x-tw="rc://*/tw/dict/bible/other/sword"\w* \w בֵּ֥ית|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w* \w הַמֶּֽלֶךְ|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w*׃ס -\f + \ft K \w מלך|lemma="מֶלֶךְ" strong="H4428" x-morph="He,Ncmsa"\w*\f* +\f + \ft K \+w מלך|lemma="מֶלֶךְ" strong="H4428" x-morph="He,Ncmsa"\+w*\f* \ca 12\ca* \p @@ -5447,7 +5447,7 @@ \w אֵ֨צֶל|lemma="אֵצֶל" strong="H0681" x-morph="He,R"\w* \w הַ⁠מִּזְבֵּ֜חַ|lemma="מִזְבֵּחַ" strong="d:H4196" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/kt/altar"\w* \w ב⁠ימין|lemma="יָמִין" strong="b:H3225" x-morph="He,Rd:Ncfsa"\w* -\f + \ft Q \w מִיָּמִ֗ין|lemma="יָמִין" strong="b:H3225" x-morph="He,Rd:Ncfsa"\w*\f* +\f + \ft Q \+w מִיָּמִ֗ין|lemma="יָמִין" strong="b:H3225" x-morph="He,Rd:Ncfsa"\+w*\f* \w בְּ⁠בֽוֹא|lemma="בּוֹא" strong="b:H0935" x-morph="He,R:Vqc"\w*־\w אִישׁ֙|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsa"\w* \w בֵּ֣ית|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w* \w יְהוָ֔ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* @@ -5483,11 +5483,11 @@ \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ⁠כֶּ֣סֶף|lemma="כֶּסֶף" strong="d:H3701" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/silver"\w* \w הַֽ⁠מְתֻכָּ֔ן|lemma="תָּכַן" strong="d:H8505" x-morph="He,Td:VPsmsa"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w יְדֵי֙|lemma="יָד" strong="H3027" x-morph="He,Ncbpc" x-tw="rc://*/tw/dict/bible/other/hand"\w* -\f + \ft K \w יד|lemma="יָד" strong="H3027" x-morph="He,Ncbsc"\w*\f* +\f + \ft K \+w יד|lemma="יָד" strong="H3027" x-morph="He,Ncbsc"\+w*\f* \w עֹשֵׂ֣י|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqrmpc"\w* \w הַ⁠מְּלָאכָ֔ה|lemma="מְלָאכָה" strong="d:H4399" x-morph="He,Td:Ncfsa"\w* \w ה⁠פקדים|lemma="פָּקַד" strong="d:H6485a" x-morph="He,Td:VQsmpa"\w* -\f + \ft Q \w הַמֻּפְקָדִ֖ים|lemma="פָּקַד" strong="d:H6485a" x-morph="He,Td:VHsmpa"\w*\f* +\f + \ft Q \+w הַמֻּפְקָדִ֖ים|lemma="פָּקַד" strong="d:H6485a" x-morph="He,Td:VHsmpa"\+w*\f* \w בֵּ֣ית|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w* \w יְהוָ֑ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w וַ⁠יּוֹצִיאֻ֜⁠הוּ|lemma="יָצָא" strong="c:H3318" x-morph="He,C:Vhw3mp:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/command"\w* @@ -5751,7 +5751,7 @@ \w מֵ⁠חַטֹּ֧אות|lemma="חַטָּאָה" strong="m:H2403b" x-morph="He,R:Ncfpc"\w* \w בֵּית|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w*־\w יָרָבְעָ֛ם|lemma="יָרׇבְעָם" strong="H3379" x-morph="He,Np"\w* \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w הֶחֱטִ֥יא|lemma="חָטָא" strong="H2398" x-morph="He,Vhp3ms" x-tw="rc://*/tw/dict/bible/kt/sin"\w* -\f + \ft K \w החטי|lemma="חָטָא" strong="H2398" x-morph="He,Vhp3ms"\w*\f* +\f + \ft K \+w החטי|lemma="חָטָא" strong="H2398" x-morph="He,Vhp3ms"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w יִשְׂרָאֵ֖ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w בָּ֣⁠הּ|lemma="" strong="b" x-morph="He,R:Sp3fs"\w* \w הָלָ֑ךְ|lemma="הָלַךְ" strong="H1980" x-morph="He,Vqp3ms" x-tw="rc://*/tw/dict/bible/other/walk"\w* @@ -6097,7 +6097,7 @@ \w וְ⁠שֵׁ֣ם|lemma="שֵׁם" strong="c:H8034" x-morph="He,C:Ncmsc"\w* \w אִמּ֔⁠וֹ|lemma="אֵם" strong="H0517" x-morph="He,Ncfsc:Sp3ms"\w* \w יהועדין|lemma="יְהוֹעַדִּין" strong="H3086" x-morph="He,Np"\w* -\f + \ft Q \w יְהֽוֹעַדָּ֖ן|lemma="יְהוֹעַדִּין" strong="H3086" x-morph="He,Np"\w*\f* +\f + \ft Q \+w יְהֽוֹעַדָּ֖ן|lemma="יְהוֹעַדִּין" strong="H3086" x-morph="He,Np"\+w*\f* \w מִן|lemma="מִן" strong="H4480a" x-morph="He,R"\w*־\w יְרוּשָׁלִָֽם|lemma="יְרוּשָׁלִַ͏ם" strong="H3389" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jerusalem"\w*׃ \v 3 @@ -6158,13 +6158,13 @@ \w אִם|lemma="אִם" strong="H0518b" x-morph="He,C"\w*־\w אִ֥ישׁ|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsa"\w* \w בְּ⁠חֶטְא֖⁠וֹ|lemma="חֵטְא" strong="b:H2399" x-morph="He,R:Ncmsc:Sp3ms"\w* \w יוּמָֽת|lemma="מוּת" strong="H4191" x-morph="He,VHi3ms"\w*׃ -\f + \ft K \w ימות|lemma="מוּת" strong="H4191" x-morph="He,Vqi3ms"\w*\f* +\f + \ft K \+w ימות|lemma="מוּת" strong="H4191" x-morph="He,Vqi3ms"\+w*\f* \v 7 \w הוּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w*־\w הִכָּ֨ה|lemma="נָכָה" strong="H5221" x-morph="He,Vhp3ms"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w אֱד֤וֹם|lemma="אֱדֹם" strong="H0123" x-morph="He,Np"\w* \w בְּ⁠גֵיא|lemma="גַּיְא" strong="b:H1516" x-morph="He,R:Np"\w*־\w המלח|lemma="מֶלַח" strong="d:H4417" x-morph="He,Td:Np"\w* -\f + \ft Q \w מֶ֙לַח֙|lemma="מֶלַח" strong="H4417" x-morph="He,Np"\w*\f* +\f + \ft Q \+w מֶ֙לַח֙|lemma="מֶלַח" strong="H4417" x-morph="He,Np"\+w*\f* \w עֲשֶׂ֣רֶת|lemma="עֶשֶׂר" strong="H6235" x-morph="He,Acmsc"\w* \w אֲלָפִ֔ים|lemma="אֶלֶף" strong="H0505" x-morph="He,Acbpa"\w* \w וְ⁠תָפַ֥שׂ|lemma="תָּפַשׂ" strong="c:H8610" x-morph="He,C:Vqp3ms"\w* @@ -6259,7 +6259,7 @@ \w וַ⁠יָּנֻ֖סוּ|lemma="נוּס" strong="c:H5127" x-morph="He,C:Vqw3mp"\w* \w אִ֥ישׁ|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsa"\w* \w ל⁠אהל⁠ו|lemma="אֹהֶל" strong="l:H0168" x-morph="He,R:Ncmsc:Sp3ms"\w*׃ -\f + \ft Q \w לְאֹהָלָֽיו|lemma="אֹהֶל" strong="l:H0168" x-morph="He,R:Ncmpc:Sp3ms"\w*\f* +\f + \ft Q \+w לְאֹהָלָֽיו|lemma="אֹהֶל" strong="l:H0168" x-morph="He,R:Ncmpc:Sp3ms"\+w*\f* \v 13 \w וְ⁠אֵת֩|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w* @@ -6273,7 +6273,7 @@ \w בְּ⁠בֵ֣ית|lemma="בֵּית שֶׁמֶשׁ" strong="b:H1053" x-morph="He,R:Np"\w* \w שָׁ֑מֶשׁ|lemma="בֵּית שֶׁמֶשׁ" strong="H1053" x-morph="He,Np"\w* \w וַיָּבֹא֙|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3ms"\w* -\f + \ft K \w ו⁠יבאו|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3mp"\w*\f* +\f + \ft K \+w ו⁠יבאו|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3mp"\+w*\f* \w יְר֣וּשָׁלִַ֔ם|lemma="יְרוּשָׁלִַ͏ם" strong="H3389" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jerusalem"\w* \w וַ⁠יִּפְרֹץ֩|lemma="פָּרַץ" strong="c:H6555" x-morph="He,C:Vqw3ms"\w* \w בְּ⁠חוֹמַ֨ת|lemma="חוֹמָה" strong="b:H2346" x-morph="He,R:Ncfsc"\w* @@ -6890,7 +6890,7 @@ \w בְ⁠שֹׁמְר֜וֹן|lemma="שֹׁמְרוֹן" strong="b:H8111" x-morph="He,R:Np"\w* \w בְּ⁠אַרְמ֤וֹן|lemma="אַרְמוֹן" strong="b:H0759" x-morph="He,R:Ncmsc"\w* \w בֵּית|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w*־\w הַמֶּ֙לֶךְ֙|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* -\f + \ft K \w מלך|lemma="מֶלֶךְ" strong="H4428" x-morph="He,Ncmsa"\w*\f* +\f + \ft K \+w מלך|lemma="מֶלֶךְ" strong="H4428" x-morph="He,Ncmsa"\+w*\f* \w אֶת|lemma="אֵת" strong="H0854" x-morph="He,R"\w*־\w אַרְגֹּ֣ב|lemma="אַרְגֹּב" strong="H0709" x-morph="He,Np"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0854" x-morph="He,C:R"\w*־\w הָ⁠אַרְיֵ֔ה|lemma="אַרְיֵה" strong="d:H0745" x-morph="He,Td:Np"\w* \w וְ⁠עִמּ֛⁠וֹ|lemma="עִם" strong="c:H5973a" x-morph="He,C:R:Sp3ms"\w* @@ -7183,7 +7183,7 @@ \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ⁠יְהוּדִ֖ים|lemma="יְהוּדִי" strong="d:H3064" x-morph="He,Td:Ngmpa" x-tw="rc://*/tw/dict/bible/kt/jew"\w* \w מֵֽ⁠אֵיל֑וֹת|lemma="אֵילוֹת" strong="m:H0359b" x-morph="He,R:Np"\w* \w ו⁠ארמים|lemma="אֲרוֹמִי" strong="c:H0726" x-morph="He,C:Ngmpa"\w* -\f + \ft Q \w וַֽאֲדוֹמִים֙|lemma="אֲרוֹמִי" strong="c:H0130" x-morph="He,C:Ngmpa"\w*\f* +\f + \ft Q \+w וַֽאֲדוֹמִים֙|lemma="אֲרוֹמִי" strong="c:H0130" x-morph="He,C:Ngmpa"\+w*\f* \w בָּ֣אוּ|lemma="בּוֹא" strong="H0935" x-morph="He,Vqp3cp"\w* \w אֵילַ֔ת|lemma="אֵילוֹת" strong="H0359a" x-morph="He,Np"\w* \w וַ⁠יֵּ֣שְׁבוּ|lemma="יָשַׁב" strong="c:H3427" x-morph="He,C:Vqw3mp"\w* @@ -7332,7 +7332,7 @@ \v 15 \w וַיְצַוֶּ֣ה|lemma="צָוָה" strong="c:H6680" x-morph="He,C:Vpw3ms" x-tw="rc://*/tw/dict/bible/kt/command"\w* -\f + \ft K \w ו⁠יצו⁠הו|lemma="צָוָה" strong="c:H6680" x-morph="He,C:Vpw3ms:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠יצו⁠הו|lemma="צָוָה" strong="c:H6680" x-morph="He,C:Vpw3ms:Sp3ms"\+w*\f* \w הַ⁠מֶּֽלֶךְ|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w*־\w אָ֠חָז|lemma="אָחָז" strong="H0271" x-morph="He,Np"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w אוּרִיָּ֨ה|lemma="אוּרִיָּה" strong="H0223a" x-morph="He,Np"\w* \w הַ⁠כֹּהֵ֜ן|lemma="כֹּהֵן" strong="d:H3548" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/kt/priest"\w* @@ -7381,7 +7381,7 @@ \w וַ⁠יָּ֤סַר|lemma="סוּר" strong="c:H5493" x-morph="He,C:Vhw3ms"\w* \w מֵֽ⁠עֲלֵי⁠הֶם֙|lemma="עַל" strong="m:H5921a" x-morph="He,R:R:Sp3mp"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ⁠כִּיֹּ֔ר|lemma="כִּיּוֹר" strong="d:H3595" x-morph="He,Td:Ncmsa"\w* -\f + \ft K \w ו⁠את|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*\f* +\f + \ft K \+w ו⁠את|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\+w*\f* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w הַ⁠יָּ֣ם|lemma="יָם" strong="d:H3220" x-morph="He,Td:Ncmsa"\w* \w הוֹרִ֔ד|lemma="יָרַד" strong="H3381" x-morph="He,Vhp3ms"\w* \w מֵ⁠עַ֛ל|lemma="עַל" strong="m:H5921a" x-morph="He,R:R"\w* @@ -7397,7 +7397,7 @@ \v 18 \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w מוּסַ֨ךְ|lemma="מֵיסָךְ" strong="H4329" x-morph="He,Ncmsc"\w* -\f + \ft K \w מיסך|lemma="מֵיסָךְ" strong="H4329" x-morph="He,Ncmsc"\w*\f* +\f + \ft K \+w מיסך|lemma="מֵיסָךְ" strong="H4329" x-morph="He,Ncmsc"\+w*\f* \w הַ⁠שַּׁבָּ֜ת|lemma="שַׁבָּת" strong="d:H7676" x-morph="He,Td:Ncbsa" x-tw="rc://*/tw/dict/bible/kt/sabbath"\w* \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w בָּנ֣וּ|lemma="בָּנָה" strong="H1129" x-morph="He,Vqp3cp"\w* \w בַ⁠בַּ֗יִת|lemma="בַּיִת" strong="b:H1004b" x-morph="He,Rd:Ncmsa" x-tw="rc://*/tw/dict/bible/kt/temple"\w* @@ -7629,9 +7629,9 @@ \w וּ⁠בִ⁠יהוּדָ֡ה|lemma="יְהוּדָה" strong="c:b:H3063" x-morph="He,C:R:Np"\w* \w בְּ⁠יַד֩|lemma="יָד" strong="b:H3027" x-morph="He,R:Ncbsc" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w נביא⁠ו|lemma="נָבִיא" strong="H5030" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/prophet"\w* -\f + \ft Q \w נְבִיאֵ֨י|lemma="נָבִיא" strong="H5030" x-morph="He,Ncmpc"\w*\f* +\f + \ft Q \+w נְבִיאֵ֨י|lemma="נָבִיא" strong="H5030" x-morph="He,Ncmpc"\+w*\f* \w כָל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w חֹזֶ֜ה|lemma="חֹזֶה" strong="H2374" x-morph="He,Ncmsa"\w* -\f + \ft Or perhaps \w כל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w נביא|lemma="נָבִיא" strong="H5030" x-morph="He,Ncmsa"\w* \w וכל|lemma="כֹּל" strong="c:H3605" x-morph="He,C:Ncmsc"\w*־\w חזה|lemma="חֹזֶה" strong="H2374" x-morph="He,Ncmsa"\w*\f* +\f + \ft Or perhaps \+w כל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w נביא|lemma="נָבִיא" strong="H5030" x-morph="He,Ncmsa"\w* \w וכל|lemma="כֹּל" strong="c:H3605" x-morph="He,C:Ncmsc"\w*־\w חזה|lemma="חֹזֶה" strong="H2374" x-morph="He,Ncmsa"\+w*\f* \w לֵ⁠אמֹ֗ר|lemma="אָמַר" strong="l:H0559" x-morph="He,R:Vqc"\w* \w שֻׁ֝֠בוּ|lemma="שׁוּב" strong="H7725" x-morph="He,Vqv2mp" x-tw="rc://*/tw/dict/bible/kt/restore"\w* \w מִ⁠דַּרְכֵי⁠כֶ֤ם|lemma="דֶּרֶךְ" strong="m:H1870" x-morph="He,R:Ncbpc:Sp2mp"\w* @@ -7700,7 +7700,7 @@ \w לָ⁠הֶ֛ם|lemma="" strong="l" x-morph="He,R:Sp3mp"\w* \w מַסֵּכָ֖ה|lemma="מַסֵּכָה" strong="H4541a" x-morph="He,Ncfsa"\w* \w שנים|lemma="שְׁנַיִם" strong="H8147" x-morph="He,Acmda"\w* -\f + \ft Q \w שְׁנֵ֣י|lemma="שְׁנַיִם" strong="H8147" x-morph="He,Acmdc"\w*\f* +\f + \ft Q \+w שְׁנֵ֣י|lemma="שְׁנַיִם" strong="H8147" x-morph="He,Acmdc"\+w*\f* \w עֲגָלִ֑ים|lemma="עֵגֶל" strong="H5695" x-morph="He,Ncmpa"\w* \w וַ⁠יַּעֲשׂ֣וּ|lemma="עָשָׂה" strong="c:H6213a" x-morph="He,C:Vqw3mp"\w* \w אֲשֵׁירָ֗ה|lemma="אֲשֵׁרָה" strong="H0842" x-morph="He,Np"\w* @@ -7776,7 +7776,7 @@ \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w יָרָבְעָ֣ם|lemma="יָרׇבְעָם" strong="H3379" x-morph="He,Np"\w* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w נְבָ֑ט|lemma="נְבָט" strong="H5028" x-morph="He,Np"\w* \w וַיַּדַּ֨ח|lemma="נָדָה" strong="c:H5080" x-morph="He,C:Vhw3ms"\w* -\f + \ft K \w ו⁠ידא|lemma="נָדָה" strong="c:H5077a" x-morph="He,C:Vhw3ms"\w*\f* +\f + \ft K \+w ו⁠ידא|lemma="נָדָה" strong="c:H5077a" x-morph="He,C:Vhw3ms"\+w*\f* \w יָרָבְעָ֤ם|lemma="יָרׇבְעָם" strong="H3379" x-morph="He,Np"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w יִשְׂרָאֵל֙|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w מֵ⁠אַחֲרֵ֣י|lemma="אַחַר" strong="m:H0310a" x-morph="He,R:R"\w* @@ -7961,9 +7961,9 @@ \w לְ⁠אַדְרַמֶּ֥לֶךְ|lemma="אֲדְרַמֶּלֶךְ" strong="l:H0152" x-morph="He,R:Np"\w* \w וַֽ⁠עֲנַמֶּ֖לֶךְ|lemma="עֲנַמֶּלֶךְ" strong="c:H6048" x-morph="He,C:Np"\w* \w אֱלֹהֵ֥י|lemma="אֱלוֹהַּ" strong="H0433" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/god"\w* -\f + \ft K \w אלה|lemma="אֱלוֹהַּ" strong="H0433" x-morph="He,Ncmsc"\w*\f* +\f + \ft K \+w אלה|lemma="אֱלוֹהַּ" strong="H0433" x-morph="He,Ncmsc"\+w*\f* \w סְפַרְוָֽיִם|lemma="סְפַרְוַיִם" strong="H5617" x-morph="He,Np"\w*׃ -\f + \ft K \w ספרים|lemma="סְפַרְוַיִם" strong="H5617" x-morph="He,Np"\w*\f* +\f + \ft K \+w ספרים|lemma="סְפַרְוַיִם" strong="H5617" x-morph="He,Np"\+w*\f* \v 32 \w וַ⁠יִּהְי֥וּ|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqw3mp"\w* @@ -8578,7 +8578,7 @@ \w לֶ⁠אֱכֹ֣ל|lemma="אָכַל" strong="l:H0398" x-morph="He,R:Vqc"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w* \w חרי⁠הם|lemma="חֲרֵי־יוֹנִים" strong="H2755" x-morph="He,Ncmpc:Sp3mp"\w* -\f + \ft Q \w צוֹאָתָ֗ם|lemma="צוֹא" strong="H6674" x-morph="He,Ncbpc:Sp3mp"\w*\f* +\f + \ft Q \+w צוֹאָתָ֗ם|lemma="צוֹא" strong="H6674" x-morph="He,Ncbpc:Sp3mp"\+w*\f* \w וְ⁠לִ⁠שְׁתּ֛וֹת|lemma="שָׁתָה" strong="c:l:H8354" x-morph="He,C:R:Vqc"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w שיני⁠הם|lemma="שַׁיִן" strong="H7890" x-morph="He,Ncmpc:Sp3mp"\w* \w עִמָּ⁠כֶֽם|lemma="עִם" strong="H5973a" x-morph="He,R:Sp2mp"\w*׃ @@ -9100,7 +9100,7 @@ \w אֲדֹנָ⁠י֒|lemma="אֲדֹנָי" strong="H0136" x-morph="He,Ncmpc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/lord"\w* \w וַ⁠תֹּ֗אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw2ms"\w* \w בְּרֹ֥ב|lemma="רֶכֶב" strong="b:H7230" x-morph="He,R:Ncmsc"\w* -\f + \ft K \w ב⁠רכב|lemma="רֶכֶב" strong="b:H7393" x-morph="He,R:Ncmsc"\w*\f* +\f + \ft K \+w ב⁠רכב|lemma="רֶכֶב" strong="b:H7393" x-morph="He,R:Ncmsc"\+w*\f* \w רִכְבִּ֛⁠י|lemma="רֶכֶב" strong="H7393" x-morph="He,Ncmsc:Sp1cs"\w* \w אֲנִ֥י|lemma="אֲנִי" strong="H0589" x-morph="He,Pp1cs"\w* \w עָלִ֛יתִי|lemma="עָלָה" strong="H5927" x-morph="He,Vqp1cs"\w* @@ -9380,7 +9380,7 @@ \w לֹ֣א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w יָצָ֔א|lemma="יָצָא" strong="H3318" x-morph="He,Vqp3ms" x-tw="rc://*/tw/dict/bible/other/know"\w* \w חָצֵ֖ר|lemma="חָצֵר" strong="H2691" x-morph="He,Ncbsa"\w* -\f + \ft K \w ה⁠עיר|lemma="עִיר" strong="d:H5892b" x-morph="He,Td:Ncfsa"\w*\f* +\f + \ft K \+w ה⁠עיר|lemma="עִיר" strong="d:H5892b" x-morph="He,Td:Ncfsa"\+w*\f* \w הַ⁠תִּֽיכֹנָ֑ה|lemma="תִּיכוֹן" strong="d:H8484" x-morph="He,Td:Aafsa"\w* \w וּ⁠דְבַר|lemma="דָּבָר" strong="c:H1697" x-morph="He,C:Ncmsc"\w*־\w יְהוָ֔ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w הָיָ֥ה|lemma="הָיָה" strong="H1961" x-morph="He,Vqp3ms"\w* @@ -9626,7 +9626,7 @@ \w אֲשֶׁ֥ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w תּוֹלִ֖יד|lemma="יָלַד" strong="H3205" x-morph="He,Vhi2ms"\w* \w יִקָּ֑חוּ|lemma="לָקַח" strong="H3947" x-morph="He,Vqi3mp"\w* -\f + \ft K \w יקח|lemma="לָקַח" strong="H3947" x-morph="He,Vqi3ms"\w*\f* +\f + \ft K \+w יקח|lemma="לָקַח" strong="H3947" x-morph="He,Vqi3ms"\+w*\f* \w וְ⁠הָיוּ֙|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3cp"\w* \w סָֽרִיסִ֔ים|lemma="סָרִיס" strong="H5631" x-morph="He,Ncmpa"\w* \w בְּ⁠הֵיכַ֖ל|lemma="הֵיכָל" strong="b:H1964" x-morph="He,R:Ncmsc"\w* @@ -9870,7 +9870,7 @@ \w וִֽ⁠יהוּדָ֑ה|lemma="יְהוּדָה" strong="c:H3063" x-morph="He,C:Np" x-tw="rc://*/tw/dict/bible/names/judah"\w* \w אֲשֶׁר֙|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w שֹׁ֣מְעָ֔הּ|lemma="שָׁמַע" strong="H8085" x-morph="He,Vqrmsc:Sp3fs"\w* -\f + \ft K \w שמעי⁠ו|lemma="שָׁמַע" strong="H8085" x-morph="He,Vqrmpc:Sp3ms"\w*\f* +\f + \ft K \+w שמעי⁠ו|lemma="שָׁמַע" strong="H8085" x-morph="He,Vqrmpc:Sp3ms"\+w*\f* \w תִּצַּ֖לְנָה|lemma="צָלַל" strong="H6750" x-morph="He,Vqi3fp"\w* \w שְׁתֵּ֥י|lemma="שְׁנַיִם" strong="H8147" x-morph="He,Acfdc"\w* \w אָזְנָֽי⁠ו|lemma="אֹזֶן" strong="H0241" x-morph="He,Ncfdc:Sp3ms"\w*׃ @@ -10137,13 +10137,13 @@ \v 5 \w וְיִתְּנֻ֗הוּ|lemma="נָתַן" strong="c:H5414" x-morph="He,C:Vqj3mp:Sp3ms"\w* -\f + \ft K \w ו⁠יתנ⁠ה|lemma="נָתַן" strong="c:H5414" x-morph="He,C:Vqj3ms:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠יתנ⁠ה|lemma="נָתַן" strong="c:H5414" x-morph="He,C:Vqj3ms:Sp3ms"\+w*\f* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w יַד֙|lemma="יָד" strong="H3027" x-morph="He,Ncbsc" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w עֹשֵׂ֣י|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqrmpc"\w* \w הַ⁠מְּלָאכָ֔ה|lemma="מְלָאכָה" strong="d:H4399" x-morph="He,Td:Ncfsa"\w* \w הַ⁠מֻּפְקָדִ֖ים|lemma="פָּקַד" strong="d:H6485a" x-morph="He,Td:VHsmpa"\w* \w ב⁠בית|lemma="בַּיִת" strong="b:H1004b" x-morph="He,R:Ncmsc" x-tw="rc://*/tw/dict/bible/kt/temple"\w* -\f + \ft Q \w בֵּ֣ית|lemma="בַּיִת" strong="b:H1004b" x-morph="He,R:Ncmsc"\w*\f* +\f + \ft Q \+w בֵּ֣ית|lemma="בַּיִת" strong="b:H1004b" x-morph="He,R:Ncmsc"\+w*\f* \w יְהוָ֑ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w וְ⁠יִתְּנ֣וּ|lemma="נָתַן" strong="c:H5414" x-morph="He,C:Vqi3mp"\w* \w אֹת֗⁠וֹ|lemma="אֵת" strong="H0853" x-morph="He,To:Sp3ms"\w* @@ -10622,7 +10622,7 @@ \w אֲשֶׁ֖ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w בְּ⁠גֵ֣י|lemma="גַּיְא" strong="b:H1516" x-morph="He,R:Ncbsc"\w* \w בֶן|lemma="בֵּן" strong="H1121a" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w הִנֹּ֑ם|lemma="הִנֹּם" strong="H2011" x-morph="He,Np"\w* -\f + \ft K \w בני|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc"\w*\f* +\f + \ft K \+w בני|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc"\+w*\f* \w לְ⁠בִלְתִּ֗י|lemma="בִּלְתִּי" strong="l:H1115" x-morph="He,R:C"\w* \w לְ⁠הַעֲבִ֨יר|lemma="עָבַר" strong="l:H5674a" x-morph="He,R:Vhc"\w* \w אִ֜ישׁ|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsa"\w* @@ -11048,7 +11048,7 @@ \w בְּ⁠אֶ֣רֶץ|lemma="אֶרֶץ" strong="b:H0776" x-morph="He,R:Ncbsc"\w* \w חֲמָ֔ת|lemma="חֲמָת" strong="H2574" x-morph="He,Np"\w* \w מִמְּלֹ֖ךְ|lemma="מָלַךְ" strong="m:H4427a" x-morph="He,R:Vqc"\w* -\f + \ft K \w ב⁠מלך|lemma="מָלַךְ" strong="b:H4427a" x-morph="He,R:Vqc"\w*\f* +\f + \ft K \+w ב⁠מלך|lemma="מָלַךְ" strong="b:H4427a" x-morph="He,R:Vqc"\+w*\f* \w בִּ⁠ירוּשָׁלִָ֑ם|lemma="יְרוּשָׁלִַ͏ם" strong="b:H3389" x-morph="He,R:Np" x-tw="rc://*/tw/dict/bible/names/jerusalem"\w* \w וַ⁠יִּתֶּן|lemma="נָתַן" strong="c:H5414" x-morph="He,C:Vqw3ms"\w*־\w עֹ֨נֶשׁ֙|lemma="עֹנֶשׁ" strong="H6066" x-morph="He,Ncmsa"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w הָ⁠אָ֔רֶץ|lemma="אֶרֶץ" strong="d:H0776" x-morph="He,Td:Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w* @@ -11114,7 +11114,7 @@ \w וְ⁠שֵׁ֣ם|lemma="שֵׁם" strong="c:H8034" x-morph="He,C:Ncmsc"\w* \w אִמּ֔⁠וֹ|lemma="אֵם" strong="H0517" x-morph="He,Ncfsc:Sp3ms"\w* \w זבידה|lemma="זְבִידָה" strong="H2080" x-morph="He,Np"\w* -\f + \ft Q \w זְבוּדָּ֥ה|lemma="זְבִידָה" strong="H2080" x-morph="He,Np"\w*\f* +\f + \ft Q \+w זְבוּדָּ֥ה|lemma="זְבִידָה" strong="H2080" x-morph="He,Np"\+w*\f* \w בַת|lemma="בַּת" strong="H1323" x-morph="He,Ncfsc"\w*־\w פְּדָיָ֖ה|lemma="פְּדָיָה" strong="H6305" x-morph="He,Np"\w* \w מִן|lemma="מִן" strong="H4480a" x-morph="He,R"\w*־\w רוּמָֽה|lemma="רוּמָה" strong="H7316" x-morph="He,Np"\w*׃ @@ -11268,7 +11268,7 @@ \w בָּ⁠עֵ֣ת|lemma="עֵת" strong="b:H6256" x-morph="He,Rd:Ncbsa"\w* \w הַ⁠הִ֔יא|lemma="הוּא" strong="d:H1931" x-morph="He,Td:Pp3fs"\w* \w עָל֗וּ|lemma="עָלָה" strong="H5927" x-morph="He,Vqp3cp"\w* -\f + \ft K \w עלה|lemma="עָלָה" strong="H5927" x-morph="He,Vqp3ms"\w*\f* +\f + \ft K \+w עלה|lemma="עָלָה" strong="H5927" x-morph="He,Vqp3ms"\+w*\f* \w עַבְדֵ֛י|lemma="עֶבֶד" strong="H5650" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/other/servant"\w* \w נְבֻכַדְנֶאצַּ֥ר|lemma="נְבוּכַדְנֶאצַּר" strong="H5019" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/nebuchadnezzar"\w* \w מֶֽלֶךְ|lemma="מֶלֶךְ" strong="H4428" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/king"\w*־\w בָּבֶ֖ל|lemma="בָּבֶל" strong="H0894" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/babylon"\w* @@ -11335,7 +11335,7 @@ \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w גִּבּוֹרֵ֣י|lemma="גִּבּוֹר" strong="H1368" x-morph="He,Aampc" x-tw="rc://*/tw/dict/bible/other/mighty"\w* \w הַ⁠חַ֗יִל|lemma="חַיִל" strong="d:H2428" x-morph="He,Td:Ncmsa"\w* \w עשרה|lemma="עֶשֶׂר" strong="H6235" x-morph="He,Acmsa"\w* -\f + \ft Q \w עֲשֶׂ֤רֶת|lemma="עֶשֶׂר" strong="H6235" x-morph="He,Acmsc"\w*\f* +\f + \ft Q \+w עֲשֶׂ֤רֶת|lemma="עֶשֶׂר" strong="H6235" x-morph="He,Acmsc"\+w*\f* \w אֲלָפִים֙|lemma="אֶלֶף" strong="H0505" x-morph="He,Acbpa"\w* \w גּוֹלֶ֔ה|lemma="גּוֹלָה" strong="H1473" x-morph="He,Vqrmsa"\w* \w וְ⁠כָל|lemma="כֹּל" strong="c:H3605" x-morph="He,C:Ncmsc"\w*־\w הֶ⁠חָרָ֖שׁ|lemma="חָרָשׁ" strong="d:H2796" x-morph="He,Td:Ncmsa"\w* @@ -11357,7 +11357,7 @@ \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w סָרִיסָ֗י⁠ו|lemma="סָרִיס" strong="H5631" x-morph="He,Ncmpc:Sp3ms"\w* \w וְ⁠אֵת֙|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w* \w אולי|lemma="אוּל" strong="H0352" x-morph="He,Ncmpc"\w* -\f + \ft K \w אֵילֵ֣י|lemma="אוּל" strong="H0193b" x-morph="He,Ncmpc"\w*\f* +\f + \ft K \+w אֵילֵ֣י|lemma="אוּל" strong="H0193b" x-morph="He,Ncmpc"\+w*\f* \w הָ⁠אָ֔רֶץ|lemma="אֶרֶץ" strong="d:H0776" x-morph="He,Td:Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w* \w הוֹלִ֛יךְ|lemma="יָלַךְ" strong="H3212" x-morph="He,Vhp3ms" x-tw="rc://*/tw/dict/bible/other/walk"\w* \w גּוֹלָ֥ה|lemma="גּוֹלָה" strong="H1473" x-morph="He,Ncfsa"\w* @@ -11406,7 +11406,7 @@ \w וְ⁠שֵׁ֣ם|lemma="שֵׁם" strong="c:H8034" x-morph="He,C:Ncmsc"\w* \w אִמּ֔⁠וֹ|lemma="אֵם" strong="H0517" x-morph="He,Ncfsc:Sp3ms"\w* \w חֲמוּטַ֥ל|lemma="חֲמוּטַל" strong="H2537" x-morph="He,Np"\w* -\f + \ft K \w חמיטל|lemma="חֲמוּטַל" strong="H2537" x-morph="He,Np"\w*\f* +\f + \ft K \+w חמיטל|lemma="חֲמוּטַל" strong="H2537" x-morph="He,Np"\+w*\f* \w בַּֽת|lemma="בַּת" strong="H1323" x-morph="He,Ncfsc"\w*־\w יִרְמְיָ֖הוּ|lemma="יִרְמְיָה" strong="H3414" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jeremiah"\w* \w מִ⁠לִּבְנָֽה|lemma="לִבְנָה" strong="m:H3841" x-morph="He,R:Np"\w*׃ @@ -11677,7 +11677,7 @@ \w הַ⁠כֹּתֶרֶת֮|lemma="כֹתֶרֶת" strong="d:H3805" x-morph="He,Td:Ncfsa"\w* \w שָׁלֹ֣שׁ|lemma="שָׁלוֹשׁ" strong="H7969" x-morph="He,Acfsa"\w* \w אַמּוֹת֒|lemma="אַמָּה" strong="H0520a" x-morph="He,Ncfpa"\w* -\f + \ft K \w אמה|lemma="אַמָּה" strong="H0520a" x-morph="He,Ncfsa"\w*\f* +\f + \ft K \+w אמה|lemma="אַמָּה" strong="H0520a" x-morph="He,Ncfsa"\+w*\f* \w וּ⁠שְׂבָכָ֨ה|lemma="שְׂבָכָה" strong="c:H7639" x-morph="He,C:Ncfsa"\w* \w וְ⁠רִמֹּנִ֧ים|lemma="רִמּוֹן" strong="c:H7416" x-morph="He,C:Ncmpa"\w* \w עַֽל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w הַ⁠כֹּתֶ֛רֶת|lemma="כֹתֶרֶת" strong="d:H3805" x-morph="He,Td:Ncfsa"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/13-1CH.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/13-1CH.usfm index 74326806..d4b264ec 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/13-1CH.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/13-1CH.usfm @@ -92,7 +92,7 @@ \w וּ⁠מִצְרַ֡יִם|lemma="מִצְרַיִם" strong="c:H4714" x-morph="He,C:Np"\w* \w יָלַ֞ד|lemma="יָלַד" strong="H3205" x-morph="He,Vqp3ms"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w לוּדִ֧ים|lemma="לוּדִי" strong="H3866" x-morph="He,Np"\w* -\f + \ft K \w לודיים|lemma="לוּדִי" strong="H3866" x-morph="He,Np"\w*\f* +\f + \ft K \+w לודיים|lemma="לוּדִי" strong="H3866" x-morph="He,Np"\+w*\f* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w עֲנָמִ֛ים|lemma="עֲנָמִים" strong="H6047" x-morph="He,Np"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w לְהָבִ֖ים|lemma="לְהָבִים" strong="H3853" x-morph="He,Np"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w נַפְתֻּחִֽים|lemma="נַפְתֻּחִים" strong="H5320" x-morph="He,Np"\w*׃ @@ -413,7 +413,7 @@ \w וְ⁠שֵׁ֥ם|lemma="שֵׁם" strong="c:H8034" x-morph="He,C:Ncmsc"\w* \w עִיר֖⁠וֹ|lemma="עִיר" strong="H5892b" x-morph="He,Ncfsc:Sp3ms"\w* \w עֲוִֽית|lemma="עֲוִית" strong="H5762" x-morph="He,Np"\w*׃ -\f + \ft K \w עיות|lemma="עֲוִית" strong="H5762" x-morph="He,Np"\w*\f* +\f + \ft K \+w עיות|lemma="עֲוִית" strong="H5762" x-morph="He,Np"\+w*\f* \v 47 \w וַ⁠יָּ֖מָת|lemma="מוּת" strong="c:H4191" x-morph="He,C:Vqw3ms" x-tw="rc://*/tw/dict/bible/other/death"\w* @@ -469,7 +469,7 @@ \w תִּמְנָ֛ע|lemma="תִּמְנָע" strong="H8555" x-morph="He,Np"\w* \w אַלּ֥וּף|lemma="אַלּוּף" strong="H0441b" x-morph="He,Ncmsa"\w* \w עַֽלְוָ֖ה|lemma="עַלְוָה" strong="H5933" x-morph="He,Np"\w* -\f + \ft K \w עליה|lemma="עַלְוָה" strong="H5933" x-morph="He,Np"\w*\f* +\f + \ft K \+w עליה|lemma="עַלְוָה" strong="H5933" x-morph="He,Np"\+w*\f* \w אַלּ֥וּף|lemma="אַלּוּף" strong="H0441b" x-morph="He,Ncmsa"\w* \w יְתֵֽת|lemma="יְתֵת" strong="H3509" x-morph="He,Np"\w*׃ @@ -642,7 +642,7 @@ \v 16 \w ו⁠אחיתי⁠הם|lemma="אָחוֹת" strong="c:H0269" x-morph="He,C:Ncfpc:Sp3mp"\w* -\f + \ft Q \w וְאַחְיוֹתֵיהֶ֖ם|lemma="אָחוֹת" strong="c:H0269" x-morph="He,C:Ncfpc:Sp3mp"\w*\f* +\f + \ft Q \+w וְאַחְיוֹתֵיהֶ֖ם|lemma="אָחוֹת" strong="c:H0269" x-morph="He,C:Ncfpc:Sp3mp"\+w*\f* \w צְרוּיָ֣ה|lemma="צְרוּיָה" strong="H6870" x-morph="He,Np"\w* \w וַ⁠אֲבִיגָ֑יִל|lemma="אֲבִיגַיִל" strong="c:H0026" x-morph="He,C:Np"\w* \w וּ⁠בְנֵ֣י|lemma="בֵּן" strong="c:H1121a" x-morph="He,C:Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* @@ -1058,7 +1058,7 @@ \w וּ⁠מִשְׁפְּח֤וֹת|lemma="מִשְׁפָּחָה" strong="c:H4940" x-morph="He,C:Ncfpc" x-tw="rc://*/tw/dict/bible/other/family"\w* \w סֹפְרִים֙|lemma="סָפַר" strong="H5608b" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/kt/scribe"\w* \w יֹשְׁבֵ֣י|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqrmsc"\w* -\f + \ft K \w ישבו|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqp3cp"\w*\f* +\f + \ft K \+w ישבו|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqp3cp"\+w*\f* \w יַעְבֵּ֔ץ|lemma="יַעְבֵּץ" strong="H3258" x-morph="He,Np"\w* \w תִּרְעָתִ֥ים|lemma="תִּרְעָתִי" strong="H8654" x-morph="He,Ngmpa"\w* \w שִׁמְעָתִ֖ים|lemma="שִׁמְעָתִי" strong="H8101" x-morph="He,Ngmpa"\w* @@ -1294,7 +1294,7 @@ \w וּ⁠בְנֵ֣י|lemma="בֵּן" strong="c:H1121a" x-morph="He,C:Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w אֶלְיוֹעֵינַ֗י|lemma="אֶלְיְהוֹעֵינַי" strong="H0454b" x-morph="He,Np"\w* \w הדיוהו|lemma="הוֹדַיְוָהוּ" strong="H1939" x-morph="He,Np"\w* -\f + \ft Q \w הוֹדַוְיָ֡הוּ|lemma="הוֹדַיְוָהוּ" strong="H1939" x-morph="He,Np"\w*\f* +\f + \ft Q \+w הוֹדַוְיָ֡הוּ|lemma="הוֹדַיְוָהוּ" strong="H1939" x-morph="He,Np"\+w*\f* \w וְ⁠אֶלְיָשִׁ֡יב|lemma="אֶלְיָשִׁיב" strong="c:H0475" x-morph="He,C:Np"\w* \w וּ⁠פְלָיָ֡ה|lemma="פְּלָיָה" strong="c:H6411b" x-morph="He,C:Np"\w* \w וְ֠⁠עַקּוּב|lemma="עַקּוּב" strong="c:H6126" x-morph="He,C:Np"\w* @@ -1381,7 +1381,7 @@ \w חֶלְאָ֑ה|lemma="חֶלְאָה" strong="H2458" x-morph="He,Np"\w* \w צֶ֥רֶת|lemma="צֶרֶת" strong="H6889" x-morph="He,Np"\w* \w וְצֹ֖חַר|lemma="יִצְחַר" strong="c:H6714" x-morph="He,C:Np"\w* -\f + \ft K \w יצחר|lemma="יִצְחַר" strong="H3328" x-morph="He,Np"\w*\f* +\f + \ft K \+w יצחר|lemma="יִצְחַר" strong="H3328" x-morph="He,Np"\+w*\f* \w וְ⁠אֶתְנָֽן|lemma="אֶתְנַן" strong="c:H0869" x-morph="He,C:Np"\w*׃ \v 8 @@ -1547,7 +1547,7 @@ \w וְ⁠רִנָּ֔ה|lemma="רִנָּה" strong="c:H7441" x-morph="He,C:Np"\w* \w בֶּן|lemma="בֶּן־חָנָן" strong="H1135" x-morph="He,Np"\w*־\w חָנָ֖ן|lemma="בֶּן־חָנָן" strong="H1135" x-morph="He,Np"\w* \w וְתִיל֑וֹן|lemma="תּוּלוֹן" strong="c:H8436" x-morph="He,C:Np"\w* -\f + \ft K \w ו⁠תולון|lemma="תּוּלוֹן" strong="c:H8436" x-morph="He,C:Np"\w*\f* +\f + \ft K \+w ו⁠תולון|lemma="תּוּלוֹן" strong="c:H8436" x-morph="He,C:Np"\+w*\f* \w וּ⁠בְנֵ֣י|lemma="בֵּן" strong="c:H1121a" x-morph="He,C:Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w יִשְׁעִ֔י|lemma="יִשְׁעִי" strong="H3469" x-morph="He,Np"\w* \w זוֹחֵ֖ת|lemma="זוֹחֵת" strong="H2105" x-morph="He,Np"\w* @@ -1769,7 +1769,7 @@ \w וַ⁠יַּכּ֨וּ|lemma="נָכָה" strong="c:H5221" x-morph="He,C:Vhw3mp"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w אָהֳלֵי⁠הֶ֜ם|lemma="אֹהֶל" strong="H0168" x-morph="He,Ncmpc:Sp3mp"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w הַמְּעוּנִ֨ים|lemma="מְעוּנִי" strong="d:H4586" x-morph="He,Td:Ngmpa"\w* -\f + \ft K \w ה⁠מעינים|lemma="מְעוּנִי" strong="d:H4586" x-morph="He,Td:Ngmpa"\w*\f* +\f + \ft K \+w ה⁠מעינים|lemma="מְעוּנִי" strong="d:H4586" x-morph="He,Td:Ngmpa"\+w*\f* \w אֲשֶׁ֤ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w נִמְצְאוּ|lemma="מָצָא" strong="H4672" x-morph="He,VNp3cp"\w*־\w שָׁ֨מָּ⁠ה֙|lemma="שָׁם" strong="H8033" x-morph="He,D:Sd"\w* \w וַ⁠יַּחֲרִימֻ⁠ם֙|lemma="חָרַם" strong="c:H2763a" x-morph="He,C:Vhw3mp:Sp3mp"\w* @@ -2399,7 +2399,7 @@ \va 11\va* \w אֶלְקָנָ֑ה|lemma="אֶלְקָנָה" strong="H0511" x-morph="He,Np"\w* \w בנ⁠ו|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/son"\w* -\f + \ft Q \w בְּנֵי֙|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc"\w*\f* +\f + \ft Q \+w בְּנֵי֙|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc"\+w*\f* \w אֶלְקָנָ֔ה|lemma="אֶלְקָנָה" strong="H0511" x-morph="He,Np"\w* \w צוֹפַ֥י|lemma="צוּף" strong="H6689" x-morph="He,Np"\w* \w בְּנ֖⁠וֹ|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/son"\w* @@ -2495,7 +2495,7 @@ \v 35 \va 20\va* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w ציף|lemma="צוּף" strong="H6689" x-morph="He,Np"\w* -\f + \ft K \w ציף|lemma="צוּף" strong="H6689" x-morph="He,Np"\w*\f* +\f + \ft K \+w ציף|lemma="צוּף" strong="H6689" x-morph="He,Np"\+w*\f* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w אֶלְקָנָ֔ה|lemma="אֶלְקָנָה" strong="H0511" x-morph="He,Np"\w* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w מַ֖חַת|lemma="מַחַת" strong="H4287" x-morph="He,Np"\w* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w עֲמָשָֽׂי|lemma="עֲמָשַׂי" strong="H6022" x-morph="He,Np"\w*׃ @@ -2975,7 +2975,7 @@ \w תּוֹלָ֧ע|lemma="תּוֹלָע" strong="H8439" x-morph="He,Np"\w* \w וּ⁠פוּאָ֛ה|lemma="פּוּאָה" strong="c:H6312" x-morph="He,C:Np"\w* \w יָשׁ֥וּב|lemma="יָשׁוּב" strong="H3437" x-morph="He,Np"\w* -\f + \ft K \w ישיב|lemma="יָשׁוּב" strong="H3437" x-morph="He,Np"\w*\f* +\f + \ft K \+w ישיב|lemma="יָשׁוּב" strong="H3437" x-morph="He,Np"\+w*\f* \w וְ⁠שִׁמְר֖וֹן|lemma="שִׁמְרוֹן" strong="c:H8110b" x-morph="He,C:Np"\w* \w אַרְבָּעָֽה|lemma="אַרְבַּע" strong="H0702" x-morph="He,Acmsa"\w*׃ס @@ -3106,7 +3106,7 @@ \w וּ⁠בְנֵ֣י|lemma="בֵּן" strong="c:H1121a" x-morph="He,C:Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w בִלְהָ֗ן|lemma="בִּלְהָן" strong="H1092" x-morph="He,Np"\w* \w יְע֡וּשׁ|lemma="יְעוּשׁ" strong="H3266" x-morph="He,Np"\w* -\f + \ft K \w יעיש|lemma="יְעוּשׁ" strong="H3266" x-morph="He,Np"\w*\f* +\f + \ft K \+w יעיש|lemma="יְעוּשׁ" strong="H3266" x-morph="He,Np"\+w*\f* \w וּ֠⁠בִנְיָמִן|lemma="בִּנְיָמִין" strong="c:H1144" x-morph="He,C:Np" x-tw="rc://*/tw/dict/bible/names/benjamin"\w* \w וְ⁠אֵה֤וּד|lemma="אֵהוּד" strong="c:H0164" x-morph="He,C:Np"\w* \w וּֽ⁠כְנַעֲנָה֙|lemma="כְּנַעֲנָה" strong="c:H3668" x-morph="He,C:Np"\w* @@ -3356,7 +3356,7 @@ \w ה֖וּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w* \w אֲבִ֥י|lemma="אָב" strong="H0001" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/father"\w* \w בִרְזָֽיִת|lemma="בִּרְזוֹת" strong="H1269" x-morph="He,Np"\w*׃ -\f + \ft K \w ברזות|lemma="בִּרְזוֹת" strong="H1269" x-morph="He,Np"\w*\f* +\f + \ft K \+w ברזות|lemma="בִּרְזוֹת" strong="H1269" x-morph="He,Np"\+w*\f* \v 32 \w וְ⁠חֶ֨בֶר֙|lemma="חֶבֶר" strong="c:H2268" x-morph="He,C:Np"\w* @@ -3383,10 +3383,10 @@ \w שָׁ֑מֶר|lemma="שֶׁמֶר" strong="H8106" x-morph="He,Np"\w* \w אֲחִ֥י|lemma="אֲחִי" strong="H0277" x-morph="He,Np"\w* \w ו⁠רוהגה|lemma="רוֹהֲגָה" strong="c:H7303" x-morph="He,C:Np"\w* -\f + \ft Q \w וְרָהְגָּ֖ה|lemma="רוֹהֲגָה" strong="c:H7303" x-morph="He,C:Np"\w*\f* -\f + \ft Or perhaps \w אֲחִיו|lemma="אָח" strong="H0251" x=morph="He,Ncmsc:Sp3ms\w* \w רוֹהֲגָה|lemma="רוֹהֲגָה" strong="c:H7303" x-morph="He,C:Np"\w*\f* +\f + \ft Q \+w וְרָהְגָּ֖ה|lemma="רוֹהֲגָה" strong="c:H7303" x-morph="He,C:Np"\+w*\f* +\f + \ft Or perhaps \+w אֲחִיו|lemma="אָח" strong="H0251" x=morph="He,Ncmsc:Sp3ms\w* \w רוֹהֲגָה|lemma="רוֹהֲגָה" strong="c:H7303" x-morph="He,C:Np"\+w*\f* \w וְחֻבָּ֥ה|lemma="חֻבָּה" strong="c:H3160" x-morph="He,C:Np"\w* -\f + \ft K \w יחבה|lemma="יְחֻבָּה" strong="H3160" x-morph="He,Np"\w*\f* +\f + \ft K \+w יחבה|lemma="יְחֻבָּה" strong="H3160" x-morph="He,Np"\+w*\f* \w וַ⁠אֲרָֽם|lemma="אֲרָם" strong="c:H0758" x-morph="He,C:Np"\w*׃ \v 35 @@ -3632,7 +3632,7 @@ \v 25 \w וְ⁠יִפְדְיָ֥ה|lemma="יִפְדְּיָה" strong="c:H3301" x-morph="He,C:Np"\w* \w וּפְנוּאֵ֖ל|lemma="פְּנוּאֵל" strong="c:H6439" x-morph="He,C:Np"\w* -\f + \ft K \w ו⁠פניאל|lemma="פְּנוּאֵל" strong="c:H6439" x-morph="He,C:Np"\w*\f* +\f + \ft K \+w ו⁠פניאל|lemma="פְּנוּאֵל" strong="c:H6439" x-morph="He,C:Np"\+w*\f* \w בְּנֵ֥י|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w שָׁשָֽׁק|lemma="שָׁשַׁק" strong="H8349" x-morph="He,Np"\w*׃ @@ -3836,7 +3836,7 @@ \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w אִמְרִ֣י|lemma="אִמְרִי" strong="H0566" x-morph="He,Np"\w* \w בֶן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w בָּנִ֔י|lemma="בָּנִי" strong="H1137" x-morph="He,Ncmpc:R" x-tw="rc://*/tw/dict/bible/names/benjamin"\w* \w מִן|lemma="" strong="m" x-morph="He,R"\w*־\w בְּנֵי|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w פֶ֖רֶץ|lemma="פֶּרֶץ" strong="H6557" x-morph="He,Np"\w* -\f + \ft K \w בֶן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc"\w*־\w בני⁠מן|lemma="בִּנְיָמִין" strong="H1144" x-morph="He,Ncmpc:R"\w*־\w בְּנֵי|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w פֶ֖רֶץ|lemma="פֶּרֶץ" strong="H6557" x-morph="He,Np"\w*\f* +\f + \ft K \+w בֶן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc"\w*־\w בני⁠מן|lemma="בִּנְיָמִין" strong="H1144" x-morph="He,Ncmpc:R"\w*־\w בְּנֵי|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w פֶ֖רֶץ|lemma="פֶּרֶץ" strong="H6557" x-morph="He,Np"\+w*\f* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w יְהוּדָֽה|lemma="יְהוּדָה" strong="H3063" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/judea"\w*׃ \v 5 @@ -4151,7 +4151,7 @@ \w לַ⁠לְוִיִּ֛ם|lemma="לֵוִיִּי" strong="l:H3881" x-morph="He,Rd:Ngmpa" x-tw="rc://*/tw/dict/bible/names/levite"\w* \w בַּ⁠לְּשָׁכֹ֖ת|lemma="לִשְׁכָּה" strong="b:H3957" x-morph="He,Rd:Ncfpa"\w* \w פְּטוּרִ֑ים|lemma="פָּטִיר" strong="H6362" x-morph="He,Vqsmpa"\w* -\f + \ft K \w פטירים|lemma="פָּטִיר" strong="H6359" x-morph="He,Aampa"\w*\f* +\f + \ft K \+w פטירים|lemma="פָּטִיר" strong="H6359" x-morph="He,Aampa"\+w*\f* \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w יוֹמָ֥ם|lemma="יוֹמָם" strong="H3119" x-morph="He,D"\w* \w וָ⁠לַ֛יְלָה|lemma="לַיִל" strong="c:H3915" x-morph="He,C:Ncmsa"\w* \w עֲלֵי⁠הֶ֖ם|lemma="עַל" strong="H5921a" x-morph="He,R:Sp3mp"\w* @@ -4173,7 +4173,7 @@ \w יָשְׁב֥וּ|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqp3cp"\w* \w אֲבִֽי|lemma="אָב" strong="H0001" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/father"\w*־\w גִבְע֖וֹן|lemma="גִּבְעוֹן" strong="H1391" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/gibeon"\w* \w יְעִיאֵ֑ל|lemma="יְעִיאֵל" strong="H3273" x-morph="He,Np"\w* -\f + \ft K \w יעואל|lemma="יְעִיאֵל" strong="H3273" x-morph="He,Np"\w*\f* +\f + \ft K \+w יעואל|lemma="יְעִיאֵל" strong="H3273" x-morph="He,Np"\+w*\f* \w וְ⁠שֵׁ֥ם|lemma="שֵׁם" strong="c:H8034" x-morph="He,C:Ncmsc"\w* \w אִשְׁתּ֖⁠וֹ|lemma="אִשָּׁה" strong="H0802" x-morph="He,Ncfsc:Sp3ms"\w* \w מַעֲכָֽה|lemma="מַעֲכָה" strong="H4601" x-morph="He,Np"\w*׃ @@ -4629,7 +4629,7 @@ \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w חַכְמוֹנִ֗י|lemma="חַכְמוֹנִי" strong="H2453" x-morph="He,Np"\w* \w רֹ֚אשׁ|lemma="רֹאשׁ" strong="H7218a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/head"\w* \w הַשָּׁ֣לִישִׁ֔ים|lemma="שְׁלוֹשִׁים" strong="d:H7991" x-morph="He,Td:Ncmpa"\w* -\f + \ft K \w ה⁠שלושים|lemma="שְׁלוֹשִׁים" strong="d:H7970" x-morph="He,Td:Acbpa"\w*\f* +\f + \ft K \+w ה⁠שלושים|lemma="שְׁלוֹשִׁים" strong="d:H7970" x-morph="He,Td:Acbpa"\+w*\f* \w הֽוּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w*־\w עוֹרֵ֧ר|lemma="עוּר" strong="H5782" x-morph="He,Vop3ms" x-tw="rc://*/tw/dict/bible/other/raise"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w חֲנִית֛⁠וֹ|lemma="חֲנִית" strong="H2595" x-morph="He,Ncfsc:Sp3ms"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w שְׁלֹשׁ|lemma="שָׁלוֹשׁ" strong="H7969" x-morph="He,Acfsa"\w*־\w מֵא֥וֹת|lemma="מֵאָה" strong="H3967" x-morph="He,Acbpa"\w* @@ -4702,7 +4702,7 @@ \v 17 \w ו⁠יתאו|lemma="אָוָה" strong="c:H0183" x-morph="He,C:Vtw3ms"\w* -\f + \ft Q \w וַיִּתְאָ֥יו|lemma="אָוָה" strong="c:H0183" x-morph="He,C:Vtw3ms"\w*\f* +\f + \ft Q \+w וַיִּתְאָ֥יו|lemma="אָוָה" strong="c:H0183" x-morph="He,C:Vtw3ms"\+w*\f* \w דָּוִ֖יד|lemma="דָּוִד" strong="H1732" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/david"\w* \w וַ⁠יֹּאמַ֑ר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* \w מִ֚י|lemma="מִי" strong="H4310" x-morph="He,Ti"\w* @@ -4770,7 +4770,7 @@ \w מֵא֖וֹת|lemma="מֵאָה" strong="H3967" x-morph="He,Acbpa"\w* \w חָלָ֑ל|lemma="חָלָל" strong="H2491a" x-morph="He,Aamsa"\w* \w וְלוֹ|lemma="" strong="c:l" x-morph="He,C:R:Sp3ms"\w*־\w שֵׁ֖ם|lemma="שֵׁם" strong="H8034" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/kt/name"\w* -\f + \ft K \w ו⁠לא|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w*\f* +\f + \ft K \+w ו⁠לא|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\+w*\f* \w בַּ⁠שְּׁלוֹשָֽׁה|lemma="שָׁלוֹשׁ" strong="b:H7969" x-morph="He,Rd:Acmsa"\w*׃ \v 21 @@ -4982,7 +4982,7 @@ \w הָ⁠עֲשְׁתְּרָתִ֑י|lemma="עַשְׁתְּרָתִי" strong="d:H6254" x-morph="He,Td:Ngmsa"\w* \w שָׁמָע֙|lemma="שָׁמָע" strong="H8091" x-morph="He,Np"\w* \w וִֽיעִיאֵ֔ל|lemma="יְעִיאֵל" strong="c:H3273" x-morph="He,C:Np"\w* ס -\f + \ft K \w ו⁠יעואל|lemma="יְעִיאֵל" strong="c:H3273" x-morph="He,C:Np"\w*\f* +\f + \ft K \+w ו⁠יעואל|lemma="יְעִיאֵל" strong="c:H3273" x-morph="He,C:Np"\+w*\f* \w בְּנֵ֖י|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w חוֹתָ֥ם|lemma="חוֹתָם" strong="H2369" x-morph="He,Np"\w* \w הָ⁠עֲרֹעֵרִֽי|lemma="עֲרֹעֵרִי" strong="d:H6200" x-morph="He,Td:Ngmsa"\w*׃ס @@ -5048,7 +5048,7 @@ \w הַ⁠שְּׁמָעָ֣ה|lemma="שְׁמָעָה" strong="d:H8094" x-morph="He,Td:Np"\w* \w הַ⁠גִּבְעָתִ֔י|lemma="גִּבְעָתִי" strong="d:H1395" x-morph="He,Td:Ngmsa"\w* \w וִיזִיאֵ֥ל|lemma="יְזַוְאֵל" strong="c:H3149" x-morph="He,C:Np"\w* -\f + \ft K \w ו⁠יזואל|lemma="יְזַוְאֵל" strong="c:H3149" x-morph="He,C:Np"\w*\f* +\f + \ft K \+w ו⁠יזואל|lemma="יְזַוְאֵל" strong="c:H3149" x-morph="He,C:Np"\+w*\f* \w וָ⁠פֶ֖לֶט|lemma="פֶּלֶט" strong="c:H6404" x-morph="He,C:Np"\w* \w בְּנֵ֣י|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w עַזְמָ֑וֶת|lemma="עַזְמָוֶת" strong="H5820" x-morph="He,Np"\w* @@ -5078,7 +5078,7 @@ \w וּ⁠שְׁמַרְיָ֔הוּ|lemma="שְׁמַרְיָה" strong="c:H8114" x-morph="He,C:Np"\w* \w וּ⁠שְׁפַטְיָ֖הוּ|lemma="שְׁפַטְיָה" strong="c:H8203" x-morph="He,C:Np"\w* \w הַחֲרוּפִֽי|lemma="חֲרוּפִי" strong="d:H2741" x-morph="He,Td:Ngmsa"\w*׃ -\f + \ft K \w ה⁠חריפי|lemma="חֲרוּפִי" strong="d:H2741" x-morph="He,Td:Ngmsa"\w*\f* +\f + \ft K \+w ה⁠חריפי|lemma="חֲרוּפִי" strong="d:H2741" x-morph="He,Td:Ngmsa"\+w*\f* \v 6 \va 7\va* @@ -5181,7 +5181,7 @@ \w וְ⁠ה֥וּא|lemma="הוּא" strong="c:H1931" x-morph="He,C:Pp3ms"\w* \w מְמַלֵּ֖א|lemma="מָלֵא" strong="H4390" x-morph="He,Vprmsa"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w גְּדוֹתָ֑יו|lemma="גָּדָה" strong="H1415" x-morph="He,Ncfpc:Sp3ms"\w* -\f + \ft K \w גדיתי⁠ו|lemma="גָּדָה" strong="H1415" x-morph="He,Ncfpc:Sp3ms"\w*\f* +\f + \ft K \+w גדיתי⁠ו|lemma="גָּדָה" strong="H1415" x-morph="He,Ncfpc:Sp3ms"\+w*\f* \w וַ⁠יַּבְרִ֨יחוּ֙|lemma="בָּרַח" strong="c:H1272" x-morph="He,C:Vhw3mp"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w הָ֣⁠עֲמָקִ֔ים|lemma="עֵמֶק" strong="d:H6010" x-morph="He,Td:Ncmpa"\w* \w לַ⁠מִּזְרָ֖ח|lemma="מִזְרָח" strong="l:H4217" x-morph="He,Rd:Ncmsa"\w* @@ -5229,7 +5229,7 @@ \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w עֲמָשַׂי֮|lemma="עֲמָשַׂי" strong="H6022" x-morph="He,Np"\w* \w רֹ֣אשׁ|lemma="רֹאשׁ" strong="H7218a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/head"\w* \w ה⁠שלושים|lemma="שְׁלוֹשִׁים" strong="d:H7970" x-morph="He,Td:Acbpa"\w* -\f + \ft Q \w הַשָּׁלִישִׁים֒|lemma="שְׁלוֹשִׁים" strong="d:H7991" x-morph="He,Td:Ncmpa"\w*\f* +\f + \ft Q \+w הַשָּׁלִישִׁים֒|lemma="שְׁלוֹשִׁים" strong="d:H7991" x-morph="He,Td:Ncmpa"\+w*\f* \w לְ⁠ךָ֤|lemma="" strong="l" x-morph="He,R:Sp2ms"\w* \w דָוִיד֙|lemma="דָּוִד" strong="H1732" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/david"\w* \w וְ⁠עִמְּ⁠ךָ֣|lemma="עִם" strong="c:H5973a" x-morph="He,C:R:Sp2ms"\w* @@ -5779,7 +5779,7 @@ \v 1 \w וַ֠⁠יִּשְׁלַח|lemma="שָׁלַח" strong="c:H7971" x-morph="He,C:Vqw3ms"\w* \w חירם|lemma="חִירָם" strong="H2438" x-morph="He,Np"\w* -\f + \ft Q \w חוּרָ֨ם|lemma="חוּרָם" strong="H2361" x-morph="He,Np"\w*\f* +\f + \ft Q \+w חוּרָ֨ם|lemma="חוּרָם" strong="H2361" x-morph="He,Np"\+w*\f* \w מֶֽלֶךְ|lemma="מֶלֶךְ" strong="H4428" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/king"\w*־\w צֹ֥ר|lemma="צֹר" strong="H6865" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/tyre"\w* \w מַלְאָכִים֮|lemma="מַלְאָךְ" strong="H4397" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/other/messenger"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w דָּוִיד֒|lemma="דָּוִד" strong="H1732" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/david"\w* @@ -5876,7 +5876,7 @@ \w לֵ⁠אמֹ֔ר|lemma="אָמַר" strong="l:H0559" x-morph="He,R:Vqc"\w* \w הַ⁠אֶֽעֱלֶה֙|lemma="עָלָה" strong="i:H5927" x-morph="He,Ti:Vqi1cs"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w פְּלִשְׁתִּ֔ים|lemma="פְּלִשְׁתִּי" strong="H6430" x-morph="He,Ngmpa" x-tw="rc://*/tw/dict/bible/names/philistines"\w* -\f + \ft K \w פלשתיים|lemma="פְּלִשְׁתִּי" strong="H6430" x-morph="He,Ngmpa"\w*\f* +\f + \ft K \+w פלשתיים|lemma="פְּלִשְׁתִּי" strong="H6430" x-morph="He,Ngmpa"\+w*\f* \w וּ⁠נְתַתָּ֖⁠ם|lemma="נָתַן" strong="c:H5414" x-morph="He,C:Vqq2ms:Sp3mp"\w* \w בְּ⁠יָדִ֑⁠י|lemma="יָד" strong="b:H3027" x-morph="He,R:Ncbsc:Sp1cs" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w וַ⁠יֹּ֨אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* @@ -6267,7 +6267,7 @@ \w וֶֽ⁠אֱלִיעֶ֨זֶר֙|lemma="אֱלִיעֶזֶר" strong="c:H0461" x-morph="He,C:Np"\w* \w הַ⁠כֹּ֣הֲנִ֔ים|lemma="כֹּהֵן" strong="d:H3548" x-morph="He,Td:Ncmpa" x-tw="rc://*/tw/dict/bible/kt/priest"\w* \w מַחְצְרִים֙|lemma="חָצַר" strong="H2690" x-morph="He,Vprmpa"\w* -\f + \ft Q \w מחצצרים|lemma="חצצר" strong="H2690" x-morph="He,Vprmpa"\w*\f* +\f + \ft Q \+w מחצצרים|lemma="חצצר" strong="H2690" x-morph="He,Vprmpa"\+w*\f* \w בַּ⁠חֲצֹ֣צְר֔וֹת|lemma="חֲצֹצְרָה" strong="b:H2689" x-morph="He,R:Ncfpa" x-tw="rc://*/tw/dict/bible/other/trumpet"\w* \w לִ⁠פְנֵ֖י|lemma="פָּנִים" strong="l:H6440" x-morph="He,R:Ncbpc"\w* \w אֲר֣וֹן|lemma="אָרוֹן" strong="H0727" x-morph="He,Ncbsc"\w* @@ -7352,7 +7352,7 @@ \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הֲדֽוֹרָם|lemma="הֲדוֹרָם" strong="H1913a" x-morph="He,Np"\w*־\w בְּנ֣⁠וֹ|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w הַ⁠מֶּֽלֶךְ|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w*־\w דָּ֠וִיד|lemma="דָּוִד" strong="H1732" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/david"\w* \w ל⁠שאול|lemma="שָׁאַל" strong="l:H7592" x-morph="He,R:Vqc"\w*־\w ל֨⁠וֹ|lemma="שָׁאַל" strong="l:H7592" x-morph="He,R:Sp3ms"\w* -\f + \ft Q \w לִשְׁאָל|lemma="שָׁאַל" strong="l:H7592" x-morph="He,R:Vqc"\w*\f* +\f + \ft Q \+w לִשְׁאָל|lemma="שָׁאַל" strong="l:H7592" x-morph="He,R:Vqc"\+w*\f* \w לְ⁠שָׁל֜וֹם|lemma="שָׁלוֹם" strong="l:H7965" x-morph="He,R:Ncmsa"\w* \w וּֽ⁠לְ⁠בָרֲכ֗⁠וֹ|lemma="בָּרַךְ" strong="c:l:H1288" x-morph="He,C:R:Vpc:Sp3ms"\w* \w עַל֩|lemma="עַל" strong="H5921a" x-morph="He,R"\w* @@ -7860,7 +7860,7 @@ \w וַ⁠יַּ֞ךְ|lemma="נָכָה" strong="c:H5221" x-morph="He,C:Vhw3ms"\w* \w אֶלְחָנָ֣ן|lemma="אֶלְחָנָן" strong="H0445" x-morph="He,Np"\w* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w יָעִ֗יר|lemma="יָעוּר" strong="H3265" x-morph="He,Np"\w* -\f + \ft K \w יעור|lemma="יָעוּר" strong="H3265" x-morph="He,Np"\w*\f* +\f + \ft K \+w יעור|lemma="יָעוּר" strong="H3265" x-morph="He,Np"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w לַחְמִי֙|lemma="לַחְמִי" strong="H3902" x-morph="He,Np"\w* \w אֲחִי֙|lemma="אָח" strong="H0251" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/brother"\w* \w גָּלְיָ֣ת|lemma="גׇּלְיַת" strong="H1555" x-morph="He,Np"\w* @@ -8483,7 +8483,7 @@ \w דָּוִ֖יד|lemma="דָּוִד" strong="H1732" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/david"\w* \w לִ⁠שְׁלֹמֹ֑ה|lemma="שְׁלֹמֹה" strong="l:H8010" x-morph="He,R:Np"\w* \w בְּנִ֕י|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/son"\w* -\f + \ft K \w בנ⁠ו|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w בנ⁠ו|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w אֲנִי֙|lemma="אֲנִי" strong="H0589" x-morph="He,Pp1cs"\w* \w הָיָ֣ה|lemma="הָיָה" strong="H1961" x-morph="He,Vqp3ms"\w* \w עִם|lemma="עִם" strong="H5973a" x-morph="He,R"\w*־\w לְבָבִ֔⁠י|lemma="לֵבָב" strong="H3824" x-morph="He,Ncmsc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/heart"\w* @@ -8788,7 +8788,7 @@ \w בְּנֵ֣י|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w שִׁמְעִ֗י|lemma="שִׁמְעִי" strong="H8096" x-morph="He,Np"\w* \w שלמות|lemma="שְׁלֹמוֹת" strong="H8013" x-morph="He,Np"\w* -\f + \ft Q \w שְׁלוֹמִ֧ית|lemma="שְׁלֹמוֹת" strong="H8013" x-morph="He,Np"\w*\f* +\f + \ft Q \+w שְׁלוֹמִ֧ית|lemma="שְׁלֹמוֹת" strong="H8013" x-morph="He,Np"\+w*\f* \w וַ⁠חֲזִיאֵ֛ל|lemma="חֲזִיאֵל" strong="c:H2381" x-morph="He,C:Np"\w* \w וְ⁠הָרָ֖ן|lemma="הָרָן" strong="c:H2039" x-morph="He,C:Np"\w* \w שְׁלֹשָׁ֑ה|lemma="שָׁלוֹשׁ" strong="H7969" x-morph="He,Acmsa"\w* @@ -9310,7 +9310,7 @@ \w לִ⁠בְנֵ֥י|lemma="בֵּן" strong="l:H1121a" x-morph="He,R:Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w מִיכָ֖ה|lemma="מִיכָה" strong="H4318" x-morph="He,Np"\w* \w שָׁמִֽיר|lemma="שָׁמוּר" strong="H8053" x-morph="He,Np"\w*׃ -\f + \ft K \w שמור|lemma="שָׁמוּר" strong="H8053" x-morph="He,Np"\w*\f* +\f + \ft K \+w שמור|lemma="שָׁמוּר" strong="H8053" x-morph="He,Np"\+w*\f* \v 25 \w אֲחִ֤י|lemma="אָח" strong="H0251" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/brother"\w* @@ -9398,7 +9398,7 @@ \w וְ⁠הֵימָ֣ן|lemma="הֵימָן" strong="c:H1968" x-morph="He,C:Np"\w* \w וִֽ⁠ידוּת֔וּן|lemma="יְדוּתוּן" strong="c:H3038" x-morph="He,C:Np"\w* \w הַֽנִּבְּאִ֛ים|lemma="נָבָא" strong="d:H5012" x-morph="He,Td:VNsmpa" x-tw="rc://*/tw/dict/bible/kt/prophet"\w* -\f + \ft K \w ה⁠נביאים|lemma="נָבִיא" strong="d:H5030" x-morph="He,Td:Ncmpa"\w*\f* +\f + \ft K \+w ה⁠נביאים|lemma="נָבִיא" strong="d:H5030" x-morph="He,Td:Ncmpa"\+w*\f* \w בְּ⁠כִנֹּר֥וֹת|lemma="כִּנּוֹר" strong="b:H3658" x-morph="He,R:Ncmpa"\w* \w בִּ⁠נְבָלִ֖ים|lemma="נֶבֶל" strong="b:H5035b" x-morph="He,R:Ncmpa"\w* \w וּ⁠בִ⁠מְצִלְתָּ֑יִם|lemma="מְצֵלֶת" strong="c:b:H4700" x-morph="He,C:R:Ncfda"\w* @@ -10003,7 +10003,7 @@ \w וְ⁠זִכְרִ֥י|lemma="זִכְרִי" strong="c:H2147" x-morph="He,C:Np"\w* \w בְנ֖⁠וֹ|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w וּשְׁלֹמִ֥ית|lemma="שְׁלֹמוֹת" strong="c:H8013" x-morph="He,C:Np"\w* -\f + \ft K \w ו⁠שלמות|lemma="שְׁלֹמוֹת" strong="c:H8013" x-morph="He,C:Np"\w*\f* +\f + \ft K \+w ו⁠שלמות|lemma="שְׁלֹמוֹת" strong="c:H8013" x-morph="He,C:Np"\+w*\f* \w בְּנֽ⁠וֹ|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/son"\w*׃ \v 26 @@ -10491,7 +10491,7 @@ \w הָ⁠רֹעִ֣ים|lemma="רָעָה" strong="d:H7462b" x-morph="He,Td:Vqrmpa"\w* \w בַּ⁠שָּׁר֔וֹן|lemma="שָׁרוֹן" strong="b:H8289" x-morph="He,Rd:Np"\w* \w שטרי|lemma="שִׁטְרַי" strong="H7861" x-morph="He,Np"\w* -\f + \ft Q \w שִׁרְטַ֖י|lemma="שִׁטְרַי" strong="H7861" x-morph="He,Np"\w*\f* +\f + \ft Q \+w שִׁרְטַ֖י|lemma="שִׁטְרַי" strong="H7861" x-morph="He,Np"\+w*\f* \w הַ⁠שָּׁרוֹנִ֑י|lemma="שָׁרוֹנִי" strong="d:H8290" x-morph="He,Td:Ngmsa"\w* \w וְ⁠עַל|lemma="עַל" strong="c:H5921a" x-morph="He,C:R"\w*־\w הַ⁠בָּקָר֙|lemma="בָּקָר" strong="d:H1241" x-morph="He,Td:Ncbsa"\w* \w בָּֽ⁠עֲמָקִ֔ים|lemma="עֵמֶק" strong="b:H6010" x-morph="He,Rd:Ncmpa"\w* @@ -11171,7 +11171,7 @@ \w קָדְשֶׁ֑⁠ךָ|lemma="קֹדֶשׁ" strong="H6944" x-morph="He,Ncmsc:Sp2ms" x-tw="rc://*/tw/dict/bible/kt/holy"\w* \w מִ⁠יָּדְ⁠ךָ֥|lemma="יָד" strong="m:H3027" x-morph="He,R:Ncbsc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w ה֖וּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w* -\f + \ft K \w היא|lemma="הוּא" strong="H1931" x-morph="He,Pp3fs"\w*\f* +\f + \ft K \+w היא|lemma="הוּא" strong="H1931" x-morph="He,Pp3fs"\+w*\f* \w וּ⁠לְ⁠ךָ֥|lemma="" strong="c:l" x-morph="He,C:R:Sp2ms"\w* \w הַ⁠כֹּֽל|lemma="כֹּל" strong="d:H3605" x-morph="He,Td:Ncmsa"\w*׃ diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/14-2CH.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/14-2CH.usfm index 331cc20f..52ef67d0 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/14-2CH.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/14-2CH.usfm @@ -884,7 +884,7 @@ \w מֵֽ⁠הַ⁠שְּׂמֹ֑אול|lemma="שְׂמָאלִי" strong="m:d:H8042" x-morph="He,R:Td:Ncmsa"\w* \w וַ⁠יִּקְרָ֤א|lemma="קָרָא" strong="c:H7121" x-morph="He,C:Vqw3ms" x-tw="rc://*/tw/dict/bible/other/declare"\w* \w שֵׁם|lemma="שֵׁם" strong="H8034" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/name"\w*־\w ה⁠ימיני|lemma="יְמִינִי" strong="d:H3227a" x-morph="He,Td:Aamsa"\w* -\f + \ft Q \w הַיְמָנִי֙|lemma="יְמִינִי" strong="d:H3233" x-morph="He,Td:Aamsa"\w*\f* +\f + \ft Q \+w הַיְמָנִי֙|lemma="יְמִינִי" strong="d:H3233" x-morph="He,Td:Aamsa"\+w*\f* \w יָכִ֔ין|lemma="יָכִין" strong="H3199" x-morph="He,Np"\w* \w וְ⁠שֵׁ֥ם|lemma="שֵׁם" strong="c:H8034" x-morph="He,C:Ncmsc"\w* \w הַ⁠שְּׂמָאלִ֖י|lemma="שְׂמֹאול" strong="d:H8040" x-morph="He,Td:Aamsa"\w* @@ -1061,7 +1061,7 @@ \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w הַ⁠מִּזְרָק֑וֹת|lemma="מִזְרָק" strong="d:H4219" x-morph="He,Td:Ncmpa"\w* ס \w וַ⁠יְכַ֣ל|lemma="כָּלָה" strong="c:H3615" x-morph="He,C:Vpw3ms"\w* \w חוּרָ֗ם|lemma="חִירָם" strong="H2461" x-morph="He,Np"\w* -\f + \ft K \w חירם|lemma="חִירָם" strong="H2438" x-morph="He,Np"\w*\f* +\f + \ft K \+w חירם|lemma="חִירָם" strong="H2438" x-morph="He,Np"\+w*\f* \w לַ⁠עֲשׂוֹת֙|lemma="עָשָׂה" strong="l:H6213a" x-morph="He,R:Vqc"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ⁠מְּלָאכָ֔ה|lemma="מְלָאכָה" strong="d:H4399" x-morph="He,Td:Ncfsa"\w* \w אֲשֶׁ֥ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* @@ -1406,14 +1406,14 @@ \w לְ⁠מֵאָ֣ה|lemma="מֵאָה" strong="l:H3967" x-morph="He,R:Acbsa"\w* \w וְ⁠עֶשְׂרִ֔ים|lemma="עֶשְׂרִים" strong="c:H6242" x-morph="He,C:Acbpa"\w* \w מַחְצְרִ֖ים|lemma="חָצַר" strong="H2690" x-morph="He,Vprmpa"\w* -\f + \ft K \w מחצררים|lemma="חצצר" strong="H2690" x-morph="He,Vprmpa"\w*\f* +\f + \ft K \+w מחצררים|lemma="חצצר" strong="H2690" x-morph="He,Vprmpa"\+w*\f* \w בַּ⁠חֲצֹֽצְרֽוֹת|lemma="חֲצֹצְרָה" strong="b:H2689" x-morph="He,R:Ncfpa" x-tw="rc://*/tw/dict/bible/other/trumpet"\w*׃ \v 13 \w וַ⁠יְהִ֣י|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqw3ms"\w* \w כְ֠⁠אֶחָד|lemma="אֶחָד" strong="k:H0259" x-morph="He,R:Acmsa"\w* \w לַמְחַצְּרִ֨ים|lemma="חָצַר" strong="l:H2690" x-morph="He,Rd:Vprmpa"\w* -\f + \ft K \w ל⁠מחצצרים|lemma="חצצר" strong="l:H2690" x-morph="He,Rd:Vprmpa"\w*\f* +\f + \ft K \+w ל⁠מחצצרים|lemma="חצצר" strong="l:H2690" x-morph="He,Rd:Vprmpa"\+w*\f* \w וְ⁠לַ⁠מְשֹֽׁרֲרִ֜ים|lemma="שִׁיר" strong="c:l:H7891" x-morph="He,C:Rd:Vormpa"\w* \w לְ⁠הַשְׁמִ֣יעַ|lemma="שָׁמַע" strong="l:H8085" x-morph="He,R:Vhc"\w* \w קוֹל|lemma="קוֹל" strong="H6963a" x-morph="He,Ncmsa"\w*־\w אֶחָ֗ד|lemma="אֶחָד" strong="H0259" x-morph="He,Acmsa"\w* @@ -2271,7 +2271,7 @@ \w בְּ⁠יָדָ֑⁠ם|lemma="יָד" strong="b:H3027" x-morph="He,R:Ncbsc:Sp3mp" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w וְ⁠הַ⁠כֹּהֲנִים֙|lemma="כֹּהֵן" strong="c:d:H3548" x-morph="He,C:Td:Ncmpa" x-tw="rc://*/tw/dict/bible/kt/priest"\w* \w מחצצרים|lemma="חָצַר" strong="H2690" x-morph="He,Vprmpa"\w* -\f + \ft Q \w מַחְצְרִ֣ים|lemma="חָצַר" strong="H2690" x-morph="He,Vprmpa"\w*\f* +\f + \ft Q \+w מַחְצְרִ֣ים|lemma="חָצַר" strong="H2690" x-morph="He,Vprmpa"\+w*\f* \w נֶגְדָּ֔⁠ם|lemma="נֶגֶד" strong="H5048" x-morph="He,R:Sp3mp"\w* \w וְ⁠כָל|lemma="כֹּל" strong="c:H3605" x-morph="He,C:Ncmsc"\w*־\w יִשְׂרָאֵ֖ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w עֹמְדִֽים|lemma="עָמַד" strong="H5975" x-morph="He,Vqrmpa" x-tw="rc://*/tw/dict/bible/kt/appoint"\w*׃ס @@ -2699,7 +2699,7 @@ \w וְ⁠אֵ֨לֶּה|lemma="אֵלֶּה" strong="c:H0428" x-morph="He,C:Pdxcp"\w* \w שָׂרֵ֤י|lemma="שַׂר" strong="H8269" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/other/prince"\w* \w ה⁠נציבים|lemma="נְצִיב" strong="d:H5333" x-morph="He,Td:Ncmpa"\w* -\f + \ft Q \w הַנִּצָּבִ֛ים|lemma="נָצַב" strong="d:H5324" x-morph="He,Td:VNrmpa"\w*\f* +\f + \ft Q \+w הַנִּצָּבִ֛ים|lemma="נָצַב" strong="d:H5324" x-morph="He,Td:VNrmpa"\+w*\f* \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w לַ⁠מֶּ֥לֶךְ|lemma="מֶלֶךְ" strong="l:H4428" x-morph="He,Rd:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* \w שְׁלֹמֹ֖ה|lemma="שְׁלֹמֹה" strong="H8010" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/solomon"\w* \w חֲמִשִּׁ֣ים|lemma="חֲמִשִּׁים" strong="H2572" x-morph="He,Acbpa"\w* @@ -2827,7 +2827,7 @@ \w חוּרָ֨ם|lemma="חוּרָם" strong="H2361" x-morph="He,Np"\w* \w בְּ⁠יַד|lemma="יָד" strong="b:H3027" x-morph="He,R:Ncbsc" x-tw="rc://*/tw/dict/bible/other/hand"\w*־\w עֲבָדָ֜י⁠ו|lemma="עֶבֶד" strong="H5650" x-morph="He,Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/servant"\w* \w אֳנִיּ֗וֹת|lemma="אֳנִיָּה" strong="H0591" x-morph="He,Ncfpa"\w* -\f + \ft K \w אוניות|lemma="אֳנִיָּה" strong="H0591" x-morph="He,Ncfpa"\w*\f* +\f + \ft K \+w אוניות|lemma="אֳנִיָּה" strong="H0591" x-morph="He,Ncfpa"\+w*\f* \w וַ⁠עֲבָדִים֮|lemma="עֶבֶד" strong="c:H5650" x-morph="He,C:Ncmpa" x-tw="rc://*/tw/dict/bible/other/servant"\w* \w י֣וֹדְעֵי|lemma="יָדַע" strong="H3045" x-morph="He,Vqrmpc" x-tw="rc://*/tw/dict/bible/other/know"\w* \w יָם֒|lemma="יָם" strong="H3220" x-morph="He,Ncmsa"\w* @@ -3009,7 +3009,7 @@ \v 10 \w וְ⁠גַם|lemma="גַּם" strong="c:H1571" x-morph="He,C:Ta"\w*־\w עַבְדֵ֤י|lemma="עֶבֶד" strong="H5650" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/other/servant"\w* \w חירם|lemma="חִירָם" strong="H2438" x-morph="He,Np"\w* -\f + \ft Q \w חוּרָם֙|lemma="חִירָם" strong="H2361" x-morph="He,Np"\w*\f* +\f + \ft Q \+w חוּרָם֙|lemma="חִירָם" strong="H2361" x-morph="He,Np"\+w*\f* \w וְ⁠עַבְדֵ֣י|lemma="עֶבֶד" strong="c:H5650" x-morph="He,C:Ncmpc" x-tw="rc://*/tw/dict/bible/other/servant"\w* \w שְׁלֹמֹ֔ה|lemma="שְׁלֹמֹה" strong="H8010" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/solomon"\w* \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w הֵבִ֥יאוּ|lemma="בּוֹא" strong="H0935" x-morph="He,Vhp3cp"\w* @@ -3306,7 +3306,7 @@ \w הַ⁠שִּֽׁילוֹנִ֗י|lemma="שִׁילוֹנִי" strong="d:H7888" x-morph="He,Td:Ngmsa"\w* \w וּ⁠בַ⁠חֲזוֹת֙|lemma="חָזוֹת" strong="c:b:H2378" x-morph="He,C:R:Ncfsc"\w* \w יֶעְדּ֣וֹ|lemma="יֶעְדִּי" strong="H3260" x-morph="He,Np"\w* -\f + \ft K \w יעדי|lemma="יֶעְדִּי" strong="H3260" x-morph="He,Np"\w*\f* +\f + \ft K \+w יעדי|lemma="יֶעְדִּי" strong="H3260" x-morph="He,Np"\+w*\f* \w הַ⁠חֹזֶ֔ה|lemma="חֹזֶה" strong="d:H2374" x-morph="He,Td:Ncmsa"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w יָרָבְעָ֖ם|lemma="יָרׇבְעָם" strong="H3379" x-morph="He,Np"\w* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w נְבָֽט|lemma="נְבָט" strong="H5028" x-morph="He,Np"\w*׃ @@ -3843,7 +3843,7 @@ \w אִשָּׁ֔ה|lemma="אִשָּׁה" strong="H0802" x-morph="He,Ncfsa"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w מָ֣חֲלַ֔ת|lemma="מַחֲלַת" strong="H4258" x-morph="He,Np"\w* \w בַּת|lemma="בֵּן" strong="H1323" x-morph="He,Ncfsc"\w*־\w יְרִימ֖וֹת|lemma="יְרִימוֹת" strong="H3406" x-morph="He,Np"\w* -\f + \ft K \w בן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*\f* +\f + \ft K \+w בן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\+w*\f* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w דָּוִ֑יד|lemma="דָּוִד" strong="H1732" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/david"\w* \w אֲבִיהַ֕יִל|lemma="אֲבִיהַיִל" strong="H0032" x-morph="He,Np"\w* \w בַּת|lemma="בַּת" strong="H1323" x-morph="He,Ncfsc"\w*־\w אֱלִיאָ֖ב|lemma="אֱלִיאָב" strong="H0446" x-morph="He,Np"\w* @@ -4412,7 +4412,7 @@ \w לַ⁠יהוָ֑ה|lemma="יְהֹוָה" strong="l:H3068" x-morph="He,R:Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w וְ⁠הַ⁠כֹּ֣הֲנִ֔ים|lemma="כֹּהֵן" strong="c:d:H3548" x-morph="He,C:Td:Ncmpa" x-tw="rc://*/tw/dict/bible/kt/priest"\w* \w מַחְצְרִ֖ים|lemma="חָצַר" strong="H2690" x-morph="He,Vprmpa"\w* -\f + \ft K \w מחצצרים|lemma="חצצר" strong="H2690" x-morph="He,Vprmpa"\w*\f* +\f + \ft K \+w מחצצרים|lemma="חצצר" strong="H2690" x-morph="He,Vprmpa"\+w*\f* \w בַּ⁠חֲצֹצְרֽוֹת|lemma="חֲצֹצְרָה" strong="b:H2689" x-morph="He,R:Ncfpa" x-tw="rc://*/tw/dict/bible/other/trumpet"\w*׃ \v 15 @@ -4482,7 +4482,7 @@ \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w יְשָׁנָ֖ה|lemma="יְשָׁנָה" strong="H3466" x-morph="He,Np"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w בְּנוֹתֶ֑י⁠הָ|lemma="בַּת" strong="H1323" x-morph="He,Ncfpc:Sp3fs"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w עפרון|lemma="עֶפְרוֹן" strong="H6085" x-morph="He,Np"\w* -\f + \ft Q \w עֶפְרַ֖יִן|lemma="עֶפְרוֹן" strong="H6085" x-morph="He,Np"\w*\f* +\f + \ft Q \+w עֶפְרַ֖יִן|lemma="עֶפְרוֹן" strong="H6085" x-morph="He,Np"\+w*\f* \w וּ⁠בְנֹתֶֽי⁠הָ|lemma="בַּת" strong="c:H1323" x-morph="He,C:Ncfpc:Sp3fs"\w*׃ \v 20 @@ -5372,7 +5372,7 @@ \w וּ⁠זְבַדְיָ֡הוּ|lemma="זְבַדְיָה" strong="c:H2069" x-morph="He,C:Np"\w* \w וַ⁠עֲשָׂהאֵ֡ל|lemma="עֲשָׂהאֵל" strong="c:H6214" x-morph="He,C:Np"\w* \w וּשְׁמִֽירָמ֡וֹת|lemma="שְׁמִירָמוֹת" strong="c:H8070" x-morph="He,C:Np"\w* -\f + \ft K \w ו⁠שמרימות|lemma="שְׁמִירָמוֹת" strong="c:H8070" x-morph="He,C:Np"\w*\f* +\f + \ft K \+w ו⁠שמרימות|lemma="שְׁמִירָמוֹת" strong="c:H8070" x-morph="He,C:Np"\+w*\f* \w וִֽ⁠יהוֹנָתָן֩|lemma="יְהוֹנָתָן" strong="c:H3083" x-morph="He,C:Np"\w* \w וַ⁠אֲדֹ֨נִיָּ֧הוּ|lemma="אֲדֹנִיָּה" strong="c:H0138" x-morph="He,C:Np"\w* \w וְ⁠טֽוֹבִיָּ֛הוּ|lemma="טוֹבִיָּה" strong="c:H2900" x-morph="He,C:Np"\w* @@ -5657,7 +5657,7 @@ \w וַ⁠יֹּ֕אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* \w מַהֵ֖ר|lemma="מָהַר" strong="H4116a" x-morph="He,Vpv2ms"\w* \w מִיכָ֥יְהוּ|lemma="מִיכָה" strong="H4321" x-morph="He,Np"\w* -\f + \ft K \w מיכהו|lemma="מִיכָה" strong="H4318" x-morph="He,Np"\w*\f* +\f + \ft K \+w מיכהו|lemma="מִיכָה" strong="H4318" x-morph="He,Np"\+w*\f* \w בֶן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w יִמְלָֽא|lemma="יִמְלָא" strong="H3229" x-morph="He,Np"\w*׃ \v 9 @@ -6046,7 +6046,7 @@ \w לָֽ⁠רַכָּ֗ב|lemma="רַכָּב" strong="l:H7395" x-morph="He,Rd:Ncmsa"\w* \w הֲפֹ֧ךְ|lemma="הָפַךְ" strong="H2015" x-morph="He,Vqv2ms"\w* \w יָדְךָ֛|lemma="יָד" strong="H3027" x-morph="He,Ncbsc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/hand"\w* -\f + \ft K \w ידי⁠ך|lemma="יָד" strong="H3027" x-morph="He,Ncbdc:Sp2ms"\w*\f* +\f + \ft K \+w ידי⁠ך|lemma="יָד" strong="H3027" x-morph="He,Ncbdc:Sp2ms"\+w*\f* \w וְ⁠הוֹצֵאתַ֥⁠נִי|lemma="יָצָא" strong="c:H3318" x-morph="He,C:Vhq2ms:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/command"\w* \w מִן|lemma="מִן" strong="H4480a" x-morph="He,R"\w*־\w הַֽ⁠מַּחֲנֶ֖ה|lemma="מַחֲנֶה" strong="d:H4264" x-morph="He,Td:Ncbsa"\w* \w כִּ֥י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* @@ -8142,7 +8142,7 @@ \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w עָזְב֣וּ|lemma="עָזַב" strong="H5800a" x-morph="He,Vqp3cp" x-tw="rc://*/tw/dict/bible/other/forsaken"\w* \w אֹת⁠וֹ֮|lemma="אֵת" strong="H0853" x-morph="He,To:Sp3ms"\w* \w ב⁠מחליים|lemma="מַחְלֻי" strong="b:H4251" x-morph="He,R:Ncmpa"\w* -\f + \ft Q \w בְּמַחֲלוּיִ֣ם|lemma="מַחְלֻי" strong="b:H4251" x-morph="He,R:Ncmpa"\w*\f* +\f + \ft Q \+w בְּמַחֲלוּיִ֣ם|lemma="מַחְלֻי" strong="b:H4251" x-morph="He,R:Ncmpa"\+w*\f* \w רַבִּים֒|lemma="רַב" strong="H7227a" x-morph="He,Aampa"\w* \w הִתְקַשְּׁר֨וּ|lemma="קָשַׁר" strong="H7194" x-morph="He,Vtp3cp"\w* \w עָלָ֜י⁠ו|lemma="עַל" strong="H5921a" x-morph="He,R:Sp3ms"\w* @@ -8176,7 +8176,7 @@ \v 27 \w וּ⁠בָנָ֞י⁠ו|lemma="בֵּן" strong="c:H1121a" x-morph="He,C:Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w ו⁠רב|lemma="רֹב" strong="c:H7230" x-morph="He,C:Ncbsc"\w* -\f + \ft Q \w יִ֧רֶ֞ב|lemma="רֹב" strong="c:H7235" x-morph="He,C:Vqj3ms"\w*\f* +\f + \ft Q \+w יִ֧רֶ֞ב|lemma="רֹב" strong="c:H7235" x-morph="He,C:Vqj3ms"\+w*\f* \w הַ⁠מַּשָּׂ֣א|lemma="מַשָּׂא" strong="d:H4853b" x-morph="He,Td:Ncmsa"\w* \w עָלָ֗י⁠ו|lemma="עַל" strong="H5921a" x-morph="He,R:Sp3ms"\w* \w וִ⁠יסוֹד֙|lemma="יְסוֹד" strong="c:H3247" x-morph="He,C:Vqc"\w* @@ -8494,7 +8494,7 @@ \w יִשְׂרָאֵ֖ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w לֵ⁠אמֹ֑ר|lemma="אָמַר" strong="l:H0559" x-morph="He,R:Vqc"\w* \w לך|lemma="הָלַךְ" strong="H1980" x-morph="He,Vqv2ms"\w* -\f + \ft Q \w לך|lemma="הָלַךְ" strong="H1980" x-morph="He,Vqv2ms:Sh"\w*\f* +\f + \ft Q \+w לך|lemma="הָלַךְ" strong="H1980" x-morph="He,Vqv2ms:Sh"\+w*\f* \w נִתְרָאֶ֥ה|lemma="רָאָה" strong="H7200" x-morph="He,Vth1cp"\w* \w פָנִֽים|lemma="פָּנִים" strong="H6440" x-morph="He,Ncbpa" x-tw="rc://*/tw/dict/bible/other/face"\w*׃ @@ -8721,7 +8721,7 @@ \w וְ⁠שֵׁ֣ם|lemma="שֵׁם" strong="c:H8034" x-morph="He,C:Ncmsc"\w* \w אִמּ֔⁠וֹ|lemma="אֵם" strong="H0517" x-morph="He,Ncfsc:Sp3ms"\w* \w יְכָלְיָ֖ה|lemma="יְכׇלְיָה" strong="H3203" x-morph="He,Np"\w* -\f + \ft K \w יכיליה|lemma="יְכׇלְיָה" strong="H3203" x-morph="He,Np"\w*\f* +\f + \ft K \+w יכיליה|lemma="יְכׇלְיָה" strong="H3203" x-morph="He,Np"\+w*\f* \w מִן|lemma="מִן" strong="H4480a" x-morph="He,R"\w*־\w יְרוּשָׁלִָֽם|lemma="יְרוּשָׁלִַ͏ם" strong="H3389" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jerusalem"\w*׃ \v 4 @@ -8772,7 +8772,7 @@ \w הָֽ⁠אֱלֹהִ֜ים|lemma="אֱלֹהִים" strong="d:H0430" x-morph="He,Td:Ncmpa" x-tw="rc://*/tw/dict/bible/kt/god"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w פְּלִשְׁתִּ֧ים|lemma="פְּלִשְׁתִּי" strong="H6430" x-morph="He,Ngmpa" x-tw="rc://*/tw/dict/bible/names/philistines"\w* \w וְ⁠עַל|lemma="עַל" strong="c:H5921a" x-morph="He,C:R"\w*־\w ה⁠ערביים|lemma="עֲרָבִי" strong="d:H6163" x-morph="He,Td:Ngmpa"\w* -\f + \ft Q \w הָֽעַרְבִ֛ים|lemma="עֲרָבִי" strong="d:H6163" x-morph="He,Td:Ngmpa"\w*\f* +\f + \ft Q \+w הָֽעַרְבִ֛ים|lemma="עֲרָבִי" strong="d:H6163" x-morph="He,Td:Ngmpa"\+w*\f* \w הַ⁠יֹּשְׁבִ֥ים|lemma="יָשַׁב" strong="d:H3427" x-morph="He,Td:Vqrmpa"\w* \w בְּ⁠גוּר|lemma="גּוּר־בַּעַל" strong="b:H1485" x-morph="He,R:Np"\w*־\w בָּ֖עַל|lemma="גּוּר־בַּעַל" strong="H1485" x-morph="He,Np"\w* \w וְ⁠הַ⁠מְּעוּנִֽים|lemma="מְעוּנִי" strong="c:d:H4586" x-morph="He,C:Td:Ngmpa"\w*׃ @@ -8836,7 +8836,7 @@ \w פְּקֻדָּתָ֔⁠ם|lemma="פְּקֻדָּה" strong="H6486" x-morph="He,Ncfsc:Sp3mp"\w* \w בְּ⁠יַד֙|lemma="יָד" strong="b:H3027" x-morph="He,R:Ncbsc" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w יְעִיאֵ֣ל|lemma="יְעִיאֵל" strong="H3273" x-morph="He,Np"\w* -\f + \ft K \w יעואל|lemma="יְעִיאֵל" strong="H3273" x-morph="He,Np"\w*\f* +\f + \ft K \+w יעואל|lemma="יְעִיאֵל" strong="H3273" x-morph="He,Np"\+w*\f* \w הַ⁠סּוֹפֵ֔ר|lemma="סָפַר" strong="d:H5608b" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/kt/scribe"\w* \w וּ⁠מַעֲשֵׂיָ֖הוּ|lemma="מַעֲשֵׂיָה" strong="c:H4641" x-morph="He,C:Np"\w* \w הַ⁠שּׁוֹטֵ֑ר|lemma="שֹׁטֵר" strong="d:H7860" x-morph="He,Td:Vqrmsa"\w* @@ -9007,7 +9007,7 @@ \w וַ⁠יֵּ֜שֶׁב|lemma="יָשַׁב" strong="c:H3427" x-morph="He,C:Vqw3ms"\w* \w בֵּ֤ית|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w* \w הַֽחָפְשִׁית֙|lemma="חָפְשִׁית" strong="d:H2669" x-morph="He,Td:Ncfsa"\w* -\f + \ft K \w ה⁠חפשות|lemma="חָפְשִׁית" strong="d:H2669" x-morph="He,Td:Ncfsa"\w*\f* +\f + \ft K \+w ה⁠חפשות|lemma="חָפְשִׁית" strong="d:H2669" x-morph="He,Td:Ncfsa"\+w*\f* \w מְצֹרָ֔ע|lemma="צָרַע" strong="H6879" x-morph="He,VPsmsa"\w* \w כִּ֥י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* \w נִגְזַ֖ר|lemma="גָּזַר" strong="H1504" x-morph="He,VNp3ms" x-tw="rc://*/tw/dict/bible/other/decree"\w* @@ -9713,7 +9713,7 @@ \w וִ⁠ירוּשָׁלִָ֑ם|lemma="יְרוּשָׁלִַ͏ם" strong="c:H3389" x-morph="He,C:Np" x-tw="rc://*/tw/dict/bible/names/jerusalem"\w* \w וַ⁠יִּתְּנֵ֤⁠ם|lemma="נָתַן" strong="c:H5414" x-morph="He,C:Vqw3ms:Sp3mp"\w* \w ל⁠זועה|lemma="זְוָעָה" strong="l:H2113" x-morph="He,R:Ncfsa"\w* -\f + \ft Q \w לְזַֽעֲוָה֙|lemma="זַעֲוָה" strong="l:H2189" x-morph="He,R:Ncfsa"\w*\f* +\f + \ft Q \+w לְזַֽעֲוָה֙|lemma="זַעֲוָה" strong="l:H2189" x-morph="He,R:Ncfsa"\+w*\f* \w לְ⁠שַׁמָּ֣ה|lemma="שַׁמָּה" strong="l:H8047" x-morph="He,R:Ncfsa"\w* \w וְ⁠לִ⁠שְׁרֵקָ֔ה|lemma="שְׁרֵקָה" strong="c:l:H8322" x-morph="He,C:R:Ncfsa"\w* \w כַּ⁠אֲשֶׁ֛ר|lemma="אֲשֶׁר" strong="k:H0834d" x-morph="He,R:Tr"\w* @@ -9786,7 +9786,7 @@ \w אֱלִ֣יצָפָ֔ן|lemma="אֱלִיצָפָן" strong="H0469" x-morph="He,Np"\w* \w שִׁמְרִ֖י|lemma="שִׁמְרִי" strong="H8113" x-morph="He,Np"\w* \w וִיעִיאֵ֑ל|lemma="יְעִיאֵל" strong="c:H3273" x-morph="He,C:Np"\w* -\f + \ft K \w ו⁠יעואל|lemma="יְעִיאֵל" strong="c:H3273" x-morph="He,C:Np"\w*\f* +\f + \ft K \+w ו⁠יעואל|lemma="יְעִיאֵל" strong="c:H3273" x-morph="He,C:Np"\+w*\f* \w וּ⁠מִן|lemma="מִן" strong="c:H4480a" x-morph="He,C:R"\w*־\w בְּנֵ֣י|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w אָסָ֔ף|lemma="אָסָף" strong="H0623" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/asaph"\w* \w זְכַרְיָ֖הוּ|lemma="זְכַרְיָה" strong="H2148a" x-morph="He,Np"\w* @@ -9796,7 +9796,7 @@ \w וּ⁠מִן|lemma="מִן" strong="c:H4480a" x-morph="He,C:R"\w*־\w בְּנֵ֥י|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w הֵימָ֖ן|lemma="הֵימָן" strong="H1968" x-morph="He,Np"\w* \w יְחִיאֵ֣ל|lemma="יְחִיאֵל" strong="H3171" x-morph="He,Np"\w* -\f + \ft K \w יחואל|lemma="יְחִיאֵל" strong="H3171" x-morph="He,Np"\w*\f* +\f + \ft K \+w יחואל|lemma="יְחִיאֵל" strong="H3171" x-morph="He,Np"\+w*\f* \w וְ⁠שִׁמְעִ֑י|lemma="שִׁמְעִי" strong="c:H8096" x-morph="He,C:Np"\w* ס \w וּ⁠מִן|lemma="מִן" strong="c:H4480a" x-morph="He,C:R"\w*־\w בְּנֵ֣י|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w יְדוּת֔וּן|lemma="יְדוּתוּן" strong="H3038" x-morph="He,Np"\w* @@ -10022,7 +10022,7 @@ \w מְשׁוֹרֵ֔ר|lemma="שִׁיר" strong="H7891" x-morph="He,Vormsa"\w* \w וְ⁠הַ⁠חֲצֹצְר֖וֹת|lemma="חֲצֹצְרָה" strong="c:d:H2689" x-morph="He,C:Td:Ncfpa"\w* \w מַחְצְרִ֑ים|lemma="חָצַר" strong="H2690" x-morph="He,Vprmpa"\w* -\f + \ft Q \w מחצצרים|lemma="חצצר" strong="H2690" x-morph="He,Vprmpa"\w*\f* +\f + \ft Q \+w מחצצרים|lemma="חצצר" strong="H2690" x-morph="He,Vprmpa"\+w*\f* \w הַ⁠כֹּ֕ל|lemma="כֹּל" strong="d:H3605" x-morph="He,Td:Ncmsa"\w* \w עַ֖ד|lemma="עַד" strong="H5704" x-morph="He,R"\w* \w לִ⁠כְל֥וֹת|lemma="כָּלָה" strong="l:H3615" x-morph="He,R:Vqc" x-tw="rc://*/tw/dict/bible/kt/fulfill"\w* @@ -10775,7 +10775,7 @@ \w וַ⁠עֲלֵי⁠הֶ֤ם|lemma="עַל" strong="c:H5921a" x-morph="He,C:R:Sp3mp"\w* \w נָגִיד֙|lemma="נָגִיד" strong="H5057" x-morph="He,Ncmsa"\w* \w כונניהו|lemma="כּוֹנַנְיָהוּ" strong="H3562" x-morph="He,Np"\w* -\f + \ft Q \w כָּֽנַנְיָ֣הוּ|lemma="כּוֹנַנְיָהוּ" strong="H3562" x-morph="He,Np"\w*\f* +\f + \ft Q \+w כָּֽנַנְיָ֣הוּ|lemma="כּוֹנַנְיָהוּ" strong="H3562" x-morph="He,Np"\+w*\f* \w הַ⁠לֵּוִ֔י|lemma="לֵוִיִּי" strong="d:H3881" x-morph="He,Td:Ngmsa" x-tw="rc://*/tw/dict/bible/names/levite"\w* \w וְ⁠שִׁמְעִ֥י|lemma="שִׁמְעִי" strong="c:H8096" x-morph="He,C:Np"\w* \w אָחִ֖י⁠הוּ|lemma="אָח" strong="H0251" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/brother"\w* @@ -10795,7 +10795,7 @@ \w פְּקִידִ֗ים|lemma="פָּקִיד" strong="H6496" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/other/overseer"\w* \w מִ⁠יַּ֤ד|lemma="יָד" strong="m:H3027" x-morph="He,R:Ncbsc" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w כונניהו|lemma="כּוֹנַנְיָהוּ" strong="H3562" x-morph="He,Np"\w* -\f + \ft Q \w כָּֽנַנְיָ֙הוּ֙|lemma="כּוֹנַנְיָהוּ" strong="H3562" x-morph="He,Np"\w*\f* +\f + \ft Q \+w כָּֽנַנְיָ֙הוּ֙|lemma="כּוֹנַנְיָהוּ" strong="H3562" x-morph="He,Np"\+w*\f* \w וְ⁠שִׁמְעִ֣י|lemma="שִׁמְעִי" strong="c:H8096" x-morph="He,C:Np"\w* \w אָחִ֔י⁠ו|lemma="אָח" strong="H0251" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/brother"\w* \w בְּ⁠מִפְקַד֙|lemma="מִפְקָד" strong="b:H4662" x-morph="He,R:Ncmsc"\w* @@ -11271,7 +11271,7 @@ \w בֵּ֣ית|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w* \w אֱלֹהָ֔י⁠ו|lemma="אֱלֹהִים" strong="H0430" x-morph="He,Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/god"\w* \w וּמִֽיצִיאֵ֣י|lemma="יָצִיא" strong="c:m:H3329" x-morph="He,C:R:Ncmsc"\w* -\f + \ft K \w ו⁠מ⁠יציא⁠ו|lemma="יָצִיא" strong="c:m:H3329" x-morph="He,C:R:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠מ⁠יציא⁠ו|lemma="יָצִיא" strong="c:m:H3329" x-morph="He,C:R:Ncmsc:Sp3ms"\+w*\f* \w מֵעָ֔י⁠ו|lemma="מֵעֶה" strong="H4578" x-morph="He,Ncmpc:Sp3ms"\w* \w שָׁ֖ם|lemma="שָׁם" strong="H8033" x-morph="He,D"\w* \w הִפִּילֻ֥⁠הוּ|lemma="נָפַל" strong="H5307" x-morph="He,Vhp3cp:Sp3ms"\w* @@ -11711,7 +11711,7 @@ \v 16 \w ו⁠יכן|lemma="כּוּן" strong="c:H2559a" x-morph="He,C:Vhw3ms"\w* -\f + \ft Q \w וַיִּ֙בֶן֙|lemma="בָּנָה" strong="c:H1129" x-morph="He,C:Vqw3ms"\w*\f* +\f + \ft Q \+w וַיִּ֙בֶן֙|lemma="בָּנָה" strong="c:H1129" x-morph="He,C:Vqw3ms"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w מִזְבַּ֣ח|lemma="מִזְבֵּחַ" strong="H4196" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/altar"\w* \w יְהוָ֔ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w וַ⁠יִּזְבַּ֣ח|lemma="זָבַח" strong="c:H2076" x-morph="He,C:Vqw3ms"\w* @@ -11927,7 +11927,7 @@ \w כֹּֽהֲנִ֔ים|lemma="כֹּהֵן" strong="H3548" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/kt/priest"\w* \w שָׂרַ֖ף|lemma="שָׂרַף" strong="H8313" x-morph="He,Vqp3ms"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w מִזְבְּחוֹתָ֑ם|lemma="מִזְבֵּחַ" strong="H4196" x-morph="He,Ncmpa:Sp3mp" x-tw="rc://*/tw/dict/bible/kt/altar"\w* -\f + \ft K \w מזבחותים|lemma="מִזְבֵּחַ" strong="H4196" x-morph="He,Ncmpa"\w*\f* +\f + \ft K \+w מזבחותים|lemma="מִזְבֵּחַ" strong="H4196" x-morph="He,Ncmpa"\+w*\f* \w וַ⁠יְטַהֵ֥ר|lemma="טָהֵר" strong="c:H2891" x-morph="He,C:Vpw3ms" x-tw="rc://*/tw/dict/bible/kt/purify"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w יְהוּדָ֖ה|lemma="יְהוּדָה" strong="H3063" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/judea"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w יְרוּשָׁלִָֽם|lemma="יְרוּשָׁלִַ͏ם" strong="H3389" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jerusalem"\w*׃ @@ -12000,7 +12000,7 @@ \w וּ⁠מִ⁠כָּל|lemma="כֹּל" strong="c:m:H3605" x-morph="He,C:R:Ncmsc"\w*־\w יְהוּדָ֖ה|lemma="יְהוּדָה" strong="H3063" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/judea"\w* \w וּ⁠בִנְיָמִ֑ן|lemma="בִּנְיָמִין" strong="c:H1144" x-morph="He,C:Np" x-tw="rc://*/tw/dict/bible/names/benjamin"\w* \w ו⁠ישבי|lemma="יָשַׁב" strong="c:H3427" x-morph="He,C:Vqrmpc"\w* -\f + \ft Q \w וַיָּשֻׁ֖בוּ|lemma="שׁוּב" strong="c:H7725" x-morph="He,C:Vqw3mp"\w*\f* +\f + \ft Q \+w וַיָּשֻׁ֖בוּ|lemma="שׁוּב" strong="c:H7725" x-morph="He,C:Vqw3mp"\+w*\f* \w יְרֽוּשָׁלִָֽם|lemma="יְרוּשָׁלִַ͏ם" strong="H3389" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jerusalem"\w*׃ \v 10 @@ -12212,7 +12212,7 @@ \w אֵ֣שֶׁת|lemma="אִשָּׁה" strong="H0802" x-morph="He,Ncfsc"\w* ׀ \w שַׁלֻּ֣ם|lemma="שַׁלּוּם" strong="H7967" x-morph="He,Np"\w* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w תוקהת|lemma="תּוֹקַהַת" strong="H8445" x-morph="He,Np"\w* -\f + \ft Q \w תָּקְהַ֗ת|lemma="תּוֹקַהַת" strong="H8445" x-morph="He,Np"\w*\f* +\f + \ft Q \+w תָּקְהַ֗ת|lemma="תּוֹקַהַת" strong="H8445" x-morph="He,Np"\+w*\f* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w חַסְרָה֙|lemma="חַסְרָה" strong="H2641" x-morph="He,Np"\w* \w שׁוֹמֵ֣ר|lemma="שָׁמַר" strong="H8104" x-morph="He,Vqrmsc" x-tw="rc://*/tw/dict/bible/other/watch"\w* \w הַ⁠בְּגָדִ֔ים|lemma="בֶּגֶד" strong="d:H0899b" x-morph="He,Td:Ncmpa"\w* @@ -12262,7 +12262,7 @@ \w אֲשֶׁ֣ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w עֲזָב֗וּ⁠נִי|lemma="עָזַב" strong="H5800a" x-morph="He,Vqp3cp:Sp1cs" x-tw="rc://*/tw/dict/bible/other/forsaken"\w* \w ו⁠יקטירו|lemma="קָטַר" strong="c:H6999a" x-morph="He,C:Vhw3mp"\w* -\f + \ft Q \w וַֽיְקַטְּרוּ֙|lemma="קָטַר" strong="c:H6999a" x-morph="He,C:Vpw3mp"\w*\f* +\f + \ft Q \+w וַֽיְקַטְּרוּ֙|lemma="קָטַר" strong="c:H6999a" x-morph="He,C:Vpw3mp"\+w*\f* \w לֵֽ⁠אלֹהִ֣ים|lemma="אֱלֹהִים" strong="l:H0430" x-morph="He,R:Ncmpa" x-tw="rc://*/tw/dict/bible/kt/god"\w* \w אֲחֵרִ֔ים|lemma="אַחֵר" strong="H0312" x-morph="He,Aampa"\w* \w לְמַ֨עַן֙|lemma="מַעַן" strong="H4616" x-morph="He,R"\w* @@ -12457,7 +12457,7 @@ \w וַ⁠יֹּ֣אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* \w לַ֠⁠לְוִיִּם|lemma="לֵוִיִּי" strong="l:H3881" x-morph="He,Rd:Ngmpa" x-tw="rc://*/tw/dict/bible/names/levite"\w* \w הַמְּבִינִ֨ים|lemma="בִּין" strong="d:H0995" x-morph="He,Td:Vhrmpa" x-tw="rc://*/tw/dict/bible/other/teach"\w* -\f + \ft K \w ה⁠מבונים|lemma="בִּין" strong="d:H0995" x-morph="He,Td:Vhrmpa"\w*\f* +\f + \ft K \+w ה⁠מבונים|lemma="בִּין" strong="d:H0995" x-morph="He,Td:Vhrmpa"\+w*\f* \w לְ⁠כָל|lemma="כֹּל" strong="l:H3605" x-morph="He,R:Ncmsc"\w*־\w יִשְׂרָאֵ֜ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w הַ⁠קְּדוֹשִׁ֣ים|lemma="קָדוֹשׁ" strong="d:H6918" x-morph="He,Td:Aampa"\w* \w לַ⁠יהוָ֗ה|lemma="יְהֹוָה" strong="l:H3068" x-morph="He,R:Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* @@ -12483,7 +12483,7 @@ \v 4 \w והכונו|lemma="כּוּן" strong="c:H3559a" x-morph="He,C:VNv2mp"\w* -\f + \ft Q \w וְ⁠הָכִ֥ונוּ|lemma="כּוּן" strong="c:H3559a" x-morph="He,C:Vhv2mp"\w*\f* +\f + \ft Q \+w וְ⁠הָכִ֥ונוּ|lemma="כּוּן" strong="c:H3559a" x-morph="He,C:Vhv2mp"\+w*\f* \w לְ⁠בֵית|lemma="בַּיִת" strong="l:H1004b" x-morph="He,R:Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w*־\w אֲבוֹתֵי⁠כֶ֖ם|lemma="אָב" strong="H0001" x-morph="He,Ncmpc:Sp2mp" x-tw="rc://*/tw/dict/bible/other/father"\w* \w כְּ⁠מַחְלְקוֹתֵי⁠כֶ֑ם|lemma="מַחֲלֹקֶת" strong="k:H4256" x-morph="He,R:Ncfpc:Sp2mp"\w* \w בִּ⁠כְתָ֗ב|lemma="כָּתָב" strong="b:H3791" x-morph="He,R:Ncmsc"\w* @@ -12563,7 +12563,7 @@ \v 9 \w ו⁠כונניהו|lemma="כּוֹנַנְיָהוּ" strong="c:H3562" x-morph="He,C:Np"\w* -\f + \ft Q \w וְ֠כָֽנַנְיָהוּ|lemma="כּוֹנַנְיָהוּ" strong="c:H3562" x-morph="He,C:Np"\w*\f* +\f + \ft Q \+w וְ֠כָֽנַנְיָהוּ|lemma="כּוֹנַנְיָהוּ" strong="c:H3562" x-morph="He,C:Np"\+w*\f* \w וּ⁠שְׁמַֽעְיָ֨הוּ|lemma="שְׁמַעְיָה" strong="c:H8098" x-morph="He,C:Np"\w* \w וּ⁠נְתַנְאֵ֜ל|lemma="נְתַנְאֵל" strong="c:H5417" x-morph="He,C:Np"\w* \w אֶחָ֗י⁠ו|lemma="אָח" strong="H0251" x-morph="He,Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/brother"\w* @@ -13056,7 +13056,7 @@ \w וְ⁠הָ⁠עָם֙|lemma="עַם" strong="c:d:H5971a" x-morph="He,C:Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* \w הִרְבּ֣וּ|lemma="רָבָה" strong="H7235a" x-morph="He,Vhp3cp"\w* \w למעול|lemma="מָעַל" strong="l:H4603" x-morph="He,R:Vqc"\w*־\w מַ֔עַל|lemma="מָעַל" strong="H4603" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/kt/faithful"\w* -\f + \ft Q \w לִמְעָל|lemma="מָעַל" strong="l:H4603" x-morph="He,R:Vqc"\w*\f* +\f + \ft Q \+w לִמְעָל|lemma="מָעַל" strong="l:H4603" x-morph="He,R:Vqc"\+w*\f* \w כְּ⁠כֹ֖ל|lemma="כֹּל" strong="k:H3605" x-morph="He,R:Ncmsc"\w* \w תֹּעֲב֣וֹת|lemma="תּוֹעֵבַה" strong="H8441" x-morph="He,Ncfpc"\w* \w הַ⁠גּוֹיִ֑ם|lemma="גּוֹי" strong="d:H1471a" x-morph="He,Td:Ncmpa" x-tw="rc://*/tw/dict/bible/other/nation"\w* @@ -13102,7 +13102,7 @@ \w עֲלֵי⁠הֶ֜ם|lemma="עַל" strong="H5921a" x-morph="He,R:Sp3mp"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w מֶ֣לֶךְ|lemma="מֶלֶךְ" strong="H4428" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/king"\w* \w כשדיים|lemma="כַּשְׂדִּי" strong="H3778" x-morph="He,Ngmpa" x-tw="rc://*/tw/dict/bible/names/chaldeans"\w* -\f + \ft Q \w כַּשְׂדִּ֗ים|lemma="כַּשְׂדִּי" strong="H3778" x-morph="He,Ngmpa"\w*\f* +\f + \ft Q \+w כַּשְׂדִּ֗ים|lemma="כַּשְׂדִּי" strong="H3778" x-morph="He,Ngmpa"\+w*\f* \w וַ⁠יַּהֲרֹ֨ג|lemma="הָרַג" strong="c:H2026" x-morph="He,C:Vqw3ms"\w* \w בַּחוּרֵי⁠הֶ֤ם|lemma="בָּחוּר" strong="H0970" x-morph="He,Ncmpc:Sp3mp"\w* \w בַּ⁠חֶ֨רֶב֙|lemma="חֶרֶב" strong="b:H2719" x-morph="He,Rd:Ncfsa" x-tw="rc://*/tw/dict/bible/other/sword"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/15-EZR.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/15-EZR.usfm index 5aab04eb..a806d637 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/15-EZR.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/15-EZR.usfm @@ -209,7 +209,7 @@ \w אֲשֶׁ֥ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w הֶגְלָ֛ה|lemma="גָּלָה" strong="H1540" x-morph="He,Vhp3ms" x-tw="rc://*/tw/dict/bible/other/exile\w* \w נְבוּכַדְנֶצַּ֥ר|lemma="נְבוּכַדְנֶצַּר" strong="H5020" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/nebuchadnezzar"\w* -\f + \ft K \w נבוכדנצור|lemma="נְבוּכַדְנֶצַּר" strong="H5020" x-morph="He,Np"\w*\f* +\f + \ft K \+w נבוכדנצור|lemma="נְבוּכַדְנֶצַּר" strong="H5020" x-morph="He,Np"\+w*\f* \w מֶֽלֶךְ|lemma="מֶלֶךְ" strong="H4428" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/king"\w*־\w בָּבֶ֖ל|lemma="בָּבֶל" strong="H0894" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/babylon"\w* \w לְ⁠בָבֶ֑ל|lemma="בָּבֶל" strong="l:H0894" x-morph="He,R:Np" x-tw="rc://*/tw/dict/bible/names/babylon"\w* \w וַ⁠יָּשׁ֛וּבוּ|lemma="שׁוּב" strong="c:H7725" x-morph="He,C:Vqw3mp" x-tw="rc://*/tw/dict/bible/other/return\w* @@ -581,7 +581,7 @@ \v 46 \w בְּנֵי|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w חָגָ֥ב|lemma="חָגָב" strong="H2285" x-morph="He,Np"\w* \w בְּנֵי|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w שַׁלְמַ֖י|lemma="שַׂלְמַי" strong="H8014" x-morph="He,Np"\w* -\f + \ft K \w שמלי|lemma="שַׁמְלַי" strong="H8073" x-morph="He,Np"\w*\f* +\f + \ft K \+w שמלי|lemma="שַׁמְלַי" strong="H8073" x-morph="He,Np"\+w*\f* \w בְּנֵ֥י|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w חָנָֽן|lemma="חָנָן" strong="H2605" x-morph="He,Np"\w*׃ @@ -606,10 +606,10 @@ \v 50 \w בְּנֵי|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w אַסְנָ֥ה|lemma="אַסְנָה" strong="H0619" x-morph="He,Np"\w* \w בְנֵי|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w מְעוּנִ֖ים|lemma="מְעוּנִי" strong="H4586" x-morph="He,Ngmpa"\w* -\f + \ft K \w מעינים|lemma="מְעוּנִי" strong="H4586" x-morph="He,Ngmpa"\w*\f* +\f + \ft K \+w מעינים|lemma="מְעוּנִי" strong="H4586" x-morph="He,Ngmpa"\+w*\f* \w בְּנֵ֥י|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w נפיסים|lemma="נְפִיסִים" strong="H5304" x-morph="He,Ngmpa"\w*׃ -\f + \ft Q \w נְפוּסִֽים|lemma="נְפִיסִים" strong="H5304" x-morph="He,Ngmpa"\w*\f* +\f + \ft Q \+w נְפוּסִֽים|lemma="נְפִיסִים" strong="H5304" x-morph="He,Ngmpa"\+w*\f* \v 51 \w בְּנֵי|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w בַקְבּ֥וּק|lemma="בַּקְבּוּק" strong="H1227" x-morph="He,Np"\w* @@ -882,7 +882,7 @@ \w מֵ⁠עַמֵּ֖י|lemma="עַם" strong="m:H5971a" x-morph="He,R:Ncmpc" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* \w הָ⁠אֲרָצ֑וֹת|lemma="אֶרֶץ" strong="d:H0776" x-morph="He,Td:Ncbpa"\w* \w וַיַּעֲל֨וּ|lemma="עָלָה" strong="c:H5927" x-morph="He,C:Vhw3mp"\w* -\f + \ft K \w ו⁠יעל|lemma="עָלָה" strong="c:H5927" x-morph="He,C:Vhw3ms"\w*\f* +\f + \ft K \+w ו⁠יעל|lemma="עָלָה" strong="c:H5927" x-morph="He,C:Vhw3ms"\+w*\f* \w עָלָ֤י⁠ו|lemma="עַל" strong="H5921a" x-morph="He,R:Sp3ms"\w* \w עֹלוֹת֙|lemma="עֹלָה" strong="H5930a" x-morph="He,Ncfpa" x-tw="rc://*/tw/dict/bible/other/burntoffering"\w* \w לַֽ⁠יהוָ֔ה|lemma="יְהֹוָה" strong="l:H3068" x-morph="He,R:Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* @@ -1117,7 +1117,7 @@ \w נִדְר֖וֹשׁ|lemma="דָּרַשׁ" strong="H1875" x-morph="He,Vqi1cp" x-tw="rc://*/tw/dict/bible/other/seek"\w* \w לֵֽ⁠אלֹהֵי⁠כֶ֑ם|lemma="אֱלֹהִים" strong="l:H0430" x-morph="He,R:Ncmpc:Sp2mp" x-tw="rc://*/tw/dict/bible/kt/god"\w* \w וְל֣וֹ|lemma="" strong="c:l" x-morph="He,C:R:Sp3ms"\w* ׀ -\f + \ft K \w ו⁠לא|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w*\f* +\f + \ft K \+w ו⁠לא|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\+w*\f* \w אֲנַ֣חְנוּ|lemma="אֲנַחְנוּ" strong="H0587" x-morph="He,Pp1cp"\w* \w זֹבְחִ֗ים|lemma="זָבַח" strong="H2076" x-morph="He,Vqrmpa" x-tw="rc://*/tw/dict/bible/other/sacrifice"\w* \w מִ⁠ימֵי֙|lemma="יוֹם" strong="m:H3117" x-morph="He,R:Ncmpc"\w* @@ -1163,7 +1163,7 @@ \w יְדֵ֣י|lemma="יָד" strong="H3027" x-morph="He,Ncbdc" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w עַם|lemma="עַם" strong="H5971a" x-morph="He,Ncmsc"\w*־\w יְהוּדָ֑ה|lemma="יְהוּדָה" strong="H3063" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/judea"\w* \w וּֽמְבַהֲלִ֥ים|lemma="בָּלַהּ" strong="c:H0926" x-morph="He,C:Vprmpa"\w* -\f + \ft K \w ו⁠מבלהים|lemma="בָּלַהּ" strong="c:H1089" x-morph="He,C:Vprmpa"\w*\f* +\f + \ft K \+w ו⁠מבלהים|lemma="בָּלַהּ" strong="c:H1089" x-morph="He,C:Vprmpa"\+w*\f* \w אוֹתָ֖⁠ם|lemma="אֵת" strong="H0853" x-morph="He,To:Sp3mp"\w* \w לִ⁠בְנֽוֹת|lemma="בָּנָה" strong="l:H1129" x-morph="He,R:Vqc"\w*׃ @@ -1201,9 +1201,9 @@ \w טָֽבְאֵל֙|lemma="טָבְאֵל" strong="H2870a" x-morph="He,Np"\w* \w וּ⁠שְׁאָ֣ר|lemma="שְׁאָר" strong="c:H7605" x-morph="He,C:Ncmsc"\w* \w כנותו|lemma="כְּנָת" strong="H3674" x-morph="He,Ncmpc:Pp3ms"\w* -\f + \ft Q \w כְּנָוֹתָ֔יו|lemma="כְּנָת" strong="H3674" x-morph="He,Ncmpc:Pp3ms"\w*\f* +\f + \ft Q \+w כְּנָוֹתָ֔יו|lemma="כְּנָת" strong="H3674" x-morph="He,Ncmpc:Pp3ms"\+w*\f* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w ארתחששתא|lemma="אַרְתַּחְשַׁשְׁתָּא" strong="H0783a" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/artaxerxes"\w* -\f + \ft Q \w אַרְתַּחְשַׁ֖שְׂתְּ|lemma="אַרְתַּחְשַׁשְׁתָּא" strong="H0783a" x-morph="He,Np"\w*\f* +\f + \ft Q \+w אַרְתַּחְשַׁ֖שְׂתְּ|lemma="אַרְתַּחְשַׁשְׁתָּא" strong="H0783a" x-morph="He,Np"\+w*\f* \w מֶ֣לֶךְ|lemma="מֶלֶךְ" strong="H4428" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/king"\w* \w פָּרָ֑ס|lemma="פָּרַס" strong="H6539" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/persia"\w* \w וּ⁠כְתָב֙|lemma="כָּתָב" strong="c:H3791" x-morph="He,C:Ncmsc"\w* @@ -1239,11 +1239,11 @@ \w טַרְפְּלָיֵ֣⁠א|lemma="טַרְפְּלַי" strong="H2967" x-morph="Ar,Ncmpd:Td" x-tw="rc://*/tw/dict/bible/other/administration"\w* \w אֲפָֽרְסָיֵ֗⁠א|lemma="אֲפָרְסַי" strong="H0670" x-morph="Ar,Ngmpd:Td" x-tw="rc://*/tw/dict/bible/names/persia"\w* \w אַרְכְּוָיֵ֤א|lemma="אַרְכְּוַי" strong="H0756" x-morph="Ar,Ngmpd:Td"\w* -\f + \ft K \w ארכוי|lemma="אַרְכְּוַי" strong="H0756" x-morph="Ar,Ngmpc"\w*\f* +\f + \ft K \+w ארכוי|lemma="אַרְכְּוַי" strong="H0756" x-morph="Ar,Ngmpc"\+w*\f* \w בָבְלָיֵ⁠א֙|lemma="בַּבְלִי" strong="H0896" x-morph="Ar,Ngmpd:Td" x-tw="rc://*/tw/dict/bible/names/babylon"\w* \w שֽׁוּשַׁנְכָיֵ֔⁠א|lemma="שׁוּשַׁנְכִי" strong="H7801" x-morph="Ar,Ngmpd:Td"\w* \w ד⁠הוא|lemma="דִּי" strong="H1768" x-morph="Ar,Tr:Ta"\w* -\f + \ft Q \w ד⁠הוא|lemma="דֵּהָיֵא" strong="H1723" x-morph="Ar,Ngmpd:Td"\w*\f* +\f + \ft Q \+w ד⁠הוא|lemma="דֵּהָיֵא" strong="H1723" x-morph="Ar,Ngmpd:Td"\+w*\f* \w עֵלְמָיֵֽ⁠א|lemma="עַלְמִי" strong="H5962" x-morph="Ar,Ngmpd:Td"\w*׃ \v 10 @@ -1294,9 +1294,9 @@ \w ו⁠באישת⁠א|lemma="בִּאוּשׁ" strong="c:H0873" x-morph="Ar,C:Aafsd:Td" x-tw="rc://*/tw/dict/bible/kt/evil"\w* \w בָּנַ֔יִן|lemma="בְּנָא" strong="H1124" x-morph="Ar,Vqrmpa"\w* \w וְשׁוּרַיָּ֣א|lemma="שׁוּר" strong="c:H7792" x-morph="Ar,C:Ncmpd:Td"\w* -\f + \ft K \w ו⁠שורי|lemma="שׁוּר" strong="c:H7792" x-morph="Ar,C:Ncmpc"\w*\f* +\f + \ft K \+w ו⁠שורי|lemma="שׁוּר" strong="c:H7792" x-morph="Ar,C:Ncmpc"\+w*\f* \w שַׁכְלִ֔ילוּ|lemma="כְּלַל" strong="H3635a" x-morph="Ar,Vep3mp"\w* -\f + \ft K \w אשכללו|lemma="כְּלַל" strong="H3635a" x-morph="Ar,Vvi3mp"\w*\f* +\f + \ft K \+w אשכללו|lemma="כְּלַל" strong="H3635a" x-morph="Ar,Vvi3mp"\+w*\f* \w וְ⁠אֻשַּׁיָּ֖⁠א|lemma="אֹשׁ" strong="c:H0787" x-morph="Ar,C:Ncmpd:Td" x-tw="rc://*/tw/dict/bible/other/foundation"\w* \w יַחִֽיטוּ|lemma="חוּט" strong="H2338" x-morph="Ar,Vai3mp"\w*׃ @@ -1478,7 +1478,7 @@ \w נִשְׁתְּוָנָ⁠א֙|lemma="נִשְׁתְּוָן" strong="H5407" x-morph="Ar,Ncmsd:Td"\w* \w דִּ֚י|lemma="דִּי" strong="H1768" x-morph="Ar,Tr"\w* \w ארתחששתא|lemma="אַרְתַּחְשַׁשְׁתָּא" strong="H0783b" x-morph="Ar,Np" x-tw="rc://*/tw/dict/bible/names/artaxerxes"\w* -\f + \ft Q \w אַרְתַּחְשַׁ֣שְׂתְּ|lemma="אַרְתַּחְשַׁשְׁתָּא" strong="H0783b"\w*\f* +\f + \ft Q \+w אַרְתַּחְשַׁ֣שְׂתְּ|lemma="אַרְתַּחְשַׁשְׁתָּא" strong="H0783b"\+w*\f* \w מַלְכָּ֔⁠א|lemma="מֶלֶךְ" strong="H4430" x-morph="Ar,Ncmsd:Td" x-tw="rc://*/tw/dict/bible/other/king"\w* \w קֱרִ֧י|lemma="קְרָא" strong="H7123" x-morph="Ar,VQp3ms"\w* \w קֳדָם|lemma="קֳדָם" strong="H6925" x-morph="Ar,R"\w*־\w רְח֛וּם|lemma="רְחוּם" strong="H7348b" x-morph="Ar,Np"\w* @@ -1518,11 +1518,11 @@ \w וְ⁠הִתְנַבִּ֞י|lemma="נְבָא" strong="c:H5013" x-morph="Ar,C:VMp3ms" x-tw="rc://*/tw/dict/bible/kt/prophet"\w* \w חַגַּ֣י|lemma="חַגַּי" strong="H2292b" x-morph="Ar,Np" x-tw="rc://*/tw/dict/bible/names/haggai"\w* \w נביא⁠ה|lemma="נְבִיא" strong="H5029" x-morph="Ar,Ncmsd:Td" x-tw="rc://*/tw/dict/bible/kt/prophet"\w* -\f + \ft Q \w נְבִיָּ֗א|lemma="נְבִיא" strong="H5029" x-morph="Ar,Ncmsd:Td"\w*\f* +\f + \ft Q \+w נְבִיָּ֗א|lemma="נְבִיא" strong="H5029" x-morph="Ar,Ncmsd:Td"\+w*\f* \w וּ⁠זְכַרְיָ֤ה|lemma="זְכַרְיָה" strong="c:H2148b" x-morph="Ar,C:Np" x-tw="rc://*/tw/dict/bible/names/zechariahot"\w* \w בַר|lemma="בַּר" strong="H1247" x-morph="Ar,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w עִדּוֹא֙|lemma="עִדּוֹ" strong="H5714" x-morph="Ar,Np"\w* \w נביאי⁠א|lemma="נְבִיא" strong="H5029" x-morph="Ar,Ncmpd:Td" x-tw="rc://*/tw/dict/bible/kt/prophet"\w* -\f + \ft Q \w נְבִיַּיָּ֔א|lemma="נְבִיא" strong="H5029" x-morph="Ar,Ncmpd:Td"\w*\f* +\f + \ft Q \+w נְבִיַּיָּ֔א|lemma="נְבִיא" strong="H5029" x-morph="Ar,Ncmpd:Td"\+w*\f* \w עַל|lemma="עַל" strong="H5922" x-morph="Ar,R"\w*־\w יְה֣וּדָיֵ֔⁠א|lemma="יְהוּדָאִי" strong="H3062" x-morph="Ar,Ngmpd:Td" x-tw="rc://*/tw/dict/bible/kt/jew"\w* \w דִּ֥י|lemma="דִּי" strong="H1768" x-morph="Ar,Tr"\w* \w בִ⁠יה֖וּד|lemma="יְהוּד" strong="b:H3061" x-morph="Ar,R:Np" x-tw="rc://*/tw/dict/bible/names/judea"\w* @@ -1548,7 +1548,7 @@ \w בִ⁠ירֽוּשְׁלֶ֑ם|lemma="יְרוּשָׁלֵם" strong="b:H3390" x-morph="Ar,R:Np" x-tw="rc://*/tw/dict/bible/names/jerusalem"\w* \w וְ⁠עִמְּ⁠ה֛וֹן|lemma="עִם" strong="c:H5974" x-morph="Ar,C:R:Sp3mp"\w* \w נביאי⁠א|lemma="נְבִיא" strong="H5029" x-morph="Ar,Ncmpd:Td" x-tw="rc://*/tw/dict/bible/kt/prophet"\w* -\f + \ft Q \w נְבִיַּיָּ֥א|lemma="נְבִיא" strong="H5029" x-morph="Ar,Ncmpd:Td"\w*\f* +\f + \ft Q \+w נְבִיַּיָּ֥א|lemma="נְבִיא" strong="H5029" x-morph="Ar,Ncmpd:Td"\+w*\f* \w דִֽי|lemma="דִּי" strong="H1768" x-morph="Ar,Tr"\w*־\w אֱלָהָ֖⁠א|lemma="אֱלָהּ" strong="H0426" x-morph="Ar,Ncmsd:Td" x-tw="rc://*/tw/dict/bible/kt/god"\w* \w מְסָעֲדִ֥ין|lemma="סְעַד" strong="H5583" x-morph="Ar,Vprmpa"\w* \w לְ⁠הֽוֹן|lemma="" strong="l" x-morph="Ar,To:Sp3mp"\w*׃פ @@ -1726,7 +1726,7 @@ \w נְבוּכַדְנֶצַּ֥ר|lemma="נְבוּכַדְנֶצַּר" strong="H5020" x-morph="Ar,Np" x-tw="rc://*/tw/dict/bible/names/nebuchadnezzar"\w* \w מֶֽלֶךְ|lemma="מֶלֶךְ" strong="H4430" x-morph="Ar,Ncmsc" x-tw="rc://*/tw/dict/bible/other/king"\w*־\w בָּבֶ֖ל|lemma="בַּבֶל" strong="H0895" x-morph="Ar,Np" x-tw="rc://*/tw/dict/bible/names/babylon"\w* \w כַּסְדָּאָ֑ה|lemma="כַּסְדַּי" strong="H3679" x-morph="Ar,Ngmsd:Td" x-tw="rc://*/tw/dict/bible/names/chaldeans"\w* -\f + \ft K \w כסדי⁠א|lemma="כַּסְדַּי" strong="H3679" x-morph="Ar,Ngmpd:Td"\w*\f* +\f + \ft K \+w כסדי⁠א|lemma="כַּסְדַּי" strong="H3679" x-morph="Ar,Ngmpd:Td"\+w*\f* \w וּ⁠בַיְתָ֤⁠ה|lemma="בַּיִת" strong="c:H1005" x-morph="Ar,C:Ncmsd:Td" x-tw="rc://*/tw/dict/bible/kt/temple"\w* \w דְנָה֙|lemma="דֵּן" strong="H1836" x-morph="Ar,Pdxms"\w* \w סַתְרֵ֔⁠הּ|lemma="סְתַר" strong="H5642b" x-morph="Ar,Vqp3ms:Sp3ms" x-tw="rc://*/tw/dict/bible/other/destroyer"\w* @@ -1787,7 +1787,7 @@ \v 15 \w וַ⁠אֲמַר|lemma="אֲמַר" strong="c:H0560" x-morph="Ar,C:Vqp3ms"\w*־\w לֵ֓⁠הּ|lemma="" strong="l" x-morph="Ar,R:Sp3ms"\w* ׀ \w אֵ֚ל|lemma="אֵל" strong="H0412" x-morph="Ar,Pdxmp"\w* -\f + \ft Q \w אלה|lemma="אֵל" strong="H0412" x-morph="Ar,Pdxfp"\w*\f* +\f + \ft Q \+w אלה|lemma="אֵל" strong="H0412" x-morph="Ar,Pdxfp"\+w*\f* \w מָֽאנַיָּ֔⁠א|lemma="מָאן" strong="H3984" x-morph="Ar,Ncmpd:Td"\w* \w שֵׂ֚א|lemma="נְשָׂא" strong="H5376" x-morph="Ar,Vqv2ms"\w* \w אֵֽזֶל|lemma="אֲזַל" strong="H0236" x-morph="Ar,Vqv2ms"\w*־\w אֲחֵ֣ת|lemma="נְחַת" strong="H5182" x-morph="Ar,Vav2ms"\w* @@ -2110,7 +2110,7 @@ \w בִּ⁠נְבוּאַת֙|lemma="נְבוּאָה" strong="b:H5017" x-morph="Ar,R:Ncfsc" x-tw="rc://*/tw/dict/bible/kt/prophet"\w* \w חַגַּ֣י|lemma="חַגַּי" strong="H2292b" x-morph="Ar,Np" x-tw="rc://*/tw/dict/bible/names/haggai"\w* \w נביא⁠ה|lemma="נְבִיא" strong="H5029" x-morph="Ar,Ncmsd:Td" x-tw="rc://*/tw/dict/bible/kt/prophet"\w* -\f + \ft Q \w נְבִיָּ֔א|lemma="נְבִיא" strong="H5029" x-morph="Ar,Ncmsd:Td"\w*\f* +\f + \ft Q \+w נְבִיָּ֔א|lemma="נְבִיא" strong="H5029" x-morph="Ar,Ncmsd:Td"\+w*\f* \w וּ⁠זְכַרְיָ֖ה|lemma="זְכַרְיָה" strong="c:H2148b" x-morph="Ar,C:Np" x-tw="rc://*/tw/dict/bible/names/zechariahot"\w* \w בַּר|lemma="בַּר" strong="H1247" x-morph="Ar,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w עִדּ֑וֹא|lemma="עִדּוֹ" strong="H5714" x-morph="Ar,Np"\w* \w וּ⁠בְנ֣וֹ|lemma="בְּנָא" strong="c:H1124" x-morph="Ar,C:Vqp3mp"\w* @@ -2169,7 +2169,7 @@ \w וּ⁠צְפִירֵ֨י|lemma="צְפִיר" strong="c:H6841" x-morph="Ar,C:Ncmpc"\w* \w עִזִּ֜ין|lemma="עֵז" strong="H5796" x-morph="Ar,Ncfpa" x-tw="rc://*/tw/dict/bible/other/goat"\w* \w ל⁠חטיא|lemma="חֲטָּיָא" strong="l:H2409" x-morph="Ar,R:Vpc"\w* -\f + \ft Q \w לְחַטָּאָ֤ה|lemma="חֲטָּיָא" strong="l:H2409" x-morph="Ar,R:Vpc"\w*\f* +\f + \ft Q \+w לְחַטָּאָ֤ה|lemma="חֲטָּיָא" strong="l:H2409" x-morph="Ar,R:Vpc"\+w*\f* \w עַל|lemma="עַל" strong="H5922" x-morph="Ar,R"\w*־\w כָּל|lemma="כֹּל" strong="H3606" x-morph="Ar,Ncmsc"\w*־\w יִשְׂרָאֵל֙|lemma="יִשְׂרָאֵל" strong="H3479" x-morph="Ar,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w תְּרֵֽי|lemma="תְּרֵין" strong="H8648" x-morph="Ar,Acbsc"\w*־\w עֲשַׂ֔ר|lemma="עֲשַׂר" strong="H6236" x-morph="Ar,Acbsa"\w* \w לְ⁠מִנְיָ֖ן|lemma="מִנְיָן" strong="l:H4510" x-morph="Ar,R:Ncmsc"\w* @@ -2491,9 +2491,9 @@ \w וּ⁠מָ֣ה|lemma="מָה" strong="c:H4101" x-morph="Ar,C:Pfxcs"\w* \w דִי֩|lemma="דִּי" strong="H1768" x-morph="Ar,Pfxcs"\w* \w עלי⁠ך|lemma="עַל" strong="H5921a" x-morph="Ar,R:Sp2ms"\w* -\f + \ft Q \w עֲלָ֨ךְ|lemma="עַל" strong="H5921a" x-morph="Ar,R:Sp2ms"\w*\f* +\f + \ft Q \+w עֲלָ֨ךְ|lemma="עַל" strong="H5921a" x-morph="Ar,R:Sp2ms"\+w*\f* \w וְ⁠עַל|lemma="עַל" strong="c:H5922" x-morph="Ar,C:R"\w*־\w אחי⁠ך|lemma="אַח" strong="H0252" x-morph="Ar,Ncmpc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/brother"\w* -\f + \ft Q \w אֶחָ֜ךְ|lemma="אַח" strong="H0252" x-morph="Ar,Ncmsc:Sp2ms"\w*\f* +\f + \ft Q \+w אֶחָ֜ךְ|lemma="אַח" strong="H0252" x-morph="Ar,Ncmsc:Sp2ms"\+w*\f* \w יֵיטַ֗ב|lemma="יְטַב" strong="H3191" x-morph="Ar,Vqi3ms" x-tw="rc://*/tw/dict/bible/kt/good"\w* \w בִּ⁠שְׁאָ֛ר|lemma="שְׁאָר" strong="b:H7606" x-morph="Ar,R:Ncmsc"\w* \w כַּסְפָּ֥⁠א|lemma="כְּסַף" strong="H3702" x-morph="Ar,Ncmsd:Td" x-tw="rc://*/tw/dict/bible/other/silver"\w* @@ -2624,7 +2624,7 @@ \w וְ⁠דַיָּנִ֗ין|lemma="דַּיָּן" strong="c:H1782" x-morph="Ar,C:Ncmpa" x-tw="rc://*/tw/dict/bible/other/magistrate"\w* \w דִּי|lemma="דִּי" strong="H1768" x-morph="Ar,Tr"\w*־\w לֶהֱוֺ֤ן|lemma="הָוָא" strong="H1934" x-morph="Ar,Vqi3mp"\w* \w דאנין|lemma="דִּין" strong="H1778" x-morph="Ar,Vqrmpa" x-tw="rc://*/tw/dict/bible/kt/judge"\w* -\f + \ft Q \w דָּאיְנִין֙|lemma="דִּין" strong="H1778" x-morph="Ar,Vqrmpa"\w*\f* +\f + \ft Q \+w דָּאיְנִין֙|lemma="דִּין" strong="H1778" x-morph="Ar,Vqrmpa"\+w*\f* \w לְ⁠כָל|lemma="כֹּל" strong="l:H3606" x-morph="Ar,R:Ncmsc"\w*־\w עַמָּ⁠ה֙|lemma="עַם" strong="H5972" x-morph="Ar,Ncmsd:Td" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* \w דִּ֚י|lemma="דִּי" strong="H1768" x-morph="Ar,Tr"\w* \w בַּ⁠עֲבַ֣ר|lemma="עֲבַר" strong="b:H5675" x-morph="Ar,R:Np"\w* @@ -2657,7 +2657,7 @@ \w לְ⁠מוֹת֙|lemma="מוֹת" strong="l:H4193" x-morph="Ar,R:Ncmsa" x-tw="rc://*/tw/dict/bible/other/death"\w* \w הֵ֣ן|lemma="הֵן" strong="H2006a" x-morph="Ar,C"\w* \w ל⁠שרשו|lemma="שְׁרֹשׁוּ" strong="l:H8332" x-morph="Ar,R:Ncfsa"\w* -\f + \ft Q \w ל⁠שרשו|lemma="שְׁרֹשׁוּ" strong="l:H8332" x-morph="Ar,R:Ncfsa"\w*\f* +\f + \ft Q \+w ל⁠שרשו|lemma="שְׁרֹשׁוּ" strong="l:H8332" x-morph="Ar,R:Ncfsa"\+w*\f* \w הֵן|lemma="הֵן" strong="H2006a" x-morph="Ar,C"\w*־\w לַ⁠עֲנָ֥שׁ|lemma="עֲנַשׁ" strong="l:H6065" x-morph="Ar,R:Ncmsc"\w* \w נִכְסִ֖ין|lemma="נְכַס" strong="H5232" x-morph="Ar,Ncmpa"\w* \w וְ⁠לֶ⁠אֱסוּרִֽין|lemma="אֱסוּר" strong="c:l:H0613" x-morph="Ar,C:R:Ncmpa"\w*׃פ @@ -2841,7 +2841,7 @@ \w בִגְוַ֖י|lemma="בִּגְוַי" strong="H0902" x-morph="He,Np"\w* \w עוּתַ֣י|lemma="עוּתַי" strong="H5793" x-morph="He,Np"\w* \w וְזַכּ֑וּר|lemma="זַכּוּר" strong="c:H2139" x-morph="He,C:Np"\w* -\f + \ft K \w ו⁠זבוד|lemma="זַבּוּד" strong="c:H2072" x-morph="He,C:Np"\w*\f* +\f + \ft K \+w ו⁠זבוד|lemma="זַבּוּד" strong="c:H2072" x-morph="He,C:Np"\+w*\f* \w וְ⁠עִמּ֖⁠וֹ|lemma="עִם" strong="c:H5973a" x-morph="He,C:R:Sp3ms"\w* \w שִׁבְעִ֥ים|lemma="שִׁבְעִים" strong="H7657" x-morph="He,Acbpa"\w* \w הַ⁠זְּכָרִֽים|lemma="זָכָר" strong="d:H2145" x-morph="He,Td:Ncmpa"\w*׃פ @@ -2881,7 +2881,7 @@ \v 17 \w וָאֲצַוֶּ֤ה|lemma="צָוָה" strong="c:H6680" x-morph="He,C:Vpw1cs:Sh" x-tw="rc://*/tw/dict/bible/kt/command"\w* -\f + \ft K \w ו⁠אוצא⁠ה|lemma="יָצָא" strong="c:H3318" x-morph="He,C:Vhw1cs:Sh"\w*\f* +\f + \ft K \+w ו⁠אוצא⁠ה|lemma="יָצָא" strong="c:H3318" x-morph="He,C:Vhw1cs:Sh"\+w*\f* \w אוֹתָ⁠ם֙|lemma="אֵת" strong="H0853" x-morph="He,To:Sp3mp"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w אִדּ֣וֹ|lemma="אִדּוֹ" strong="H0112" x-morph="He,Np"\w* \w הָ⁠רֹ֔אשׁ|lemma="רֹאשׁ" strong="d:H7218a" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/head"\w* @@ -2894,7 +2894,7 @@ \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w אִדּ֨וֹ|lemma="אִדּוֹ" strong="H0112" x-morph="He,Np"\w* \w אָחִ֤י⁠ו|lemma="אָח" strong="H0251" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/brother"\w* \w הַנְּתִינִים֙|lemma="נָתִין" strong="d:H5411" x-morph="He,Td:Ncmpa"\w* -\f + \ft K \w ה⁠נתונים|lemma="נָתִין" strong="d:H5411" x-morph="He,Td:Vqsmpa"\w*\f* +\f + \ft K \+w ה⁠נתונים|lemma="נָתִין" strong="d:H5411" x-morph="He,Td:Vqsmpa"\+w*\f* \w בְּ⁠כָסִפְיָ֣א|lemma="כָּסִפְיָא" strong="b:H3703" x-morph="He,R:Np"\w* \w הַ⁠מָּק֔וֹם|lemma="מָקוֹם" strong="d:H4725" x-morph="He,Td:Ncmsa"\w* \w לְ⁠הָֽבִיא|lemma="בּוֹא" strong="l:H0935" x-morph="He,R:Vhc"\w*־\w לָ֥⁠נוּ|lemma="" strong="l" x-morph="He,R:Sp1cp"\w* @@ -3005,7 +3005,7 @@ \v 25 \w ו⁠אשקול⁠ה|lemma="שָׁקַל" strong="c:H8254" x-morph="He,C:Vqw1cs:Sh"\w* -\f + \ft Q \w וָאֶשְׁקֳלָ֣ה|lemma="שָׁקַל" strong="c:H8254" x-morph="He,C:Vqw1cs:Sh"\w*\f* +\f + \ft Q \+w וָאֶשְׁקֳלָ֣ה|lemma="שָׁקַל" strong="c:H8254" x-morph="He,C:Vqw1cs:Sh"\+w*\f* \w לָ⁠הֶ֔ם|lemma="" strong="l" x-morph="He,R:Sp3mp"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ⁠כֶּ֥סֶף|lemma="כֶּסֶף" strong="d:H3701" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/silver"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w הַ⁠זָּהָ֖ב|lemma="זָהָב" strong="d:H2091" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/gold"\w* @@ -3514,7 +3514,7 @@ \w בֶן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w יְחִיאֵ֜ל|lemma="יְחִיאֵל" strong="H3171" x-morph="He,Np"\w* \w מִ⁠בְּנֵ֤י|lemma="בֵּן" strong="m:H1121a" x-morph="He,R:Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w עֵילָם֙|lemma="עֵילָם" strong="H5867b" x-morph="He,Np"\w* -\f + \ft K \w עולם|lemma="עוֹלָם" strong="H5769b" x-morph="He,Ncmsa"\w*\f* +\f + \ft K \+w עולם|lemma="עוֹלָם" strong="H5769b" x-morph="He,Ncmsa"\+w*\f* \w וַ⁠יֹּ֣אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* \w לְ⁠עֶזְרָ֔א|lemma="עֶזְרָא" strong="l:H5830" x-morph="He,R:Np" x-tw="rc://*/tw/dict/bible/names/ezra"\w* \w אֲנַ֨חְנוּ֙|lemma="אֲנַחְנוּ" strong="H0587" x-morph="He,Pp1cp"\w* @@ -3675,7 +3675,7 @@ \w גָּד֑וֹל|lemma="גָּדוֹל" strong="H1419a" x-morph="He,Aamsa"\w* \w כֵּ֛ן|lemma="כֵּן" strong="H3651c" x-morph="He,Tm"\w* \w כִּדְבָרְךָ֥|lemma="דָּבָר" strong="k:H1697" x-morph="He,R:Ncmsc:Sp2ms"\w* -\f + \ft K \w כ⁠דברי⁠ך|lemma="דָּבָר" strong="k:H1697" x-morph="He,R:Ncmpc:Sp2ms"\w*\f* +\f + \ft K \+w כ⁠דברי⁠ך|lemma="דָּבָר" strong="k:H1697" x-morph="He,R:Ncmpc:Sp2ms"\+w*\f* \w עָלֵ֖י⁠נוּ|lemma="עַל" strong="H5921a" x-morph="He,R:Sp1cp"\w* \w לַ⁠עֲשֽׂוֹת|lemma="עָשָׂה" strong="l:H6213a" x-morph="He,R:Vqc"\w*׃ @@ -3892,7 +3892,7 @@ \w יָשׁ֖וּב|lemma="יָשׁוּב" strong="H3437" x-morph="He,Np"\w* \w וּ⁠שְׁאָ֥ל|lemma="שְׁאָל" strong="c:H7594" x-morph="He,C:Np"\w* \w ירמות|lemma="יְרִימוֹת" strong="H3406" x-morph="He,Np"\w*׃ס -\f + \ft Q \w וְרָמֽוֹת|lemma="יְרִימוֹת" strong="c:H3406" x-morph="He,C:Np"\w*\f* +\f + \ft Q \+w וְרָמֽוֹת|lemma="יְרִימוֹת" strong="c:H3406" x-morph="He,C:Np"\+w*\f* \v 30 \w וּ⁠מִ⁠בְּנֵ֛י|lemma="בֵּן" strong="c:m:H1121a" x-morph="He,C:R:Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* @@ -3943,7 +3943,7 @@ \w בְּנָיָ֥ה|lemma="בְּנָיָה" strong="H1141" x-morph="He,Np"\w* \w בֵדְיָ֖ה|lemma="בֵּדְיָה" strong="H0912" x-morph="He,Np"\w* \w כלהי|lemma="כְּלוּהַי" strong="H3622" x-morph="He,Np"\w*׃ -\f + \ft Q \w כְּלֽוּהוּ|lemma="כְּלוּהַי" strong="H3622" x-morph="He,Np"\w*\f* +\f + \ft Q \+w כְּלֽוּהוּ|lemma="כְּלוּהַי" strong="H3622" x-morph="He,Np"\+w*\f* \v 36 \w וַנְיָ֥ה|lemma="וַנְיָה" strong="H2057" x-morph="He,Np"\w* @@ -3954,7 +3954,7 @@ \w מַתַּנְיָ֥ה|lemma="מַתַּנְיָה" strong="H4983" x-morph="He,Np"\w* \w מַתְּנַ֖י|lemma="מַתְּנַי" strong="H4982" x-morph="He,Np"\w* \w ו⁠יעשו|lemma="יַעֲשׂוּ" strong="c:H3299" x-morph="He,C:Np"\w*׃ -\f + \ft Q \w וְיַעֲשָֽׂי|lemma="יַעֲשׂוּ" strong="c:H3299" x-morph="He,C:Np"\w*\f* +\f + \ft Q \+w וְיַעֲשָֽׂי|lemma="יַעֲשׂוּ" strong="c:H3299" x-morph="He,C:Np"\+w*\f* \v 38 \w וּ⁠בָנִ֥י|lemma="בָּנִי" strong="c:H1137" x-morph="He,C:Np"\w* @@ -3989,14 +3989,14 @@ \w זָבָ֣ד|lemma="זָבָד" strong="H2066" x-morph="He,Np"\w* \w זְבִינָ֔א|lemma="זְבִינָא" strong="H2081" x-morph="He,Np"\w* \w יַדַּ֥י|lemma="יִדּוֹ" strong="H3035" x-morph="He,Np"\w* -\f + \ft K \w ידו|lemma="יִדּוֹ" strong="H3035" x-morph="He,Np"\w*\f* +\f + \ft K \+w ידו|lemma="יִדּוֹ" strong="H3035" x-morph="He,Np"\+w*\f* \w וְ⁠יוֹאֵ֖ל|lemma="יוֹאֵל" strong="c:H3100" x-morph="He,C:Np"\w* \w בְּנָיָֽה|lemma="בְּנָיָה" strong="H1141" x-morph="He,Np"\w*׃ \v 44 \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w אֵ֕לֶּה|lemma="אֵלֶּה" strong="H0428" x-morph="He,Pdxcp"\w* \w נָשְׂא֖וּ|lemma="נָשָׂא" strong="H5375" x-morph="He,Vqp3cp"\w* -\f + \ft K \w נשא⁠י|lemma="נָשָׂא" strong="H5375" x-morph="He,Vqp3ms:Sp1cs"\w*\f* +\f + \ft K \+w נשא⁠י|lemma="נָשָׂא" strong="H5375" x-morph="He,Vqp3ms:Sp1cs"\+w*\f* \w נָשִׁ֣ים|lemma="אִשָּׁה" strong="H0802" x-morph="He,Ncfpa"\w* \w נָכְרִיּ֑וֹת|lemma="נׇכְרִי" strong="H5237" x-morph="He,Aafpa" x-tw="rc://*/tw/dict/bible/other/foreigner"\w* \w וְ⁠יֵ֣שׁ|lemma="יֵשׁ" strong="c:H3426" x-morph="He,C:Tm"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/16-NEH.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/16-NEH.usfm index 6b50d12c..55125514 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/16-NEH.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/16-NEH.usfm @@ -16,7 +16,7 @@ \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w חֲכַלְיָ֑ה|lemma="חֲכַלְיָה" strong="H2446" x-morph="He,Np"\w* \w וַ⁠יְהִ֤י|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqw3ms"\w* \w בְ⁠חֹֽדֶשׁ|lemma="חֹדֶשׁ" strong="b:H2320" x-morph="He,R:Ncmsc"\w*־\w כִּסְלֵיו֙|lemma="כִּסְלֵו" strong="H3691" x-morph="He,Np"\w* -\f + \ft K \w כסלו|lemma="כִּסְלֵו" strong="H3691" x-morph="He,Np"\w*\f* +\f + \ft K \+w כסלו|lemma="כִּסְלֵו" strong="H3691" x-morph="He,Np"\+w*\f* \w שְׁנַ֣ת|lemma="שָׁנֶה" strong="H8141" x-morph="He,Ncfsc"\w* \w עֶשְׂרִ֔ים|lemma="עֶשְׂרִים" strong="H6242" x-morph="He,Acbpa"\w* \w וַ⁠אֲנִ֥י|lemma="אֲנִי" strong="c:H0589" x-morph="He,C:Pp1cs"\w* @@ -160,7 +160,7 @@ \w מִ⁠שָּׁ֣ם|lemma="שָׁם" strong="m:H8033" x-morph="He,R:D"\w* \w אֲקַבְּצֵ֔⁠ם|lemma="קָבַץ" strong="H6908" x-morph="He,Vpi1cs:Sp3mp"\w* \w וַהֲבִֽיאוֹתִים֙|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vhq1cs:Sp3mp"\w* -\f + \ft K \w ו⁠הבואתי⁠ם|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqq1cs:Sp3mp"\w*\f* +\f + \ft K \+w ו⁠הבואתי⁠ם|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqq1cs:Sp3mp"\+w*\f* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w הַ⁠מָּק֔וֹם|lemma="מָקוֹם" strong="d:H4725" x-morph="He,Td:Ncmsa"\w* \w אֲשֶׁ֣ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w בָּחַ֔רְתִּי|lemma="בָּחַר" strong="H0977" x-morph="He,Vqp1cs"\w* @@ -431,7 +431,7 @@ \w בְּ⁠חוֹמֹ֤ת|lemma="חוֹמָה" strong="b:H2346" x-morph="He,R:Ncfpc"\w* \w יְרוּשָׁלִַ֨ם֙|lemma="יְרוּשָׁלִַ͏ם" strong="H3389" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jerusalem"\w* \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w הֵ֣ם פְּרוּצִ֔ים|lemma="פָּרַץ" strong="d:H6555" x-morph="He,Pp3mp:VQsmpa"\w* -\f + \ft K \w ה⁠מפרוצים|lemma="פָּרַץ" strong="d:H6555" x-morph="He,Td:VPsmpa"\w*\f* +\f + \ft K \+w ה⁠מפרוצים|lemma="פָּרַץ" strong="d:H6555" x-morph="He,Td:VPsmpa"\+w*\f* \w וּ⁠שְׁעָרֶ֖י⁠הָ|lemma="שַׁעַר" strong="c:H8179" x-morph="He,C:Ncmpc:Sp3fs" x-tw="rc://*/tw/dict/bible/other/gate"\w* \w אֻכְּל֥וּ|lemma="אָכַל" strong="H0398" x-morph="He,VQp3cp"\w* \w בָ⁠אֵֽשׁ|lemma="אֵשׁ" strong="b:H0784" x-morph="He,Rd:Ncbsa" x-tw="rc://*/tw/dict/bible/other/fire"\w*׃ @@ -789,7 +789,7 @@ \w יִבְנֶ֨⁠נּוּ֙|lemma="בָּנָה" strong="H1129" x-morph="He,Vqi3ms:Sp3ms"\w* \w וִ⁠יטַֽלְלֶ֔⁠נּוּ|lemma="טָלַל" strong="c:H2926" x-morph="He,C:Vpi3ms:Sp3ms"\w* \w וְיַעֲמִיד֙|lemma="עָמַד" strong="c:H5975" x-morph="He,C:Vhi3ms"\w* -\f + \ft K \w ויעמידו |lemma="עָמַד" strong="c:H5975" x-morph="He,C:Vhi3mp"\w*\f* +\f + \ft K \+w ויעמידו |lemma="עָמַד" strong="c:H5975" x-morph="He,C:Vhi3mp"\+w*\f* \w דַּלְתֹתָ֔י⁠ו|lemma="דֶּלֶת" strong="H1817c" x-morph="He,Ncfpc:Sp3ms"\w* \w מַנְעֻלָ֖י⁠ו|lemma="מַנְעוּל" strong="H4514" x-morph="He,Ncmpc:Sp3ms"\w* \w וּ⁠בְרִיחָ֑י⁠ו|lemma="בְּרִיחַ" strong="c:H1280" x-morph="He,C:Ncmpc:Sp3ms"\w* @@ -865,7 +865,7 @@ \w הֶחֱזִ֛יק|lemma="חָזַק" strong="H2388" x-morph="He,Vhp3ms" x-tw="rc://*/tw/dict/bible/other/strength"\w* \w בָּר֥וּךְ|lemma="בָּרוּךְ" strong="H1263" x-morph="He,Np"\w* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w זבי|lemma="זַבַּי" strong="H2079" x-morph="He,Np"\w* -\f + \ft Q \w זַכַּ֖י |lemma="זַכַּ֖י" strong="H2140" x-morph="He,Np"\w*\f* +\f + \ft Q \+w זַכַּ֖י |lemma="זַכַּ֖י" strong="H2140" x-morph="He,Np"\+w*\f* \w מִדָּ֣ה|lemma="מִדָּה" strong="H4060a" x-morph="He,Ncfsa"\w* \w שֵׁנִ֑ית|lemma="שֵׁנִי" strong="H8145" x-morph="He,Aofsa"\w* \w מִן|lemma="מִן" strong="H4480a" x-morph="He,R"\w*־\w הַ֨⁠מִּקְצ֔וֹעַ|lemma="מַקְצוֹעַ" strong="d:H4740" x-morph="He,Td:Ncmsa"\w* @@ -996,7 +996,7 @@ \v 30 \w אַחֲרָ֨יו|lemma="אַחַר" strong="H0310a" x-morph="He,R:Sp3ms"\w* -\f + \ft K \w אחר⁠י|lemma="אַחַר" strong="H0310a" x-morph="He,D"\w*\f* +\f + \ft K \+w אחר⁠י|lemma="אַחַר" strong="H0310a" x-morph="He,D"\+w*\f* \w הֶחֱזִ֜יק|lemma="חָזַק" strong="H2388" x-morph="He,Vhp3ms" x-tw="rc://*/tw/dict/bible/other/strength"\w* \w חֲנַנְיָ֣ה|lemma="חֲנַנְיָה" strong="H2608a" x-morph="He,Np"\w* \w בֶן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w שֶׁלֶמְיָ֗ה|lemma="שֶׁלֶמְיָה" strong="H8018" x-morph="He,Np"\w* @@ -1014,7 +1014,7 @@ \v 31 \w אַחֲרָ֣יו|lemma="אַחַר" strong="H0310a" x-morph="He,R:Sp3ms"\w* -\f + \ft K \w אחר⁠י|lemma="אַחַר" strong="H0310a" x-morph="He,D"\w*\f* +\f + \ft K \+w אחר⁠י|lemma="אַחַר" strong="H0310a" x-morph="He,D"\+w*\f* \w הֶחֱזִ֗יק|lemma="חָזַק" strong="H2388" x-morph="He,Vhp3ms" x-tw="rc://*/tw/dict/bible/other/strength"\w* \w מַלְכִּיָּה֙|lemma="מַלְכִּיָּה" strong="H4441" x-morph="He,Np"\w* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w הַ⁠צֹּ֣רְפִ֔י|lemma="צֹרְפִי" strong="d:H6885" x-morph="He,Td:Ncmsa"\w* @@ -1232,7 +1232,7 @@ \w מֵ⁠אַחֲרֵ֥י|lemma="אַחַר" strong="m:H0310a" x-morph="He,R:R"\w* \w לַ⁠חוֹמָ֖ה|lemma="חוֹמָה" strong="l:H2346" x-morph="He,Rd:Ncfsa"\w* \w בַּצְּחִיחִ֑ים|lemma="צְחִיחִי" strong="b:H6708" x-morph="He,Rd:Ncmpa"\w* -\f + \ft K \w ב⁠צחחיים|lemma="צְחִיחִי" strong="b:H6708" x-morph="He,Rd:Ncmpa"\w*\f* +\f + \ft K \+w ב⁠צחחיים|lemma="צְחִיחִי" strong="b:H6708" x-morph="He,Rd:Ncmpa"\+w*\f* \w וָֽ⁠אַעֲמִ֤יד|lemma="עָמַד" strong="c:H5975" x-morph="He,C:Vhw1cs"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הָ⁠עָם֙|lemma="עַם" strong="d:H5971a" x-morph="He,Td:Ncmsa"\w* \w לְ⁠מִשְׁפָּח֔וֹת|lemma="מִשְׁפָּחָה" strong="l:H4940" x-morph="He,R:Ncfpa"\w* @@ -1273,7 +1273,7 @@ \w הָ⁠אֱלֹהִ֖ים|lemma="אֱלֹהִים" strong="d:H0430" x-morph="He,Td:Ncmpa" x-tw="rc://*/tw/dict/bible/kt/god"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w עֲצָתָ֑⁠ם|lemma="עֵצָה" strong="H6098" x-morph="He,Ncfsc:Sp3mp"\w* \w וַנָּ֤שָׁב|lemma="שׁוּב" strong="c:H7725" x-morph="He,C:Vqw1cp" x-tw="rc://*/tw/dict/bible/other/return"\w* -\f + \ft K \w ו⁠נשוב|lemma="שׁוּב" strong="c:H7725" x-morph="He,C:Vqw1cp"\w*\f* +\f + \ft K \+w ו⁠נשוב|lemma="שׁוּב" strong="c:H7725" x-morph="He,C:Vqw1cp"\+w*\f* \w כֻּלָּ֨⁠נוּ֙|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc:Sp1cp"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w הַ֣⁠חוֹמָ֔ה|lemma="חוֹמָה" strong="d:H2346" x-morph="He,Td:Ncfsa"\w* \w אִ֖ישׁ|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsa"\w* @@ -1502,7 +1502,7 @@ \w אִישׁ|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsa"\w*־\w בְּ⁠אָחִ֖י⁠ו|lemma="אָח" strong="b:H0251" x-morph="He,R:Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/brother"\w* \w אַתֶּ֣ם|lemma="אַתָּה" strong="H0859d" x-morph="He,Pp2mp"\w* \w נֹשִׁ֑ים|lemma="נָשָׁה" strong="H5383" x-morph="He,Vqrmpa"\w* -\f + \ft K \w נשאים|lemma="נָשָׂא" strong="H5375" x-morph="He,Vqrmpa"\w*\f* +\f + \ft K \+w נשאים|lemma="נָשָׂא" strong="H5375" x-morph="He,Vqrmpa"\+w*\f* \w וָ⁠אֶתֵּ֥ן|lemma="נָתַן" strong="c:H5414" x-morph="He,C:Vqw1cs"\w* \w עֲלֵי⁠הֶ֖ם|lemma="עַל" strong="H5921a" x-morph="He,R:Sp3mp"\w* \w קְהִלָּ֥ה|lemma="קְהִלָּה" strong="H6952" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/other/assembly"\w* @@ -1530,7 +1530,7 @@ \v 9 \w וָאוֹמַ֕ר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw1cs"\w* -\f + \ft K \w ו⁠יאמר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w*\f* +\f + \ft K \+w ו⁠יאמר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\+w*\f* \w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w ט֥וֹב|lemma="טוֹב" strong="H2896a" x-morph="He,Aamsa" x-tw="rc://*/tw/dict/bible/kt/good"\w* \w הַ⁠דָּבָ֖ר|lemma="דָּבָר" strong="d:H1697" x-morph="He,Td:Ncmsa"\w* \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w אַתֶּ֣ם|lemma="אַתָּה" strong="H0859d" x-morph="He,Pp2mp"\w* @@ -2084,7 +2084,7 @@ \v 3 \w וָאֹמַ֣ר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw1cs"\w* -\f + \ft K \w ו⁠יאמר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w*\f* +\f + \ft K \+w ו⁠יאמר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\+w*\f* \w לָ⁠הֶ֗ם|lemma="" strong="l" x-morph="He,R:Sp3mp"\w* \w לֹ֣א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w יִפָּֽתְח֞וּ|lemma="פָּתַח" strong="H6605a" x-morph="He,VNi3mp"\w* @@ -2531,7 +2531,7 @@ \w בְּנֵי|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w מְעוּנִ֖ים|lemma="מְעוּנִי" strong="H4586" x-morph="He,Ngmpa"\w* \w בְּנֵ֥י|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w נפושסים|lemma="נְפוּשְׁסִים" strong="H5300" x-morph="He,Ngmpa"\w*׃ -\f + \ft Q \w נְפִֽישְׁסִֽים|lemma="נְפוּשְׁסִים" strong="H5300" x-morph="He,Ngmpa"\w*\f* +\f + \ft Q \+w נְפִֽישְׁסִֽים|lemma="נְפוּשְׁסִים" strong="H5300" x-morph="He,Ngmpa"\+w*\f* \v 53 \w בְּנֵי|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w בַקְבּ֥וּק|lemma="בַּקְבּוּק" strong="H1227" x-morph="He,Np"\w* @@ -3222,7 +3222,7 @@ \w יְהוָה֮|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w לְ⁠בַדֶּ⁠ךָ֒|lemma="בַּד" strong="l:H0905" x-morph="He,R:Ncmsc:Sp2ms"\w* \w אַתָּ֣ה|lemma="אַתָּה" strong="H0859a" x-morph="He,Pp2ms"\w* -\f + \ft K \w את|lemma="אַתָּה" strong="H0859a" x-morph="He,Pp2fs"\w*\f* +\f + \ft K \+w את|lemma="אַתָּה" strong="H0859a" x-morph="He,Pp2fs"\+w*\f* \w עָשִׂ֡יתָ|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqp2ms"\w* \w אֶֽת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ⁠שָּׁמַיִם֩|lemma="שָׁמַיִם" strong="d:H8064" x-morph="He,Td:Ncmpa" x-tw="rc://*/tw/dict/bible/kt/heaven"\w* \w שְׁמֵ֨י|lemma="שָׁמַיִם" strong="H8064" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/heaven"\w* @@ -3423,7 +3423,7 @@ \w וְ⁠רַח֛וּם|lemma="רַחוּם" strong="c:H7349" x-morph="He,C:Aamsa" x-tw="rc://*/tw/dict/bible/kt/compassion"\w* \w אֶֽרֶךְ|lemma="אָרֵךְ" strong="H0750" x-morph="He,Aamsc"\w*־\w אַפַּ֥יִם|lemma="אַף" strong="H0639" x-morph="He,Ncmda"\w* \w וְ⁠רַב|lemma="רַב" strong="c:H7227a" x-morph="He,C:Aamsc"\w*־\w חֶ֖סֶד|lemma="חֶסֶד" strong="c:H2617a" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/kt/covenantfaith"\w* -\f + \ft K \w ו⁠חסד|lemma="חֶסֶד" strong="c:H2617a" x-morph="He,C:Ncmsa"\w*\f* +\f + \ft K \+w ו⁠חסד|lemma="חֶסֶד" strong="c:H2617a" x-morph="He,C:Ncmsa"\+w*\f* \w וְ⁠לֹ֥א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w* \w עֲזַבְתָּֽ⁠ם|lemma="עָזַב" strong="H5800a" x-morph="He,Vqp2ms:Sp3mp" x-tw="rc://*/tw/dict/bible/other/forsaken"\w*׃ @@ -3929,7 +3929,7 @@ \w חָרִ֥יף|lemma="חָרִיף" strong="H2756" x-morph="He,Np"\w* \w עֲנָת֖וֹת|lemma="עֲנָתוֹת" strong="H6068" x-morph="He,Np"\w* \w נֵיבָֽי|lemma="נוֹבַי" strong="H5109" x-morph="He,Np"\w*׃ -\f + \ft K \w נובי|lemma="נוֹבַי" strong="H5109" x-morph="He,Np"\w*\f* +\f + \ft K \+w נובי|lemma="נוֹבַי" strong="H5109" x-morph="He,Np"\+w*\f* \v 20 \va 21\va* @@ -4426,7 +4426,7 @@ \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w שַׁמּ֔וּעַ|lemma="שַׁמּוּעַ" strong="H8051" x-morph="He,Np"\w* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w גָּלָ֖ל|lemma="גָּלָל" strong="H1559" x-morph="He,Np"\w* \w בֶּן|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/son"\w*־\w יְדוּתֽוּן|lemma="יְדוּתוּן" strong="H3038" x-morph="He,Np"\w*׃ -\f + \ft K \w ידיתון|lemma="יְדוּתוּן" strong="H3038" x-morph="He,Np"\w*\f* +\f + \ft K \+w ידיתון|lemma="יְדוּתוּן" strong="H3038" x-morph="He,Np"\+w*\f* \v 18 \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w הַ⁠לְוִיִּם֙|lemma="לֵוִיִּי" strong="d:H3881" x-morph="He,Td:Ngmpa" x-tw="rc://*/tw/dict/bible/names/levite"\w* @@ -4658,7 +4658,7 @@ \v 9 \w וּ⁠בַקְבֻּֽקְיָ֨ה|lemma="בַּקְבֻּקְיָה" strong="c:H1229" x-morph="He,C:Np"\w* \w וְעֻנִּ֧י|lemma="עֻנִּי" strong="c:H6042" x-morph="He,C:Np"\w* -\f + \ft K \w ו⁠ענו|lemma="עֻנִּי" strong="c:H6042" x-morph="He,C:Np"\w*\f* +\f + \ft K \+w ו⁠ענו|lemma="עֻנִּי" strong="c:H6042" x-morph="He,C:Np"\+w*\f* \w אֲחֵי⁠הֶ֛ם|lemma="אָח" strong="H0251" x-morph="He,Ncmpc:Sp3mp" x-tw="rc://*/tw/dict/bible/kt/brother"\w* \w לְ⁠נֶגְדָּ֖⁠ם|lemma="נֶגֶד" strong="l:H5048" x-morph="He,R:R:Sp3mp"\w* \w לְ⁠מִשְׁמָרֽוֹת|lemma="מִשְׁמֶרֶת" strong="l:H4931" x-morph="He,R:Ncfpa"\w*׃ @@ -4701,7 +4701,7 @@ \v 14 \w ל⁠מלוכי|lemma="מַלּוּךְ" strong="l:H4409b" x-morph="He,R:Np"\w* -\f + \ft Q \w לִמְלִ֙יכוּ֙|lemma="מַלּוּךְ" strong="l:H4409b" x-morph="He,R:Np"\w*\f* +\f + \ft Q \+w לִמְלִ֙יכוּ֙|lemma="מַלּוּךְ" strong="l:H4409b" x-morph="He,R:Np"\+w*\f* \w יֽוֹנָתָ֔ן|lemma="יוֹנָתָן" strong="H3129" x-morph="He,Np"\w* \w לִ⁠שְׁבַנְיָ֖ה|lemma="שְׁבַנְיָה" strong="l:H7645" x-morph="He,R:Np"\w* \w יוֹסֵֽף|lemma="יוֹסֵף" strong="H3130" x-morph="He,Np"\w*׃ @@ -4714,7 +4714,7 @@ \v 16 \w לְעִדּ֥וֹא|lemma="עִדּוֹ" strong="l:H5714" x-morph="He,R:Np"\w* -\f + \ft K \w ל⁠עדיא|lemma="עִדּוֹ" strong="l:H5714" x-morph="He,R:Np"\w*\f* +\f + \ft K \+w ל⁠עדיא|lemma="עִדּוֹ" strong="l:H5714" x-morph="He,R:Np"\+w*\f* \w זְכַרְיָ֖ה|lemma="זְכַרְיָה" strong="H2148a" x-morph="He,Np"x-tw="rc://*/tw/dict/bible/names/zechariahot"\w* \w לְ⁠גִנְּת֥וֹן|lemma="גִּנְּתוֹן" strong="l:H1599" x-morph="He,R:Np"\w* \w מְשֻׁלָּֽם|lemma="מְשֻׁלָּם" strong="H4918" x-morph="He,Np"\w*׃ @@ -5094,7 +5094,7 @@ \w וְ⁠אָסָ֖ף|lemma="אָסָף" strong="c:H0623" x-morph="He,C:Np" x-tw="rc://*/tw/dict/bible/names/asaph"\w* \w מִ⁠קֶּ֑דֶם|lemma="קֶדֶם" strong="m:H6924a" x-morph="He,R:Ncmsa"\w* \w ראש|lemma="רֹאשׁ" strong="H7218a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/head"\w* -\f + \ft Q \w רָאשֵׁי֙|lemma="רֹאשׁ" strong="H7218a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/other/head"\w*\f* +\f + \ft Q \+w רָאשֵׁי֙|lemma="רֹאשׁ" strong="H7218a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/other/head"\+w*\f* \w הַ⁠מְשֹׁ֣רְרִ֔ים|lemma="שִׁיר" strong="d:H7891" x-morph="He,Td:Vormpa"\w* \w וְ⁠שִׁיר|lemma="שִׁיר" strong="c:H7892a" x-morph="He,C:Ncbsc"\w*־\w תְּהִלָּ֥ה|lemma="תְּהִלָּה" strong="H8416" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/other/praise"\w* \w וְ⁠הֹד֖וֹת|lemma="יָדָה" strong="c:H3034" x-morph="He,C:Vhc"\w* @@ -5480,9 +5480,9 @@ \w הֹשִׁ֗יבוּ|lemma="יָשַׁב" strong="H3427" x-morph="He,Vhp3cp"\w* \w נָשִׁים֙|lemma="אִשָּׁה" strong="H0802" x-morph="He,Ncfpa"\w* \w אשדודיות|lemma="אַשְׁדּוֹדִי" strong="H0796" x-morph="He,Agfpa" x-tw="rc://*/tw/dict/bible/names/ashdod"\w* -\f + \ft Q \w אַשְׁדֳּדִיּ֔וֹת|lemma="אַשְׁדּוֹדִי" strong="H0796" x-morph="He,Agfpa"\w*\f* +\f + \ft Q \+w אַשְׁדֳּדִיּ֔וֹת|lemma="אַשְׁדּוֹדִי" strong="H0796" x-morph="He,Agfpa"\+w*\f* \w עמוניות|lemma="עַמּוֹנִי" strong="H5984" x-morph="He,Agfpa" x-tw="rc://*/tw/dict/bible/names/ammon"\w* -\f + \ft Q \w עַמֳּנִיּ֖וֹת|lemma="עַמּוֹנִי" strong="H5984" x-morph="He,Agfpa"\w*\f* +\f + \ft Q \+w עַמֳּנִיּ֖וֹת|lemma="עַמּוֹנִי" strong="H5984" x-morph="He,Agfpa"\+w*\f* \w מוֹאֲבִיּֽוֹת|lemma="מוֹאָבִי" strong="H4125" x-morph="He,Ngfpa" x-tw="rc://*/tw/dict/bible/names/moab"\w*׃ \v 24 @@ -5542,7 +5542,7 @@ \v 27 \w וְ⁠לָ⁠כֶ֣ם|lemma="" strong="c:l" x-morph="He,C:R:Sp2mp"\w* \w הֲ⁠נִשְׁמַ֗ע|lemma="שָׁמַע" strong="i:H8085" x-morph="He,Ti:Vqp1cs"\w* -\f + \ft or perhaps Niphal \w הֲ⁠נִשְׁמַ֗ע|lemma="שָׁמַע" strong="i:H8085" x-morph="He,Ti:VNp3ms"\w*\f* +\f + \ft or perhaps Niphal \w הֲ⁠נִשְׁמַ֗ע|lemma="שָׁמַע" strong="i:H8085" x-morph="He,Ti:VNp3ms"\+w*\f* \w לַ⁠עֲשֹׂת֙|lemma="עָשָׂה" strong="l:H6213a" x-morph="He,R:Vqc"\w* \w אֵ֣ת|lemma="אֵת" strong="H0853" x-morph="He,To"\w* \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w הָ⁠רָעָ֤ה|lemma="רַע" strong="d:H7451c" x-morph="He,Td:Ncfsa" x-tw="rc://*/tw/dict/bible/kt/evil"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/17-EST.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/17-EST.usfm index 3af052ed..a311f6e0 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/17-EST.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/17-EST.usfm @@ -254,7 +254,7 @@ \v 16 \w וַ⁠יֹּ֣אמֶר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* \w מְמוּכָ֗ן|lemma="מְמוּכָן" strong="H4462" x-morph="He,Np"\w* -\f + \ft K \w מומכן|lemma="מְמוּכָן" strong="H4462" x-morph="He,Np"\w*\f* +\f + \ft K \+w מומכן|lemma="מְמוּכָן" strong="H4462" x-morph="He,Np"\+w*\f* \w לִ⁠פְנֵ֤י|lemma="פָּנִים" strong="l:H6440" x-morph="He,R:Ncbpc" x-tw="rc://*/tw/dict/bible/other/face"\w* \w הַ⁠מֶּ֨לֶךְ֙|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* \w וְ⁠הַ⁠שָּׂרִ֔ים|lemma="שַׂר" strong="c:d:H8269" x-morph="He,C:Td:Ncmpa" x-tw="rc://*/tw/dict/bible/other/noble"\w* @@ -851,7 +851,7 @@ \v 4 \w וַ⁠יְהִ֗י|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqw3ms"\w* \w ב⁠אמר⁠ם|lemma="אָמַר" strong="b:H0559" x-morph="He,R:Vqc:Sp3mp"\w* -\f + \ft Q \w כְּאָמְרָ֤ם|lemma="אָמַר" strong="k:H0559" x-morph="He,R:Vqc:Sp3mp"\w*\f* +\f + \ft Q \+w כְּאָמְרָ֤ם|lemma="אָמַר" strong="k:H0559" x-morph="He,R:Vqc:Sp3mp"\+w*\f* \w אֵלָי⁠ו֙|lemma="אֵל" strong="H0413" x-morph="He,R:Sp3ms"\w* \w י֣וֹם|lemma="יוֹם" strong="H3117" x-morph="He,Ncmsa"\w* \w וָ⁠י֔וֹם|lemma="יוֹם" strong="c:H3117" x-morph="He,C:Ncmsa"\w* @@ -1143,7 +1143,7 @@ \v 4 \w ו/תבואינה|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3fp"\w* -\f + \ft Q \w וַ֠תָּבוֹאנָה|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3fp"\w*\f* +\f + \ft Q \+w וַ֠תָּבוֹאנָה|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vqw3fp"\+w*\f* \w נַעֲר֨וֹת|lemma="נַעֲרָה" strong="H5291" x-morph="He,Ncfpc" x-tw="rc://*/tw/dict/bible/other/servant"\w* \w אֶסְתֵּ֤ר|lemma="אֶסְתֵּר" strong="H0635" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/esther"\w* \w וְ⁠סָרִיסֶ֨י⁠הָ֙|lemma="סָרִיס" strong="c:H5631" x-morph="He,C:Ncmpc:Sp3fs"\w* @@ -1203,7 +1203,7 @@ \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w גִּנְזֵ֥י|lemma="גֶּנֶז" strong="H1595" x-morph="He,Ncmpc"\w* \w הַ⁠מֶּ֛לֶךְ|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* \w בַּיְּהוּדִ֖ים|lemma="יְהוּדִי" strong="b:H3064" x-morph="He,Rd:Ngmpa" x-tw="rc://*/tw/dict/bible/kt/jew"\w* -\f + \ft K \w ביהודיים|lemma="יְהוּדִי" strong="b:H3064" x-morph="He,Rd:Ngmpa"\w*\f* +\f + \ft K \+w ביהודיים|lemma="יְהוּדִי" strong="b:H3064" x-morph="He,Rd:Ngmpa"\+w*\f* \w לְ⁠אַבְּדָֽ⁠ם|lemma="אָבַד" strong="l:H0006" x-morph="He,R:Vpc:Sp3mp" x-tw="rc://*/tw/dict/bible/other/destroyer"\w*׃ \v 8 @@ -2067,7 +2067,7 @@ \w הָמָ֖ן|lemma="הָמָן" strong="H2001" x-morph="He,Np"\w* \w צֹרֵ֣ר|lemma="צָרַר" strong="H6887d" x-morph="He,Vqrmsc" x-tw="rc://*/tw/dict/bible/other/adversary"\w* \w הַיְּהוּדִ֑ים|lemma="יְהוּדִי" strong="d:H3064" x-morph="He,Td:Ngmpa" x-tw="rc://*/tw/dict/bible/kt/jew"\w* -\f + \ft K \w היהודיים|lemma="יְהוּדִי" strong="d:H3064" x-morph="He,Td:Ngmpa"\w*\f* +\f + \ft K \+w היהודיים|lemma="יְהוּדִי" strong="d:H3064" x-morph="He,Td:Ngmpa"\+w*\f* \w וּ⁠מָרְדֳּכַ֗י|lemma="מׇרְדְּכַי" strong="c:H4782" x-morph="He,C:Np" x-tw="rc://*/tw/dict/bible/names/mordecai"\w* \w בָּ֚א|lemma="בּוֹא" strong="H0935" x-morph="He,Vqp3ms"\w* \w לִ⁠פְנֵ֣י|lemma="פָּנִים" strong="l:H6440" x-morph="He,R:Ncbpc" x-tw="rc://*/tw/dict/bible/other/face"\w* @@ -2188,7 +2188,7 @@ \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w שָׁלַ֥ח|lemma="שָׁלַח" strong="H7971" x-morph="He,Vqp3ms"\w* \w יָד֖⁠וֹ|lemma="יָד" strong="H3027" x-morph="He,Ncbsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w בַּיְּהוּדִֽים|lemma="יְהוּדִי" strong="b:H3064" x-morph="He,Rd:Ngmpa" x-tw="rc://*/tw/dict/bible/kt/jew"\w*׃ -\f + \ft K \w ביהודיים|lemma="יְהוּדִי" strong="b:H3064" x-morph="He,Rd:Ngmpa"\w*\f* +\f + \ft K \+w ביהודיים|lemma="יְהוּדִי" strong="b:H3064" x-morph="He,Rd:Ngmpa"\+w*\f* \v 8 \w וְ֠⁠אַתֶּם|lemma="אַתָּה" strong="c:H0859d" x-morph="He,C:Pp2mp"\w* @@ -2312,9 +2312,9 @@ \w לְ⁠כָל|lemma="כֹּל" strong="l:H3605" x-morph="He,R:Ncmsc"\w*־\w הָ⁠עַמִּ֑ים|lemma="עַם" strong="d:H5971a" x-morph="He,Td:Ncmpa" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* \w וְ⁠לִ⁠הְי֨וֹת|lemma="הָיָה" strong="c:l:H1961" x-morph="He,C:R:Vqc"\w* \w הַיְּהוּדִ֤ים|lemma="יְהוּדִי" strong="d:H3064" x-morph="He,Td:Ngmpa" x-tw="rc://*/tw/dict/bible/kt/jew"\w* -\f + \ft K \w היהודיים|lemma="יְהוּדִי" strong="d:H3064" x-morph="He,Td:Ngmpa"\w*\f* +\f + \ft K \+w היהודיים|lemma="יְהוּדִי" strong="d:H3064" x-morph="He,Td:Ngmpa"\+w*\f* \w עֲתִידִים֙|lemma="עָתִיד" strong="H6264" x-morph="He,Aampa"\w* -\f + \ft K \w עתודים|lemma="עָתוּד" strong="H6259" x-morph="He,Aampa"\w*\f* +\f + \ft K \+w עתודים|lemma="עָתוּד" strong="H6259" x-morph="He,Aampa"\+w*\f* \w לַ⁠יּ֣וֹם|lemma="יוֹם" strong="l:H3117" x-morph="He,Rd:Ncmsa"\w* \w הַ⁠זֶּ֔ה|lemma="זֶה" strong="d:H2088" x-morph="He,Td:Pdxms"\w* \w לְ⁠הִנָּקֵ֖ם|lemma="נָקַם" strong="l:H5358" x-morph="He,R:VNc"\w* @@ -2600,7 +2600,7 @@ \v 15 \w וַ⁠יִּֽקָּהֲל֞וּ|lemma="קָהַל" strong="c:H6950" x-morph="He,C:VNw3mp"\w* \w הַיְּהוּדִ֣ים|lemma="יְהוּדִי" strong="d:H3064" x-morph="He,Td:Ngmpa" x-tw="rc://*/tw/dict/bible/kt/jew"\w* -\f + \ft K \w היהודיים|lemma="יְהוּדִי" strong="d:H3064" x-morph="He,Td:Ngmpa"\w*\f* +\f + \ft K \+w היהודיים|lemma="יְהוּדִי" strong="d:H3064" x-morph="He,Td:Ngmpa"\+w*\f* \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w בְּ⁠שׁוּשָׁ֗ן|lemma="שׁוּשַׁן" strong="b:H7800" x-morph="He,R:Np"\w* \w גַּ֠ם|lemma="גַּם" strong="H1571" x-morph="He,Ta"\w* \w בְּ⁠י֣וֹם|lemma="יוֹם" strong="b:H3117" x-morph="He,R:Ncmsc"\w* @@ -2656,7 +2656,7 @@ \v 18 \w וְהַיְּהוּדִ֣ים|lemma="יְהוּדִי" strong="c:d:H3064" x-morph="He,C:Td:Ncmpa" x-tw="rc://*/tw/dict/bible/kt/jew"\w* -\f + \ft K \w והיהודיים|lemma="יְהוּדִי" strong="c:d:H3064" x-morph="He,C:Td:Ncmpa"\w*\f* +\f + \ft K \+w והיהודיים|lemma="יְהוּדִי" strong="c:d:H3064" x-morph="He,C:Td:Ncmpa"\+w*\f* \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w בְּ⁠שׁוּשָׁ֗ן|lemma="שׁוּשַׁן" strong="b:H7800" x-morph="He,R:Np"\w* \w נִקְהֲלוּ֙|lemma="קָהַל" strong="H6950" x-morph="He,VNp3cp" x-tw="rc://*/tw/dict/bible/other/assembly"\w* \w בִּ⁠שְׁלֹשָׁ֤ה|lemma="שָׁלוֹשׁ" strong="b:H7969" x-morph="He,R:Acmsa"\w* @@ -2679,7 +2679,7 @@ \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w כֵּ֞ן|lemma="כֵּן" strong="H3651c" x-morph="He,Tm"\w* \w הַ⁠יְּהוּדִ֣ים|lemma="יְהוּדִי" strong="d:H3064" x-morph="He,Td:Ngmpa" x-tw="rc://*/tw/dict/bible/kt/jew"\w* \w הַפְּרָזִ֗ים|lemma="פְּרָזִי" strong="d:H6521" x-morph="He,Td:Ncmpa"\w* -\f + \ft K \w ה⁠פרוזים|lemma="פְּרָזִי" strong="d:H6521" x-morph="He,Td:Ncmpa"\w*\f* +\f + \ft K \+w ה⁠פרוזים|lemma="פְּרָזִי" strong="d:H6521" x-morph="He,Td:Ncmpa"\+w*\f* \w הַ⁠יֹּשְׁבִים֮|lemma="יָשַׁב" strong="d:H3427" x-morph="He,Td:Vqrmpa"\w* \w בְּ⁠עָרֵ֣י|lemma="עִיר" strong="b:H5892b" x-morph="He,R:Ncfpc"\w* \w הַ⁠פְּרָזוֹת֒|lemma="פְּרָזָה" strong="d:H6519" x-morph="He,Td:Ncfpa"\w* @@ -2825,7 +2825,7 @@ \v 27 \w קִיְּמ֣וּ|lemma="קוּם" strong="H6965b" x-morph="He,Vpp3cp"\w* \w וְקִבְּל֣וּ|lemma="קָבַל" strong="c:H6901" x-morph="He,C:Vpp3cp"\w* -\f + \ft K \w ו⁠קבל|lemma="קָבַל" strong="c:H6901" x-morph="He,C:Vpp3ms"\w*\f* +\f + \ft K \+w ו⁠קבל|lemma="קָבַל" strong="c:H6901" x-morph="He,C:Vpp3ms"\+w*\f* \w הַ⁠יְּהוּדִים֩|lemma="יְהוּדִי" strong="d:H3064" x-morph="He,Td:Ngmpa" x-tw="rc://*/tw/dict/bible/kt/jew"\w* ׀ \w עֲלֵי⁠הֶ֨ם|lemma="עַל" strong="H5921a" x-morph="He,R:Sp3mp"\w* ׀ \w וְ⁠עַל|lemma="עַל" strong="c:H5921a" x-morph="He,C:R"\w*־\w זַרְעָ֜⁠ם|lemma="זֶרַע" strong="H2233" x-morph="He,Ncmsc:Sp3mp" x-tw="rc://*/tw/dict/bible/other/seed"\w* @@ -2936,7 +2936,7 @@ \w וַ⁠יָּשֶׂם֩|lemma="שׂוּם" strong="c:H7760a" x-morph="He,C:Vqw3ms"\w* \w הַ⁠מֶּ֨לֶךְ|lemma="מֶלֶךְ" strong="d:H4428" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* \w אֲחַשְׁוֵר֧וֹשׁ|lemma="אֲחַשְׁוֵרוֹשׁ" strong="H0325" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/ahasuerus"\w* ׀ -\f + \ft K \w אחשרש|lemma="אֲחַשְׁוֵרוֹשׁ" strong="H0325" x-morph="He,Np"\w*\f* +\f + \ft K \+w אחשרש|lemma="אֲחַשְׁוֵרוֹשׁ" strong="H0325" x-morph="He,Np"\+w*\f* \w מַ֛ס|lemma="מַס" strong="H4522" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/tribute"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w הָ⁠אָ֖רֶץ|lemma="אֶרֶץ" strong="d:H0776" x-morph="He,Td:Ncbsa"\w* \w וְ⁠אִיֵּ֥י|lemma="אִי" strong="c:H0339" x-morph="He,C:Ncmpc"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/18-JOB.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/18-JOB.usfm index fb5f63a1..92db2ce1 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/18-JOB.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/18-JOB.usfm @@ -69,7 +69,7 @@ \w וְ⁠קָרְאוּ֙|lemma="קָרָא" strong="c:H7121" x-morph="He,C:Vqp3cp" x-tw="rc://*/tw/dict/bible/other/declare"\w* \w לִ⁠שְׁלֹ֣שֶׁת|lemma="שָׁלוֹשׁ" strong="l:H7969" x-morph="He,R:Acmsc"\w* \w אַחְיֽוֹתֵיהֶ֔ם|lemma="אָחוֹת" strong="H0269" x-morph="He,Ncfpc:Sp3mp"\w* -\f + \ft K \w אחיתי⁠הם|lemma="אָחוֹת" strong="H0269" x-morph="He,Ncfpc:Sp3mp"\w*\f* +\f + \ft K \+w אחיתי⁠הם|lemma="אָחוֹת" strong="H0269" x-morph="He,Ncfpc:Sp3mp"\+w*\f* \w לֶ⁠אֱכֹ֥ל|lemma="אָכַל" strong="l:H0398" x-morph="He,R:Vqc"\w* \w וְ⁠לִ⁠שְׁתּ֖וֹת|lemma="שָׁתָה" strong="c:l:H8354" x-morph="He,C:R:Vqc"\w* \w עִמָּ⁠הֶֽם|lemma="עִם" strong="H5973a" x-morph="He,R:Sp3mp"\w*׃ @@ -162,7 +162,7 @@ \v 10 \w הֲ⁠לֹֽא|lemma="לֹא" strong="i:H3808" x-morph="He,Ti:Tn"\w*־\w אַ֠תָּה|lemma="אַתָּה" strong="H0859a" x-morph="He,Pp2ms"\w* -\f + \ft K \w את|lemma="אַתְּ" strong="H0859b" x-morph="He,Pp2fs"\w*\f* +\f + \ft K \+w את|lemma="אַתְּ" strong="H0859b" x-morph="He,Pp2fs"\+w*\f* \w שַׂ֣כְתָּ|lemma="שׂוּךְ" strong="H7753" x-morph="He,Vqp2ms"\w* \w בַעֲד֧⁠וֹ|lemma="בְּעַד" strong="H1157" x-morph="He,R:Sp3ms"\w* \w וּ⁠בְעַד|lemma="בְּעַד" strong="c:H1157" x-morph="He,C:R"\w*־\w בֵּית֛⁠וֹ|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/house"\w* @@ -335,7 +335,7 @@ \w וַ⁠יֹּאמֶר֩|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w* \w עָרֹ֨ם|lemma="עָרוֹם" strong="H6174" x-morph="He,Aamsa"\w* \w יָצָ֜אתִי|lemma="יָצָא" strong="H3318" x-morph="He,Vqp1cs" x-tw="rc://*/tw/dict/bible/other/know"\w* -\f + \ft K \w יצתי|lemma="יָצָא" strong="H3318" x-morph="He,Vqp1cs"\w*\f* +\f + \ft K \+w יצתי|lemma="יָצָא" strong="H3318" x-morph="He,Vqp1cs"\+w*\f* \w מִ⁠בֶּ֣טֶן|lemma="בֶּטֶן" strong="m:H0990" x-morph="He,R:Ncfsc"\w* \w אִמִּ֗⁠י|lemma="אֵם" strong="H0517" x-morph="He,Ncfsc:Sp1cs"\w* \w וְ⁠עָרֹם֙|lemma="עָרוֹם" strong="c:H6174" x-morph="He,C:Aamsa"\w* @@ -466,7 +466,7 @@ \w מִ⁠כַּ֥ף|lemma="כַּף" strong="m:H3709" x-morph="He,R:Ncfsc" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w רַגְל֖⁠וֹ|lemma="רֶגֶל" strong="H7272" x-morph="He,Ncfsc:Sp3ms"\w* \w עד|lemma="עַד" strong="H5704" x-morph="He,R"\w* -\f + \ft Q \w וְעַ֥ד|lemma="עַד" strong="H5704" x-morph="He,R"\w*\f* +\f + \ft Q \+w וְעַ֥ד|lemma="עַד" strong="H5704" x-morph="He,R"\+w*\f* \w קָדְקֳדֽ⁠וֹ|lemma="קׇדְקֹד" strong="H6936" x-morph="He,Ncmsc:Sp3ms"\w*׃ \v 8 @@ -1142,7 +1142,7 @@ \w וְ⁠יֶחְבָּ֑שׁ|lemma="חָבַשׁ" strong="c:H2280" x-morph="He,C:Vqi3ms"\w* \w יִ֝מְחַ֗ץ|lemma="מָחַץ" strong="H4272" x-morph="He,Vqi3ms"\w* \w וְיָדָיו|lemma="יָד" strong="c:H3027" x-morph="He,C:Ncbdc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/hand"\w* -\f + \ft K \w ו⁠יד⁠ו|lemma="יָד" strong="c:H3027" x-morph="He,C:Ncbsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠יד⁠ו|lemma="יָד" strong="c:H3027" x-morph="He,C:Ncbsc:Sp3ms"\+w*\f* \w תִּרְפֶּֽינָה|lemma="רָפָא" strong="H7495" x-morph="He,Vqi3fp"\w*׃ \v 19 @@ -1235,7 +1235,7 @@ \w יִשָּׁקֵ֣ל|lemma="שָׁקַל" strong="H8254" x-morph="He,VNi3ms"\w* \w כַּעְשִׂ֑⁠י|lemma="כַּעַס" strong="H3708b" x-morph="He,Ncmsc:Sp1cs"\w* \w וְ֝הַוָּתִ֗י|lemma="הַיָּה" strong="c:H1962" x-morph="He,C:Ncfsc:Sp1cs"\w* -\f + \ft K \w ו⁠הית⁠י|lemma="הַיָּה" strong="c:H1962" x-morph="He,C:Ncfsc:Sp1cs"\w*\f* +\f + \ft K \+w ו⁠הית⁠י|lemma="הַיָּה" strong="c:H1962" x-morph="He,C:Ncfsc:Sp1cs"\+w*\f* \w בְּֽ⁠מֹאזְנַ֥יִם|lemma="מֹאזֵן" strong="b:H3976" x-morph="He,R:Ncmda"\w* \w יִשְׂאוּ|lemma="נָשָׂא" strong="H5375" x-morph="He,Vqi3mp"\w*־\w יָֽחַד|lemma="יַחַד" strong="H3162a" x-morph="He,Ncmsa"\w*׃ @@ -1393,7 +1393,7 @@ \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w עַ֭תָּה|lemma="עַתָּה" strong="H6258" x-morph="He,D"\w* \w הֱיִ֣יתֶם|lemma="הָיָה" strong="H1961" x-morph="He,Vqp2mp"\w* \w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* -\f + \ft Q \w ל֑וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w*\f* +\f + \ft Q \+w ל֑וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\+w*\f* \w תִּֽרְא֥וּ|lemma="רָאָה" strong="H7200" x-morph="He,Vqi2mp"\w* \w חֲ֝תַ֗ת|lemma="חֲתַת" strong="H2866" x-morph="He,Ncmsa"\w* \w וַ⁠תִּירָֽאוּ|lemma="יָרֵא" strong="c:H3372" x-morph="He,C:Vqw2mp" x-tw="rc://*/tw/dict/bible/kt/fear"\w*׃ @@ -1454,7 +1454,7 @@ \w אַל|lemma="אַל" strong="H0408" x-morph="He,Tn"\w*־\w תְּהִ֣י|lemma="הָיָה" strong="H1961" x-morph="He,Vqj3fs"\w* \w עַוְלָ֑ה|lemma="עֶוֶל" strong="H5766b" x-morph="He,Ncbsa"\w* \w וְשׁ֥וּבוּ|lemma="שׁוּב" strong="c:H7725" x-morph="He,C:Vqv2mp" x-tw="rc://*/tw/dict/bible/kt/restore"\w* -\f + \ft Q \w ו⁠שבי|lemma="שׁוּב" strong="c:H7725" x-morph="He,C:Vqv2fs"\w*\f* +\f + \ft Q \+w ו⁠שבי|lemma="שׁוּב" strong="c:H7725" x-morph="He,C:Vqv2fs"\+w*\f* \w ע֝וֹד|lemma="עוֹד" strong="H5750" x-morph="He,D"\w* \w צִדְקִ⁠י|lemma="צֶדֶק" strong="H6664" x-morph="He,Ncmsc:Sp1cs"\w*־\w בָֽ⁠הּ|lemma="" strong="b" x-morph="He,R:Sp3fs"\w*׃ @@ -1472,7 +1472,7 @@ \w הֲ⁠לֹא|lemma="לֹא" strong="i:H3808" x-morph="He,Ti:Tn"\w*־\w צָבָ֣א|lemma="צָבָא" strong="H6635a" x-morph="He,Ncbsa"\w* \w לֶ⁠אֱנ֣וֹשׁ|lemma="אֱנוֹשׁ" strong="l:H0582" x-morph="He,R:Ncmsa"\w* \w על|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w אָ֑רֶץ|lemma="אֶרֶץ" strong="H0776" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w* -\f + \ft Q \w עֲלֵי|lemma="עַל" strong="H5921a" x-morph="He,R"\w*\f* +\f + \ft Q \+w עֲלֵי|lemma="עַל" strong="H5921a" x-morph="He,R"\+w*\f* \w וְ⁠כִ⁠ימֵ֖י|lemma="יוֹם" strong="c:k:H3117" x-morph="He,C:R:Ncmpc"\w* \w שָׂכִ֣יר|lemma="שָׂכִיר" strong="H7916" x-morph="He,Aamsa"\w* \w יָמָֽי⁠ו|lemma="יוֹם" strong="H3117" x-morph="He,Ncmpc:Sp3ms"\w*׃ @@ -1508,7 +1508,7 @@ \w בְּשָׂרִ֣⁠י|lemma="בָּשָׂר" strong="H1320" x-morph="He,Ncmsc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/flesh"\w* \w רִ֭מָּה|lemma="רִמָּה" strong="H7415" x-morph="He,Ncfsa"\w* \w וְג֣וּשׁ|lemma="גּוּשׁ" strong="c:H1487" x-morph="He,C:Ncmsc"\w* -\f + \ft K \w ו⁠גיש|lemma="גּוּשׁ" strong="c:H1487" x-morph="He,C:Ncmsc"\w*\f* +\f + \ft K \+w ו⁠גיש|lemma="גּוּשׁ" strong="c:H1487" x-morph="He,C:Ncmsc"\+w*\f* \w עָפָ֑ר|lemma="עָפָר" strong="H6083" x-morph="He,Ncmsa"\w* \w עוֹרִ֥⁠י|lemma="עוֹר" strong="H5785" x-morph="He,Ncmsc:Sp1cs"\w* \w רָ֝גַ֗ע|lemma="רָגַע" strong="H7280c" x-morph="He,Vqp3ms"\w* @@ -1939,7 +1939,7 @@ \w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w יָשִׁ֣יב|lemma="שׁוּב" strong="H7725" x-morph="He,Vhi3ms" x-tw="rc://*/tw/dict/bible/kt/restore"\w* \w אַפּ֑⁠וֹ|lemma="אַף" strong="H0639" x-morph="He,Ncmsc:Sp3ms"\w* \w תחת⁠ו|lemma="תַּחַת" strong="H8478" x-morph="He,R:Sp3ms"\w* -\f + \ft Q \w תַּחְתָּ֥יו|lemma="תַּחַת" strong="H8478" x-morph="He,Ncmpc:Sp3ms"\w*\f* +\f + \ft Q \+w תַּחְתָּ֥יו|lemma="תַּחַת" strong="H8478" x-morph="He,Ncmpc:Sp3ms"\+w*\f* \w שָׁ֝חֲח֗וּ|lemma="שָׁחַח" strong="H7817" x-morph="He,Vqp3cp"\w* \w עֹ֣זְרֵי|lemma="עָזַר" strong="H5826" x-morph="He,Vqrmpc"\w* \w רָֽהַב|lemma="רַהַב" strong="H7293" x-morph="He,Np"\w*׃ @@ -2073,7 +2073,7 @@ \v 30 \w אִם|lemma="אִם" strong="H0518a" x-morph="He,C"\w*־\w הִתְרָחַ֥צְתִּי|lemma="רָחַץ" strong="H7364" x-morph="He,Vtp1cs"\w* \w בְמֵי|lemma="בְּמוֹ" strong="H4325" x-morph="He,R:Ncmpc"\w*־\w שָׁ֑לֶג|lemma="שֶׁלֶג" strong="H7950" x-morph="He,Ncmsa"\w* -\f + \ft K \w במו|lemma="בְּמוֹ" strong="H1119" x-morph="He,R"\w*\f* +\f + \ft K \+w במו|lemma="בְּמוֹ" strong="H1119" x-morph="He,R"\+w*\f* \w וַ֝⁠הֲזִכּ֗וֹתִי|lemma="זָכַךְ" strong="c:H2141" x-morph="He,C:Vhq1cs"\w* \w בְּ⁠בֹ֣ר|lemma="בֹּר" strong="b:H1253" x-morph="He,R:Ncmsa"\w* \w כַּפָּֽ⁠י|lemma="כַּף" strong="H3709" x-morph="He,Ncfdc:Sp1cs" x-tw="rc://*/tw/dict/bible/other/hand"\w*׃ @@ -2284,9 +2284,9 @@ \w הֲ⁠לֹא|lemma="לֹא" strong="i:H3808" x-morph="He,Ti:Tn"\w*־\w מְעַ֣ט|lemma="מְעַט" strong="H4592" x-morph="He,Ncmsa"\w* \w יָמַ֣⁠י|lemma="יוֹם" strong="H3117" x-morph="He,Ncmpc:Sp1cs"\w* \w וַחֲדָ֑ל|lemma="חָדַל" strong="H2308" x-morph="He,Vqv2ms"\w* -\f + \ft K \w יחדל|lemma="חָדַל" strong="H2308" x-morph="He,C:Vqj3ms"\w*\f* +\f + \ft K \+w יחדל|lemma="חָדַל" strong="H2308" x-morph="He,C:Vqj3ms"\+w*\f* \w וְשִׁ֥ית|lemma="שִׁית" strong="H7896" x-morph="He,Vqv2ms"\w* -\f + \ft K \w ישית|lemma="שִׁית" strong="H7896" x-morph="He,Vqj3ms"\w*\f* +\f + \ft K \+w ישית|lemma="שִׁית" strong="H7896" x-morph="He,Vqj3ms"\+w*\f* \w מִ֝מֶּ֗⁠נִּי|lemma="מִן" strong="H4480a" x-morph="He,R:Sp1cs"\w* \w וְ⁠אַבְלִ֥יגָה|lemma="בָּלַג" strong="c:H1082" x-morph="He,C:Vhh1cs"\w* \w מְּעָֽט|lemma="מְעַט" strong="H4592" x-morph="He,D"\w*׃ @@ -2814,7 +2814,7 @@ \w הֵ֣ן|lemma="הֵן" strong="H2005" x-morph="He,Tm"\w* \w יִ֭קְטְלֵ⁠נִי|lemma="קָטַל" strong="H6991" x-morph="He,Vqi3ms:Sp1cs"\w* \w ל֣וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* -\f + \ft K \w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*\f* +\f + \ft K \+w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\+w*\f* \w אֲיַחֵ֑ל|lemma="יָחַל" strong="H3176" x-morph="He,Vpi1cs"\w* \w אַךְ|lemma="אַךְ" strong="H0389" x-morph="He,Ta"\w*־\w דְּ֝רָכַ֗⁠י|lemma="דֶּרֶךְ" strong="H1870" x-morph="He,Ncbpc:Sp1cs"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w פָּנָ֥י⁠ו|lemma="פָּנִים" strong="H6440" x-morph="He,Ncbpc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/face"\w* @@ -2967,7 +2967,7 @@ \w מִֽסְפַּר|lemma="מִסְפָּר" strong="H4557" x-morph="He,Ncmsc"\w*־\w חֳדָשָׁ֥י⁠ו|lemma="חֹדֶשׁ" strong="H2320" x-morph="He,Ncmpc:Sp3ms"\w* \w אִתָּ֑⁠ךְ|lemma="אֵת" strong="H0854" x-morph="He,R:Sp2fs"\w* \w חק⁠ו|lemma="חֹק" strong="H2706" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/statute"\w* -\f + \ft Q \w חֻקָּ֥יו|lemma="חֹק" strong="H2706" x-morph="He,Ncmpc:Sp3ms"\w*\f* +\f + \ft Q \+w חֻקָּ֥יו|lemma="חֹק" strong="H2706" x-morph="He,Ncmpc:Sp3ms"\+w*\f* \w עָ֝שִׂ֗יתָ|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqp2ms"\w* \w וְ⁠לֹ֣א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w* \w יַעֲבֽוֹר|lemma="עָבַר" strong="H5674a" x-morph="He,Vqi3ms"\w*׃ @@ -3237,7 +3237,7 @@ \v 15 \w הֵ֣ן|lemma="הֵן" strong="H2005" x-morph="He,Tm"\w* \w בִּ֭/קְדֹשָׁיו|lemma="קָדוֹשׁ" strong="b:H6918" x-morph="He,R:Aampc:Sp3ms"\w* -\f + \ft K \w ב⁠קדש⁠ו|lemma="קָדוֹשׁ" strong="b:H6918" x-morph="He,R:Aamsc:Sp3ms"\w*\f* +\f + \ft K \+w ב⁠קדש⁠ו|lemma="קָדוֹשׁ" strong="b:H6918" x-morph="He,R:Aamsc:Sp3ms"\+w*\f* \w לֹ֣א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w יַאֲמִ֑ין|lemma="אָמַן" strong="H0539" x-morph="He,Vhi3ms" x-tw="rc://*/tw/dict/bible/kt/faithful"\w* \w וְ֝⁠שָׁמַ֗יִם|lemma="שָׁמַיִם" strong="c:H8064" x-morph="He,C:Ncmpa"\w* @@ -3296,7 +3296,7 @@ \w שׁ֭וּב|lemma="שׁוּב" strong="H7725" x-morph="He,Vqc" x-tw="rc://*/tw/dict/bible/kt/restore"\w* \w מִנִּי|lemma="מִן" strong="H4480a" x-morph="He,R"\w*־\w חֹ֑שֶׁךְ|lemma="חֹשֶׁךְ" strong="H2822" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/darkness"\w* \w וְצָפ֖וּי|lemma="צָפָה" strong="c:H6822" x-morph="He,C:Vqsmsa"\w* -\f + \ft K \w ו⁠צפו|lemma="צָפָה" strong="c:H6822" x-morph="He,C:Vqsmsa"\w*\f* +\f + \ft K \+w ו⁠צפו|lemma="צָפָה" strong="c:H6822" x-morph="He,C:Vqsmsa"\+w*\f* \w ה֣וּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w* \w אֱלֵי|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w חָֽרֶב|lemma="חֶרֶב" strong="H2719" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/other/sword"\w*׃ @@ -3374,7 +3374,7 @@ \v 31 \w אַל|lemma="אַל" strong="H0408" x-morph="He,Tn"\w*־\w יַאֲמֵ֣ן|lemma="אָמַן" strong="H0539" x-morph="He,Vhj3ms" x-tw="rc://*/tw/dict/bible/kt/faithful"\w* \w ב⁠שו|lemma="שָׁוְא" strong="b:H7723" x-morph="He,Rd:Ncmsa"\w* -\f + \ft Q \w בַּשָּׁ֣יו|lemma="שָׁוְא" strong="b:H7723" x-morph="He,Rd:Ncmsa"\w*\f* +\f + \ft Q \+w בַּשָּׁ֣יו|lemma="שָׁוְא" strong="b:H7723" x-morph="He,Rd:Ncmsa"\+w*\f* \w נִתְעָ֑ה|lemma="תָּעָה" strong="H8582" x-morph="He,VNp3ms"\w* \w כִּי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w שָׁ֝֗וְא|lemma="שָׁוְא" strong="H7723" x-morph="He,Ncmsa"\w* \w תִּהְיֶ֥ה|lemma="הָיָה" strong="H1961" x-morph="He,Vqi3fs"\w* @@ -3559,7 +3559,7 @@ \v 16 \w פָּנַ֣⁠י|lemma="פָּנִים" strong="H6440" x-morph="He,Ncbpc:Sp1cs" x-tw="rc://*/tw/dict/bible/other/face"\w* \w חמרמרה|lemma="חָמַר" strong="H2560c" x-morph="He,Vjp3fs"\w* -\f + \ft Q \w חֳ֭מַרְמְרוּ|lemma="חָמַר" strong="H2560c" x-morph="He,Vjp3cp"\w*\f* +\f + \ft Q \+w חֳ֭מַרְמְרוּ|lemma="חָמַר" strong="H2560c" x-morph="He,Vjp3cp"\+w*\f* \w מִנִּי|lemma="מִן" strong="H4480a" x-morph="He,R"\w*־\w בֶ֑כִי|lemma="בְּכִי" strong="H1065" x-morph="He,Ncmsa"\w* \w וְ⁠עַ֖ל|lemma="עַל" strong="c:H5921a" x-morph="He,C:R"\w* \w עַפְעַפַּ֣⁠י|lemma="עַפְעַף" strong="H6079" x-morph="He,Ncmdc:Sp1cs"\w* @@ -4157,7 +4157,7 @@ \w לְמַ֖עַן|lemma="מַעַן" strong="H4616" x-morph="He,R"\w* \w תֵּדְע֣וּ⁠ן|lemma="יָדַע" strong="H3045" x-morph="He,Vqi2mp:Sn" x-tw="rc://*/tw/dict/bible/other/know"\w* \w ש⁠דין|lemma="דִּין" strong="s:H1779" x-morph="He,Tr:Ncmsa"\w*׃ס -\f + \ft Q \w שַׁדּֽוּן|lemma="דִּין" strong="s:H1779" x-morph="He,Tr:Ncmsa"\w*\f* +\f + \ft Q \+w שַׁדּֽוּן|lemma="דִּין" strong="s:H1779" x-morph="He,Tr:Ncmsa"\+w*\f* \c 20 \p @@ -4248,7 +4248,7 @@ \w עַ֭צְמוֹתָי⁠ו|lemma="עֶצֶם" strong="H6106" x-morph="He,Ncfpc:Sp3ms"\w* \w מָלְא֣וּ|lemma="מָלֵא" strong="H4390" x-morph="He,Vqp3cp"\w* \w עלומ⁠ו|lemma="עָלוּם" strong="H5934" x-morph="He,Ncmsc:Sp3ms"\w* -\f + \ft Q \w עֲלוּמָ֑יו|lemma="עָלוּם" strong="H5934" x-morph="He,Ncmpc:Sp3ms"\w*\f* +\f + \ft Q \+w עֲלוּמָ֑יו|lemma="עָלוּם" strong="H5934" x-morph="He,Ncmpc:Sp3ms"\+w*\f* \w וְ֝⁠עִמּ֗⁠וֹ|lemma="עִם" strong="c:H5973a" x-morph="He,C:R:Sp3ms"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w עָפָ֥ר|lemma="עָפָר" strong="H6083" x-morph="He,Ncmsa"\w* \w תִּשְׁכָּֽב|lemma="שָׁכַב" strong="H7901" x-morph="He,Vqi3fs"\w*׃ @@ -4507,7 +4507,7 @@ \v 13 \w יבלו|lemma="בָּלָה" strong="H1086" x-morph="He,Vpi3mp"\w* -\f + \ft Q \w יְכַלּ֣וּ|lemma="בָּלָה" strong="H3615" x-morph="He,Vpi3mp"\w*\f* +\f + \ft Q \+w יְכַלּ֣וּ|lemma="בָּלָה" strong="H3615" x-morph="He,Vpi3mp"\+w*\f* \w בַ⁠טּ֣וֹב|lemma="טוֹב" strong="b:H2896b" x-morph="He,Rd:Aamsa"\w* \w יְמֵי⁠הֶ֑ם|lemma="יוֹם" strong="H3117" x-morph="He,Ncmpc:Sp3mp"\w* \w וּ֝⁠בְ⁠רֶ֗גַע|lemma="רֶגַע" strong="c:b:H7281" x-morph="He,C:R:Ncmsa"\w* @@ -4571,7 +4571,7 @@ \v 20 \w יִרְא֣וּ|lemma="רָאָה" strong="H7200" x-morph="He,Vqi3mp"\w* \w עֵינָ֣יו|lemma="עַיִן" strong="H5869a" x-morph="He,Ncbdc:Sp3ms"\w* -\f + \ft K \w עינ⁠ו|lemma="עַיִן" strong="H5869a" x-morph="He,Ncbsc:Sp3ms"\w*\f* +\f + \ft K \+w עינ⁠ו|lemma="עַיִן" strong="H5869a" x-morph="He,Ncbsc:Sp3ms"\+w*\f* \w כִּיד֑⁠וֹ|lemma="כִּיד" strong="H3589" x-morph="He,Ncmsc:Sp3ms"\w* \w וּ⁠מֵ⁠חֲמַ֖ת|lemma="חֵמָה" strong="c:m:H2534" x-morph="He,C:R:Ncfsc"\w* \w שַׁדַּ֣י|lemma="שַׁדַּי" strong="H7706" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/almighty"\w* @@ -5082,7 +5082,7 @@ \w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w נִצְפְּנ֣וּ|lemma="צָפַן" strong="H6845" x-morph="He,VNp3cp"\w* \w עִתִּ֑ים|lemma="עֵת" strong="H6256" x-morph="He,Ncbpa"\w* \w וְ֝יֹדְעָ֗יו|lemma="יָדַע" strong="c:H3045" x-morph="He,C:Vqrmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/know"\w* -\f + \ft K \w ו⁠ידע⁠ו|lemma="יָדַע" strong="c:H3045" x-morph="He,C:Vqrmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠ידע⁠ו|lemma="יָדַע" strong="c:H3045" x-morph="He,C:Vqrmsc:Sp3ms"\+w*\f* \w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w חָ֥זוּ|lemma="חָזָה" strong="H2372" x-morph="He,Vqp3cp"\w* \w יָמָֽי⁠ו|lemma="יוֹם" strong="H3117" x-morph="He,Ncmpc:Sp3ms"\w*׃ @@ -5126,7 +5126,7 @@ \w בַּ֭⁠שָּׂדֶה|lemma="שָׂדֶה" strong="b:H7704b" x-morph="He,Rd:Ncmsa"\w* \w בְּלִיל֣⁠וֹ|lemma="בְּלִיל" strong="H1098" x-morph="He,Ncmsc:Sp3ms"\w* \w יִקְצ֑וֹרוּ|lemma="קָצַר" strong="H7114b" x-morph="He,Vqi3mp" x-tw="rc://*/tw/dict/bible/other/harvest"\w* -\f + \ft K \w יקצירו|lemma="קָצַר" strong="H7114b" x-morph="He,Vhi3mp"\w*\f* +\f + \ft K \+w יקצירו|lemma="קָצַר" strong="H7114b" x-morph="He,Vhi3mp"\+w*\f* \w וְ⁠כֶ֖רֶם|lemma="כֶּרֶם" strong="c:H3754" x-morph="He,C:Ncbsa" x-tw="rc://*/tw/dict/bible/other/vineyard"\w* \w רָשָׁ֣ע|lemma="רָשָׁע" strong="H7563" x-morph="He,Aamsa"\w* \w יְלַקֵּֽשׁוּ|lemma="לָקַשׁ" strong="H3953" x-morph="He,Vpi3mp"\w*׃ @@ -5441,7 +5441,7 @@ \w רָגַ֣ע|lemma="רָגַע" strong="H7280a" x-morph="He,Vqp3ms"\w* \w הַ⁠יָּ֑ם|lemma="יָם" strong="d:H3220" x-morph="He,Td:Ncmsa"\w* \w וּ֝בִתְבוּנָת֗וֹ|lemma="תָּבוּן" strong="c:b:H8394" x-morph="He,C:R:Ncfsc:Sp3ms"\w* -\f + \ft K \w ו⁠ב⁠תובנת⁠ו|lemma="תָּבוּן" strong="c:b:H8394" x-morph="He,C:R:Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠ב⁠תובנת⁠ו|lemma="תָּבוּן" strong="c:b:H8394" x-morph="He,C:R:Ncfsc:Sp3ms"\+w*\f* \w מָ֣חַץ|lemma="מָחַץ" strong="H4272" x-morph="He,Vqp3ms"\w* \w רָֽהַב|lemma="רַהַב" strong="H7293" x-morph="He,Np"\w*׃ @@ -5458,13 +5458,13 @@ \w הֶן|lemma="הֵן" strong="H2005" x-morph="He,Tj"\w*־\w אֵ֤לֶּה|lemma="אֵלֶּה" strong="H0428" x-morph="He,Pdxcp"\w* ׀ \w קְצ֬וֹת|lemma="קָצָה" strong="H7098" x-morph="He,Ncbpc"\w* \w דְּרָכָ֗יו|lemma="דֶּרֶךְ" strong="H1870" x-morph="He,Ncbpc:Sp3ms"\w* -\f + \ft K \w דרכ⁠ו|lemma="דֶּרֶךְ" strong="H1870" x-morph="He,Ncbpc:Sp3ms"\w*\f* +\f + \ft K \+w דרכ⁠ו|lemma="דֶּרֶךְ" strong="H1870" x-morph="He,Ncbpc:Sp3ms"\+w*\f* \w וּ⁠מַה|lemma="מָה" strong="c:H4100" x-morph="He,C:Ti"\w*־\w שֵּׁ֣מֶץ|lemma="שֶׁמֶץ" strong="H8102" x-morph="He,Ncmsc"\w* \w דָּ֭בָר|lemma="דָּבָר" strong="H1697" x-morph="He,Ncmsa"\w* \w נִשְׁמַע|lemma="שָׁמַע" strong="H8085" x-morph="He,Vqi1cp"\w*־\w בּ֑⁠וֹ|lemma="" strong="b" x-morph="He,R:Sp3ms"\w* \w וְ⁠רַ֥עַם|lemma="רַעַם" strong="c:H7482" x-morph="He,C:Ncmsc"\w* \w גְּ֝בוּרוֹתָ֗יו|lemma="גְּבוּרָה" strong="H1369" x-morph="He,Ncfpc:Sp3ms"\w* -\f + \ft K \w גבורת⁠ו|lemma="גְּבוּרָה" strong="H1369" x-morph="He,Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w גבורת⁠ו|lemma="גְּבוּרָה" strong="H1369" x-morph="He,Ncfsc:Sp3ms"\+w*\f* \w מִ֣י|lemma="מִי" strong="H4310" x-morph="He,Ti"\w* \w יִתְבּוֹנָֽן|lemma="בִּין" strong="H0995" x-morph="He,Vri3ms" x-tw="rc://*/tw/dict/bible/other/understand"\w*׃ס @@ -5591,7 +5591,7 @@ \v 15 \w שְׂ֭רִידָיו|lemma="שָׂרִיד" strong="H8300" x-morph="He,Ncmsc:Sp3ms"\w* -\f + \ft K \w שריד⁠ו|lemma="שָׂרִיד" strong="H8300" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w שריד⁠ו|lemma="שָׂרִיד" strong="H8300" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w בַּ⁠מָּ֣וֶת|lemma="מָוֶת" strong="b:H4194" x-morph="He,Rd:Ncmsa"\w* \w יִקָּבֵ֑רוּ|lemma="קָבַר" strong="H6912" x-morph="He,VNi3mp" x-tw="rc://*/tw/dict/bible/other/bury"\w* \w וְ֝⁠אַלְמְנֹתָ֗י⁠ו|lemma="אַלְמָנָה" strong="c:H0490" x-morph="He,C:Ncfpc:Sp3ms"\w* @@ -6205,7 +6205,7 @@ \v 11 \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w יִתְרִ֣י|lemma="יֶתֶר" strong="H3499b" x-morph="He,Ncmsc:Sp1cs"\w* -\f + \ft K \w יתר⁠ו|lemma="יֶתֶר" strong="H3499b" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w יתר⁠ו|lemma="יֶתֶר" strong="H3499b" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w פִ֭תַּח|lemma="פָּתַח" strong="H6605a" x-morph="He,Vpp3ms"\w* \w וַ⁠יְעַנֵּ֑⁠נִי|lemma="עָנָה" strong="c:H6031b" x-morph="He,C:Vpw3ms:Sp1cs"\w* \w וְ֝⁠רֶ֗סֶן|lemma="רֶסֶן" strong="c:H7448" x-morph="He,C:Ncmsa"\w* @@ -6306,7 +6306,7 @@ \w תַּרְכִּיבֵ֑⁠נִי|lemma="רָכַב" strong="H7392" x-morph="He,Vhi2ms:Sp1cs"\w* \w וּ֝⁠תְמֹגְגֵ֗⁠נִי|lemma="מוּג" strong="c:H4127" x-morph="He,C:Voi2ms:Sp1cs"\w* \w תּוּשִׁיָּֽה|lemma="תּוּשִׁיָּה" strong="H8454" x-morph="He,Ncfsa"\w*׃ -\f + \ft K \w תשוה|lemma="שָׁוָה" strong="H7738" x-morph="He,VPi2ms"\w*\f* +\f + \ft K \+w תשוה|lemma="שָׁוָה" strong="H7738" x-morph="He,VPi2ms"\+w*\f* \v 23 \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w יָ֭דַעְתִּי|lemma="יָדַע" strong="H3045" x-morph="He,Vqp1cs" x-tw="rc://*/tw/dict/bible/other/know"\w* @@ -6469,10 +6469,10 @@ \v 11 \w כִּי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w הִ֥יא|lemma="הִיא" strong="H1992" x-morph="He,Pp3fs"\w* -\f + \ft K \w הוא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w*\f* +\f + \ft K \+w הוא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\+w*\f* \w זִמָּ֑ה|lemma="זִמָּה" strong="H2154" x-morph="He,Ncfsa"\w* \w וְ֝ה֗וּא|lemma="הוּא" strong="c:H1931" x-morph="He,C:Pp3ms"\w* -\f + \ft K \w ו⁠היא|lemma="הוּא" strong="H1931" x-morph="He,C:Pp3fs"\w*\f* +\f + \ft K \+w ו⁠היא|lemma="הוּא" strong="H1931" x-morph="He,C:Pp3fs"\+w*\f* \w עָוֺ֥ן|lemma="עָוֺן" strong="H5771" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/kt/iniquity"\w* \w פְּלִילִֽים|lemma="פָּלִיל" strong="H6414" x-morph="He,Ncmpa"\w*׃ @@ -6548,7 +6548,7 @@ \w אִם|lemma="אִם" strong="H0518a" x-morph="He,C"\w*־\w לֹ֣א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w בֵרֲכ֣וּ⁠נִי|lemma="בָּרַךְ" strong="H1288" x-morph="He,Vpp3cp:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/bless"\w* \w חֲלָצָ֑יו|lemma="חָלָץ" strong="H2504" x-morph="He,Ncbdc:Sp3ms"\w* -\f + \ft K \w חלצ⁠ו|lemma="חָלָץ" strong="H2504" x-morph="He,Ncbsc:Sp3ms"\w*\f* +\f + \ft K \+w חלצ⁠ו|lemma="חָלָץ" strong="H2504" x-morph="He,Ncbsc:Sp3ms"\+w*\f* \w וּ⁠מִ⁠גֵּ֥ז|lemma="גֵּז" strong="c:m:H1488" x-morph="He,C:R:Ncmsc"\w* \w כְּ֝בָשַׂ⁠י|lemma="כֶּבֶשׂ" strong="H3532" x-morph="He,Ncmpc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/lamb"\w* \w יִתְחַמָּֽם|lemma="חָמַם" strong="H2552" x-morph="He,Vti3ms"\w*׃ @@ -7099,7 +7099,7 @@ \w בְּ֭⁠מַכְאוֹב|lemma="מַכְאֹב" strong="b:H4341" x-morph="He,R:Ncmsa"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w מִשְׁכָּב֑⁠וֹ|lemma="מִשְׁכָּב" strong="H4904" x-morph="He,Ncmsc:Sp3ms"\w* \w וְר֖וֹב|lemma="רֹב" strong="c:H7230" x-morph="He,C:Ncbsc"\w* -\f + \ft K \w ו⁠ריב|lemma="רִיב" strong="c:H7379" x-morph="He,C:Ncbsc"\w*\f* +\f + \ft K \+w ו⁠ריב|lemma="רִיב" strong="c:H7379" x-morph="He,C:Ncbsc"\+w*\f* \w עֲצָמָ֣י⁠ו|lemma="עֶצֶם" strong="H6106" x-morph="He,Ncfpc:Sp3ms"\w* \w אֵתָֽן|lemma="אֵיתָן" strong="H0386" x-morph="He,Aamsa"\w*׃ @@ -7116,7 +7116,7 @@ \w בְּשָׂר֣⁠וֹ|lemma="בָּשָׂר" strong="H1320" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/flesh"\w* \w מֵ⁠רֹ֑אִי|lemma="רֳאִי" strong="m:H7210" x-morph="He,R:Ncmsa"\w* \w וְשֻׁפּ֥וּ|lemma="שָׁפָה" strong="c:H8192" x-morph="He,C:VPq3cp"\w* -\f + \ft K \w ו⁠שפי|lemma="שְׁפִי" strong="c:H8205" x-morph="He,C:Ncmsc"\w*\f* +\f + \ft K \+w ו⁠שפי|lemma="שְׁפִי" strong="c:H8205" x-morph="He,C:Ncmsc"\+w*\f* \w עַ֝צְמוֹתָ֗י⁠ו|lemma="עֶצֶם" strong="H6106" x-morph="He,Ncfpc:Sp3ms"\w* \w לֹ֣א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w רֻאּֽוּ|lemma="רָאָה" strong="H7200" x-morph="He,VQp3cp"\w*׃ @@ -7180,11 +7180,11 @@ \v 28 \w פָּדָ֣ה|lemma="פָּדָה" strong="H6299" x-morph="He,Vqp3ms" x-tw="rc://*/tw/dict/bible/kt/redeem"\w* \w נַ֭פְשׁוֹ|lemma="נֶפֶשׁ" strong="H5315" x-morph="He,Ncbsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/life"\w* -\f + \ft K \w נפש⁠י|lemma="נֶפֶשׁ" strong="H5315" x-morph="He,Ncbsc:Sp1cs"\w*\f* +\f + \ft K \+w נפש⁠י|lemma="נֶפֶשׁ" strong="H5315" x-morph="He,Ncbsc:Sp1cs"\+w*\f* \w מֵ⁠עֲבֹ֣ר|lemma="עָבַר" strong="m:H5674a" x-morph="He,R:Vqc"\w* \w בַּ⁠שָּׁ֑חַת|lemma="שַׁחַת" strong="b:H7845" x-morph="He,Rd:Ncfsa"\w* \w וְ֝חַיָּתוֹ|lemma="חַי" strong="c:H2416c" x-morph="He,C:Ncfsc:Sp3ms"\w* -\f + \ft K \w ו⁠חית⁠י|lemma="חַי" strong="c:H2416c" x-morph="He,C:Ncfsc:Sp1cs"\w*\f* +\f + \ft K \+w ו⁠חית⁠י|lemma="חַי" strong="c:H2416c" x-morph="He,C:Ncfsc:Sp1cs"\+w*\f* \w בָּ⁠א֥וֹר|lemma="אוֹר" strong="b:H0216" x-morph="He,Rd:Ncbsa"\w* \w תִּרְאֶֽה|lemma="רָאָה" strong="H7200" x-morph="He,Vqi3fs"\w*׃ @@ -8034,7 +8034,7 @@ \w מְסִבּ֨וֹת|lemma="מֵסַב" strong="H4524" x-morph="He,Ncbpa"\w* ׀ \w מִתְהַפֵּ֣ךְ|lemma="הָפַךְ" strong="H2015" x-morph="He,Vtrmsa"\w* \w בְּתַחְבּוּלֹתָ֣יו|lemma="תַּחְבֻּלָה" strong="b:H8458" x-morph="He,R:Ncfpc:Sp3ms"\w* -\f + \ft K \w ב⁠תחבולת⁠ו|lemma="תַּחְבֻּלָה" strong="b:H8458" x-morph="He,R:Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w ב⁠תחבולת⁠ו|lemma="תַּחְבֻּלָה" strong="b:H8458" x-morph="He,R:Ncfsc:Sp3ms"\+w*\f* \w לְ⁠פָעֳלָ֑⁠ם|lemma="פֹּעַל" strong="l:H6467" x-morph="He,R:Vqc:Sp3mp"\w* \w כֹּ֖ל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsa"\w* \w אֲשֶׁ֥ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* @@ -8469,7 +8469,7 @@ \w לָ⁠עֹרֵ֗ב|lemma="עֹרֵב" strong="l:H6158" x-morph="He,Rd:Ncmsa"\w* \w צֵ֫יד֥⁠וֹ|lemma="צַיִד" strong="H6718b" x-morph="He,Ncmsc:Sp3ms"\w* \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w יְ֭לָדָיו|lemma="יֶלֶד" strong="H3206" x-morph="He,Ncmpc:Sp3ms"\w* -\f + \ft K \w ילד⁠ו|lemma="יֶלֶד" strong="H3206" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ילד⁠ו|lemma="יֶלֶד" strong="H3206" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w אֵ֣ל|lemma="אֵל" strong="H0410" x-morph="He,Ncmsa"\w* \w יְשַׁוֵּ֑עוּ|lemma="שָׁוַע" strong="H7768" x-morph="He,Vpi3mp"\w* \w יִ֝תְע֗וּ|lemma="תָּעָה" strong="H8582" x-morph="He,Vqi3mp"\w* @@ -8571,7 +8571,7 @@ \w הֲ⁠תַאֲמִ֣ין|lemma="אָמַן" strong="i:H0539" x-morph="He,Ti:Vhi2ms"\w* \w בּ֭⁠וֹ|lemma="" strong="b" x-morph="He,R:Sp3ms"\w* \w כִּי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w יָשִׁ֣יב|lemma="שׁוּב" strong="H7725" x-morph="He,Vhi3ms" x-tw="rc://*/tw/dict/bible/kt/restore"\w* -\f + \ft K \w ישוב|lemma="שׁוּב" strong="H7725" x-morph="He,Vqi3ms"\w*\f* +\f + \ft K \+w ישוב|lemma="שׁוּב" strong="H7725" x-morph="He,Vqi3ms"\+w*\f* \w זַרְעֶ֑⁠ךָ|lemma="זֶרַע" strong="H2233" x-morph="He,Ncmsc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/seed"\w* \w וְֽ⁠גָרְנְ⁠ךָ֥|lemma="גֹּרֶן" strong="c:H1637" x-morph="He,C:Ncbsc:Sp2ms"\w* \w יֶאֱסֹֽף|lemma="אָסַף" strong="H0622" x-morph="He,Vqi3ms" x-tw="rc://*/tw/dict/bible/other/assembly"\w*׃ @@ -8686,7 +8686,7 @@ \w יַֽאֲבֶר|lemma="אָבַר" strong="H0082" x-morph="He,Vhi3ms"\w*־\w נֵ֑ץ|lemma="נֵץ" strong="H5322b" x-morph="He,Ncmsa"\w* \w יִפְרֹ֖שׂ|lemma="פָּרַשׂ" strong="H6566" x-morph="He,Vqi3ms"\w* \w כְּנָפָ֣יו|lemma="כָּנָף" strong="H3671" x-morph="He,Ncfdc:Sp3ms"\w* -\f + \ft K \w כנפ⁠ו|lemma="כָּנָף" strong="H3671" x-morph="He,Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w כנפ⁠ו|lemma="כָּנָף" strong="H3671" x-morph="He,Ncfsc:Sp3ms"\+w*\f* \w לְ⁠תֵימָֽן|lemma="תֵּימָן" strong="l:H8486" x-morph="He,R:Ncfsa"\w*׃ \v 27 @@ -8713,7 +8713,7 @@ \v 30 \w וְאֶפְרֹחָ֥יו|lemma="אֶפְרֹחַ" strong="c:H0667" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠אפרח⁠ו|lemma="אֶפְרֹחַ" strong="c:H0667" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠אפרח⁠ו|lemma="אֶפְרֹחַ" strong="c:H0667" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w יְעַלְעוּ|lemma="עָלַע" strong="H5966" x-morph="He,Vpi3mp"\w*־\w דָ֑ם|lemma="דָּם" strong="H1818" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/kt/blood"\w* \w וּ⁠בַ⁠אֲשֶׁ֥ר|lemma="אֲשֶׁר" strong="c:b:H0834b" x-morph="He,C:R:Tr"\w* \w חֲ֝לָלִ֗ים|lemma="חָלָל" strong="H2491a" x-morph="He,Aampa"\w* @@ -8854,7 +8854,7 @@ \w כְמוֹ|lemma="כְּמוֹ" strong="H3644" x-morph="He,R"\w*־\w אָ֑רֶז|lemma="אֶרֶז" strong="H0730" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/cedar"\w* \w גִּידֵ֖י|lemma="גִּיד" strong="H1517" x-morph="He,Ncmpc"\w* \w פַחֲדָ֣יו|lemma="פַּחַד" strong="H6344" x-morph="He,Ncmdc:Sp3ms"\w* -\f + \ft K \w פחד⁠ו|lemma="פַּחַד" strong="H6344" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w פחד⁠ו|lemma="פַּחַד" strong="H6344" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w יְשֹׂרָֽגוּ|lemma="שָׂרַג" strong="H8276" x-morph="He,VPi3mp"\w*׃ \v 18 @@ -9016,7 +9016,7 @@ \v 12 \va 4\va* \w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w אַחֲרִ֥ישׁ|lemma="חָרַשׁ" strong="H2790b" x-morph="He,Vhi1cs" x-tw="rc://*/tw/dict/bible/other/tongue"\w* -\f + \ft Q \w לֽוֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w*\f* +\f + \ft Q \+w לֽוֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\+w*\f* \w בַּדָּ֑י⁠ו|lemma="בַּד" strong="H0907" x-morph="He,Ncmpc:Sp3ms"\w* \w וּ⁠דְבַר|lemma="דָּבָר" strong="c:H1697" x-morph="He,C:Ncmsc"\w*־\w גְּ֝בוּר֗וֹת|lemma="גְּבוּרָה" strong="H1369" x-morph="He,Ncfpa"\w* \w וְ⁠חִ֣ין|lemma="חִין" strong="c:H2433" x-morph="He,C:Ncmsc"\w* @@ -9227,7 +9227,7 @@ \v 2 \w יָ֭דַעְתִּי|lemma="יָדַע" strong="H3045" x-morph="He,Vqp1cs" x-tw="rc://*/tw/dict/bible/other/know"\w* -\f + \ft K \w ידעת|lemma="יָדַע" strong="H3045" x-morph="He,Vqp2ms"\w*\f* +\f + \ft K \+w ידעת|lemma="יָדַע" strong="H3045" x-morph="He,Vqp2ms"\+w*\f* \w כִּי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w כֹ֣ל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsa"\w* \w תּוּכָ֑ל|lemma="יָכֹל" strong="H3201" x-morph="He,Vqi2ms"\w* \w וְ⁠לֹא|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w*־\w יִבָּצֵ֖ר|lemma="בָּצַר" strong="H1219" x-morph="He,VNi3ms"\w* @@ -9349,7 +9349,7 @@ \w וַֽ⁠יהוָ֗ה|lemma="יְהֹוָה" strong="c:H3068" x-morph="He,C:Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w שָׁ֚ב|lemma="שׁוּב" strong="H7725" x-morph="He,Vqp3ms" x-tw="rc://*/tw/dict/bible/kt/restore"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w שבית|lemma="שְׁבוּת" strong="H7622" x-morph="He,Ncfsc" x-tw="rc://*/tw/dict/bible/other/captive"\w* -\f + \ft Q \w שְׁב֣וּת|lemma="שְׁבוּת" strong="H7622" x-morph="He,Ncfsc"\w*\f* +\f + \ft Q \+w שְׁב֣וּת|lemma="שְׁבוּת" strong="H7622" x-morph="He,Ncfsc"\+w*\f* \w אִיּ֔וֹב|lemma="אִיּוֹב" strong="H0347" x-morph="He,Np"\w* \w בְּ⁠הִֽתְפַּֽלְל֖⁠וֹ|lemma="פָּלַל" strong="b:H6419" x-morph="He,R:Vtc:Sp3ms"\w* \w בְּעַ֣ד|lemma="בְּעַד" strong="H1157" x-morph="He,R"\w* @@ -9365,7 +9365,7 @@ \w אֵ֠לָי⁠ו|lemma="אֵל" strong="H0413" x-morph="He,R:Sp3ms"\w* \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w אֶחָ֨י⁠ו|lemma="אָח" strong="H0251" x-morph="He,Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/brother"\w* \w וְ⁠כָל|lemma="כֹּל" strong="c:H3605" x-morph="He,C:Ncmsc"\w*־\w אַחְיוֹתָ֜יו|lemma="אָחוֹת" strong="H0269" x-morph="He,Ncfpc:Sp3ms"\w* -\f + \ft K \w אחיתי⁠ו|lemma="אָחוֹת" strong="H0269" x-morph="He,Ncfpc:Sp3ms"\w*\f* +\f + \ft K \+w אחיתי⁠ו|lemma="אָחוֹת" strong="H0269" x-morph="He,Ncfpc:Sp3ms"\+w*\f* \w וְ⁠כָל|lemma="כֹּל" strong="c:H3605" x-morph="He,C:Ncmsc"\w*־\w יֹדְעָ֣י⁠ו|lemma="יָדַע" strong="H3045" x-morph="He,Vqrmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/know"\w* \w לְ⁠פָנִ֗ים|lemma="פָּנִים" strong="l:H6440" x-morph="He,R:Ncbpa"\w* \w וַ⁠יֹּאכְל֨וּ|lemma="אָכַל" strong="c:H0398" x-morph="He,C:Vqw3mp" x-tw="rc://*/tw/dict/bible/other/devour"\w* @@ -9451,7 +9451,7 @@ \w וְ⁠אַרְבָּעִ֖ים|lemma="אַרְבָּעִים" strong="c:H0705" x-morph="He,C:Acbpa"\w* \w שָׁנָ֑ה|lemma="שָׁנֶה" strong="H8141" x-morph="He,Ncfsa"\w* \w ו⁠ירא|lemma="רָאָה" strong="c:H7200" x-morph="He,C:Vqw3ms"\w* -\f + \ft Q \w וַיִּרְאֶ֗ה|lemma="רָאָה" strong="c:H7200" x-morph="He,C:Vqw3ms"\w*\f* +\f + \ft Q \+w וַיִּרְאֶ֗ה|lemma="רָאָה" strong="c:H7200" x-morph="He,C:Vqw3ms"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w בָּנָי⁠ו֙|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w בְּנֵ֣י|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w בָנָ֔י⁠ו|lemma="בֵּן" strong="H1121a" x-morph="He,Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/son"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/19-PSA.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/19-PSA.usfm index 0bfbc0a6..b63838ce 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/19-PSA.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/19-PSA.usfm @@ -462,7 +462,7 @@ \w לְמַ֥עַן|lemma="מַעַן" strong="H4616" x-morph="He,R"\w* \w שׁוֹרְרָ֑⁠י|lemma="שָׁרַר" strong="H8324" x-morph="He,Ncmpc:Sp1cs"\w* \w הַיְשַׁ֖ר|lemma="יָשַׁר" strong="H3474" x-morph="He,Vhv2ms"\w* -\f + \ft K \w הושר|lemma="יָשַׁר" strong="H3474" x-morph="He,Vhv2ms"\w*\f* +\f + \ft K \+w הושר|lemma="יָשַׁר" strong="H3474" x-morph="He,Vhv2ms"\+w*\f* \w לְ⁠פָנַ֣⁠י|lemma="פָּנִים" strong="l:H6440" x-morph="He,R:Ncbpc:Sp1cs"\w* \w דַּרְכֶּֽ⁠ךָ|lemma="דֶּרֶךְ" strong="H1870" x-morph="He,Ncbsc:Sp2ms"\w*׃ @@ -553,7 +553,7 @@ \w נִבְהֲלָ֣ה|lemma="בָּהַל" strong="H0926" x-morph="He,VNp3fs"\w* \w מְאֹ֑ד|lemma="מְאֹד" strong="H3966" x-morph="He,D"\w* \w וְאַתָּ֥ה|lemma="אַתָּה" strong="c:H0859c" x-morph="He,C:Pp2ms"\w* -\f + \ft K \w ו⁠את|lemma="אַתָּה" strong="c:H0859c" x-morph="He,C:Pp2fs"\w*\f* +\f + \ft K \+w ו⁠את|lemma="אַתָּה" strong="c:H0859c" x-morph="He,C:Pp2fs"\+w*\f* \w יְ֝הוָ֗ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w עַד|lemma="עַד" strong="H5704" x-morph="He,R"\w*־\w מָתָֽי|lemma="מָתַי" strong="H4970" x-morph="He,Ti"\w*׃ @@ -1033,7 +1033,7 @@ \w לֹֽא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w שָׁ֝כַ֗ח|lemma="שָׁכַח" strong="H7911" x-morph="He,Vqp3ms"\w* \w צַעֲקַ֥ת|lemma="צַעֲקָה" strong="H6818" x-morph="He,Ncfsc"\w* \w עניים|lemma="עָנִי" strong="H6041" x-morph="He,Aampa"\w*׃ -\f + \ft Q \w עֲנָוִֽים|lemma="עָנִי" strong="H6035" x-morph="He,Aampa"\w*\f* +\f + \ft Q \+w עֲנָוִֽים|lemma="עָנִי" strong="H6035" x-morph="He,Aampa"\+w*\f* \v 13 \va 14\va* @@ -1098,7 +1098,7 @@ \w אֶבְי֑וֹן|lemma="אֶבְיוֹן" strong="H0034" x-morph="He,Aamsa"\w* \w תִּקְוַ֥ת|lemma="תִּקְוָה" strong="H8615b" x-morph="He,Ncfsc" x-tw="rc://*/tw/dict/bible/kt/hope"\w* \w ענוים|lemma="עָנָו" strong="H6035" x-morph="He,Aampa"\w* -\f + \ft Q \w עֲ֝נִיִּ֗ים|lemma="עָנָו" strong="H6041" x-morph="He,Aampa"\w*\f* +\f + \ft Q \+w עֲ֝נִיִּ֗ים|lemma="עָנָו" strong="H6041" x-morph="He,Aampa"\+w*\f* \w תֹּאבַ֥ד|lemma="אָבַד" strong="H0006" x-morph="He,Vqi3fs" x-tw="rc://*/tw/dict/bible/kt/perish"\w* \w לָ⁠עַֽד|lemma="עַד" strong="l:H5703" x-morph="He,R:Ncmsa"\w*׃ @@ -1168,7 +1168,7 @@ \v 5 \w יָ֘חִ֤ילוּ|lemma="חוּל" strong="H2342b" x-morph="He,Vqi3mp"\w* \w דְרָכָ֨יו|lemma="דֶּרֶךְ" strong="H1870" x-morph="He,Ncbpc:Sp3ms"\w* ׀ -\f + \ft K \w דרכ⁠ו|lemma="דֶּרֶךְ" strong="H1870" x-morph="He,Ncbsc:Sp3ms"\w*\f* +\f + \ft K \+w דרכ⁠ו|lemma="דֶּרֶךְ" strong="H1870" x-morph="He,Ncbsc:Sp3ms"\+w*\f* \w בְּ⁠כָל|lemma="כֹּל" strong="b:H3605" x-morph="He,R:Ncmsc"\w*־\w עֵ֗ת|lemma="עֵת" strong="H6256" x-morph="He,Ncbsa"\w* \w מָר֣וֹם|lemma="מָרוֹם" strong="H4791" x-morph="He,Ncmsa"\w* \w מִ֭שְׁפָּטֶי⁠ךָ|lemma="מִשְׁפָּט" strong="H4941" x-morph="He,Ncmpc:Sp2ms" x-tw="rc://*/tw/dict/bible/kt/judge"\w* @@ -1223,12 +1223,12 @@ \v 10 \w יִדְכֶּ֥ה|lemma="דָּכָה" strong="c:H1794" x-morph="He,C:Vqi3ms"\w* -\f + \ft K \w ו⁠דכה|lemma="דָּכָה" strong="c:H1794" x-morph="He,C:Vqq3ms"\w*\f* +\f + \ft K \+w ו⁠דכה|lemma="דָּכָה" strong="c:H1794" x-morph="He,C:Vqq3ms"\+w*\f* \w יָשֹׁ֑חַ|lemma="שָׁחַח" strong="H7817" x-morph="He,Vqi3ms"\w* \w וְ⁠נָפַ֥ל|lemma="נָפַל" strong="c:H5307" x-morph="He,C:Vqq3ms" x-tw="rc://*/tw/dict/bible/other/bow"\w* \w בַּ֝⁠עֲצוּמָ֗י⁠ו|lemma="עָצוּם" strong="b:H6099" x-morph="He,R:Aampc:Sp3ms"\w* \w חלכאים|lemma="חֵלְכָא" strong="H2489" x-morph="He,Ncfpa"\w*׃ -\f + \ft Q \w חֵיל|lemma="חֵיל" strong="H2426" x-morph="He,Ncmsc"\w* \w כָּאִים|lemma="חֵלְכָא" strong="H3512" x-morph="He,Aampa"\w*\f* +\f + \ft Q \+w חֵיל|lemma="חֵיל" strong="H2426" x-morph="He,Ncmsc"\w* \w כָּאִים|lemma="חֵלְכָא" strong="H3512" x-morph="He,Aampa"\+w*\f* \v 11 \w אָמַ֣ר|lemma="אָמַר" strong="H0559" x-morph="He,Vqp3ms"\w* @@ -1248,7 +1248,7 @@ \w יָדֶ֑⁠ךָ|lemma="יָד" strong="H3027" x-morph="He,Ncbsc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w אַל|lemma="אַל" strong="H0408" x-morph="He,Tn"\w*־\w תִּשְׁכַּ֥ח|lemma="שָׁכַח" strong="H7911" x-morph="He,Vqj2ms"\w* \w עניים|lemma="עָנִי" strong="H6041" x-morph="He,Aampa"\w*׃ -\f + \ft Q \w עֲנָוִֽים|lemma="עָנִי" strong="H6035" x-morph="He,Aampa"\w*\f* +\f + \ft Q \+w עֲנָוִֽים|lemma="עָנִי" strong="H6035" x-morph="He,Aampa"\+w*\f* \v 13 \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w מֶ֤ה|lemma="מָה" strong="H4100" x-morph="He,Ti"\w* ׀ @@ -1325,7 +1325,7 @@ \w תֹּאמְר֣וּ|lemma="אָמַר" strong="H0559" x-morph="He,Vqi2mp"\w* \w לְ⁠נַפְשִׁ֑⁠י|lemma="נֶפֶשׁ" strong="l:H5315" x-morph="He,R:Ncbsc:Sp1cs"\w* \w נ֝֗וּדִי|lemma="נוּד" strong="H5110" x-morph="He,Vqv2fs"\w* -\f + \ft K \w נודו|lemma="נוּד" strong="H5110" x-morph="He,Vqv2mp"\w*\f* +\f + \ft K \+w נודו|lemma="נוּד" strong="H5110" x-morph="He,Vqv2mp"\+w*\f* \w הַרְ⁠כֶ֥ם|lemma="הַר" strong="H2022" x-morph="He,Ncmsc:Sp2mp"\w* \w צִפּֽוֹר|lemma="צִפּוֹר" strong="H6833" x-morph="He,Ncbsa"\w*׃ @@ -1905,7 +1905,7 @@ \w אַ֭שֻּׁרֵי⁠נוּ|lemma="אָשֻׁר" strong="H0838b" x-morph="He,Ncfpc:Sp1cp"\w* \w עַתָּ֣ה|lemma="עַתָּה" strong="H6258" x-morph="He,D"\w* \w סבבו⁠ני|lemma="סָבַב" strong="H5437" x-morph="He,Vqp3cp:Sp1cs"\w* -\f + \ft Q \w סְבָב֑וּנוּ|lemma="סָבַב" strong="H5437" x-morph="He,Vqp3cp:Sp1cp"\w*\f* +\f + \ft Q \+w סְבָב֑וּנוּ|lemma="סָבַב" strong="H5437" x-morph="He,Vqp3cp:Sp1cp"\+w*\f* \w עֵינֵי⁠הֶ֥ם|lemma="עַיִן" strong="H5869a" x-morph="He,Ncbdc:Sp3mp"\w* \w יָ֝שִׁ֗יתוּ|lemma="שִׁית" strong="H7896" x-morph="He,Vqi3mp"\w* \w לִ⁠נְט֥וֹת|lemma="נָטָה" strong="l:H5186" x-morph="He,R:Vqc"\w* @@ -1940,7 +1940,7 @@ \w חֶלְקָ֥⁠ם|lemma="חֵלֶק" strong="H2506a" x-morph="He,Ncmsc:Sp3mp"\w* \w בַּֽ⁠חַיִּים֮|lemma="חַי" strong="b:H2416e" x-morph="He,Rd:Ncmpa"\w* \w וּֽצְפוּנְךָ֮|lemma="צָפִין" strong="c:H6845" x-morph="He,C:VQsmsc:Sp2ms"\w* -\f + \ft K \w ו⁠צפינ⁠ך|lemma="צָפִין" strong="c:H6840" x-morph="He,C:Ncmsc:Sp2ms"\w*\f* +\f + \ft K \+w ו⁠צפינ⁠ך|lemma="צָפִין" strong="c:H6840" x-morph="He,C:Ncmsc:Sp2ms"\+w*\f* \w תְּמַלֵּ֪א|lemma="מָלֵא" strong="H4390" x-morph="He,Vpi2ms"\w* \w בִ֫טְנָ֥⁠ם|lemma="בֶּטֶן" strong="H0990" x-morph="He,Ncfsc:Sp3mp"\w* \w יִשְׂבְּע֥וּ|lemma="שָׂבַע" strong="H7646" x-morph="He,Vqi3mp"\w* @@ -2450,7 +2450,7 @@ \v 50 \va 51\va* \w מַגְדִּיל֮|lemma="גָּדַל" strong="H1431" x-morph="He,Vhrmsa" x-tw="rc://*/tw/dict/bible/other/proud"\w* -\f + \ft K \w מגדל|lemma="גָּדַל" strong="H1431" x-morph="He,Vprmsa"\w*\f* +\f + \ft K \+w מגדל|lemma="גָּדַל" strong="H1431" x-morph="He,Vprmsa"\+w*\f* \w יְשׁוּע֪וֹת|lemma="יְשׁוּעָה" strong="H3444" x-morph="He,Ncfpc"\w* \w מַ֫לְכּ֥⁠וֹ|lemma="מֶלֶךְ" strong="H4428" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/king"\w* \w וְ⁠עֹ֤שֶׂה|lemma="עָשָׂה" strong="c:H6213a" x-morph="He,C:Vqrmsa"\w* @@ -3293,7 +3293,7 @@ \w זֶ֭ה|lemma="זֶה" strong="H2088" x-morph="He,Pdxms"\w* \w דּ֣וֹר|lemma="דּוֹר" strong="H1755" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/generation"\w* \w דֹּרְשָׁ֑יו|lemma="דָּרַשׁ" strong="H1875" x-morph="He,Vqrmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/seek"\w* -\f + \ft K \w דרש⁠ו|lemma="דָּרַשׁ" strong="H1875" x-morph="He,Vqrmsc:Sp3ms"\w*\f* +\f + \ft K \+w דרש⁠ו|lemma="דָּרַשׁ" strong="H1875" x-morph="He,Vqrmsc:Sp3ms"\+w*\f* \w מְבַקְשֵׁ֨י|lemma="בָּקַשׁ" strong="H1245" x-morph="He,Vprmpc" x-tw="rc://*/tw/dict/bible/other/seek"\w* \w פָנֶ֖י⁠ךָ|lemma="פָּנִים" strong="H6440" x-morph="He,Ncbpc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/face"\w* \w יַעֲקֹ֣ב|lemma="יַעֲקֹב" strong="H3290" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jacob"\w* @@ -3546,7 +3546,7 @@ \w יְהוָ֣ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w וְ⁠נַסֵּ֑⁠נִי|lemma="נָסָה" strong="c:H5254" x-morph="He,C:Vpv2ms:Sp1cs"\w* \w צרופ⁠ה|lemma="צָרַף" strong="H6884" x-morph="He,Vqv2ms:Sh"\w* -\f + \ft Q \w צָרְפָ֖ה|lemma="צָרַף" strong="H6884" x-morph="He,Vqv2ms:Sh"\w*\f* +\f + \ft Q \+w צָרְפָ֖ה|lemma="צָרַף" strong="H6884" x-morph="He,Vqv2ms:Sh"\+w*\f* \w כִלְיוֹתַ֣⁠י|lemma="כִּלְיָה" strong="H3629" x-morph="He,Ncfpc:Sp1cs"\w* \w וְ⁠לִבִּֽ⁠י|lemma="לֵב" strong="c:H3820a" x-morph="He,C:Ncmsc:Sp1cs"\w*׃ @@ -4027,7 +4027,7 @@ \w נַפְשִׁ֑⁠י|lemma="נֶפֶשׁ" strong="H5315" x-morph="He,Ncbsc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/life"\w* \w חִ֝יִּיתַ֗⁠נִי|lemma="חָיָה" strong="H2421" x-morph="He,Vpp2ms:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/life"\w* \w מ⁠יורדי|lemma="יָרַד" strong="m:H3381" x-morph="He,R:Vqrmpc"\w*־\w בֽוֹר|lemma="בּוֹר" strong="H0953a" x-morph="He,Ncmsa"\w*׃ -\f + \ft K \w מ⁠יורדי|lemma="יָרַד" strong="m:H3381" x-morph="He,R:Vqrmsc:Sp1cs"\w*\f* +\f + \ft K \+w מ⁠יורדי|lemma="יָרַד" strong="m:H3381" x-morph="He,R:Vqrmsc:Sp1cs"\+w*\f* \v 4 \va 5\va* @@ -5845,7 +5845,7 @@ \w יִ֝שְׂטְנ֗וּ⁠נִי|lemma="שָׂטַן" strong="H7853" x-morph="He,Vqi3mp:Sp1cs"\w* \w תַּ֣חַת|lemma="תַּחַת" strong="H8478" x-morph="He,R"\w* \w רדופ⁠י|lemma="רָדַף" strong="H7291" x-morph="He,Vqc:Sp1cs" x-tw="rc://*/tw/dict/bible/other/persecute"\w*־\w טֽוֹב|lemma="טוֹב" strong="H2896a" x-morph="He,Aamsa" x-tw="rc://*/tw/dict/bible/kt/good"\w*׃ -\f + \ft Q \w רָֽדְפִי|lemma="רָדַף" strong="H7291" x-morph="He,Vqc:Sp1cs"\w*\f* +\f + \ft Q \+w רָֽדְפִי|lemma="רָדַף" strong="H7291" x-morph="He,Vqc:Sp1cs"\+w*\f* \v 21 \va 22\va* @@ -5868,7 +5868,7 @@ \va 1\va* \w לַ⁠מְנַצֵּ֥חַ|lemma="נָצַח" strong="l:H5329" x-morph="He,Rd:Vprmsa" x-tw="rc://*/tw/dict/bible/other/overseer"\w* \w לִֽידוּת֗וּן|lemma="יְדוּתוּן" strong="l:H3038" x-morph="He,R:Np"\w* -\f + \ft K \w ל⁠ידיתון|lemma="יְדוּתוּן" strong="l:H3038" x-morph="He,R:Np"\w*\f* +\f + \ft K \+w ל⁠ידיתון|lemma="יְדוּתוּן" strong="l:H3038" x-morph="He,R:Np"\+w*\f* \w מִזְמ֥וֹר|lemma="מִזְמוֹר" strong="H4210" x-morph="He,Ncmsa"\w* \w לְ⁠דָוִֽד|lemma="דָּוִד" strong="l:H1732" x-morph="He,R:Np"\w*׃ @@ -6266,7 +6266,7 @@ \w יִשְׁמְרֵ֣⁠הוּ|lemma="שָׁמַר" strong="H8104" x-morph="He,Vqi3ms:Sp3ms" x-tw="rc://*/tw/dict/bible/other/watch"\w* \w וִֽ֭⁠יחַיֵּ⁠הוּ|lemma="חָיָה" strong="c:H2421" x-morph="He,C:Vpi3ms:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/life"\w* \w יאשר|lemma="אָשַׁר" strong="H0833" x-morph="He,VPi3ms"\w* -\f + \ft Q \w וְאֻשַּׁ֣ר|lemma="אָשַׁר" strong="H0833" x-morph="He,VPq3ms"\w*\f* +\f + \ft Q \+w וְאֻשַּׁ֣ר|lemma="אָשַׁר" strong="H0833" x-morph="He,VPq3ms"\+w*\f* \w בָּ⁠אָ֑רֶץ|lemma="אֶרֶץ" strong="b:H0776" x-morph="He,Rd:Ncbsa"\w* \w וְ⁠אַֽל|lemma="אַל" strong="c:H0408" x-morph="He,C:Tn"\w*־\w תִּ֝תְּנֵ֗⁠הוּ|lemma="נָתַן" strong="H5414" x-morph="He,Vqj2ms:Sp3ms"\w* \w בְּ⁠נֶ֣פֶשׁ|lemma="נֶפֶשׁ" strong="b:H5315" x-morph="He,R:Ncbsc" x-tw="rc://*/tw/dict/bible/kt/heart"\w* @@ -6501,7 +6501,7 @@ \w חַסְדּ֗⁠וֹ|lemma="חֶסֶד" strong="H2617a" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/covenantfaith"\w* \w וּ֭⁠בַ⁠לַּיְלָה|lemma="לַיִל" strong="c:b:H3915" x-morph="He,C:Rd:Ncmsa"\w* \w שִׁיר֣וֹ|lemma="שִׁיר" strong="H7892a" x-morph="He,Ncbsc:Sp3ms"\w* -\f + \ft K \w שיר⁠ה|lemma="שִׁיר" strong="H7892a" x-morph="He,Ncbsc:Sp3ms"\w*\f* +\f + \ft K \+w שיר⁠ה|lemma="שִׁיר" strong="H7892a" x-morph="He,Ncbsc:Sp3ms"\+w*\f* \w עִמִּ֑⁠י|lemma="עִם" strong="H5973a" x-morph="He,R:Sp1cs"\w* \w תְּ֝פִלָּ֗ה|lemma="תְּפִלָּה" strong="H8605" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/kt/pray"\w* \w לְ⁠אֵ֣ל|lemma="אֵל" strong="l:H0410" x-morph="He,R:Ncmsc"\w* @@ -7575,7 +7575,7 @@ \w יְשָׁרִ֨ים|lemma="יָשָׁר" strong="H3477" x-morph="He,Aampa" x-tw="rc://*/tw/dict/bible/kt/justice"\w* ׀ \w לַ⁠בֹּ֗קֶר|lemma="בֹּקֶר" strong="l:H1242" x-morph="He,Rd:Ncmsa"\w* \w וְ֭צוּרָם|lemma="צִיר" strong="c:H6699" x-morph="He,C:Ncfsc:Sp3mp"\w* -\f + \ft K \w ו⁠ציר⁠ם|lemma="צִיר" strong="c:H6736" x-morph="He,C:Ncmsc:Sp3mp"\w*\f* +\f + \ft K \+w ו⁠ציר⁠ם|lemma="צִיר" strong="c:H6736" x-morph="He,C:Ncmsc:Sp3mp"\+w*\f* \w לְ⁠בַלּ֥וֹת|lemma="בָּלָה" strong="l:H1086" x-morph="He,R:Vpc"\w* \w שְׁא֗וֹל|lemma="שְׁאוֹל" strong="H7585" x-morph="He,Np"\w* \w מִ⁠זְּבֻ֥ל|lemma="זְבוּל" strong="m:H2073" x-morph="He,R:Ncmsa"\w* @@ -7866,7 +7866,7 @@ \v 2 \va 4\va* \w הֶ֭רֶב|lemma="רָבָה" strong="H7235a" x-morph="He,Vhv2ms"\w* -\f + \ft K \w הרבה|lemma="רָבָה" strong="H7235a" x-morph="He,Vha"\w*\f* +\f + \ft K \+w הרבה|lemma="רָבָה" strong="H7235a" x-morph="He,Vha"\+w*\f* \w כַּבְּסֵ֣⁠נִי|lemma="כָּבַס" strong="H3526" x-morph="He,Vpv2ms:Sp1cs"\w* \w מֵ⁠עֲוֺנִ֑⁠י|lemma="עָוֺן" strong="m:H5771" x-morph="He,R:Ncbsc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/iniquity"\w* \w וּֽ⁠מֵ⁠חַטָּאתִ֥⁠י|lemma="חַטָּאָה" strong="c:m:H2403b" x-morph="He,C:R:Ncfsc:Sp1cs"\w* @@ -8312,7 +8312,7 @@ \v 5 \va 7\va* \w יָשִׁ֣יב|lemma="שׁוּב" strong="H7725" x-morph="He,Vhi3ms" x-tw="rc://*/tw/dict/bible/kt/restore"\w* -\f + \ft K \w ישוב|lemma="שׁוּב" strong="H7725" x-morph="He,Vqi3ms"\w*\f* +\f + \ft K \+w ישוב|lemma="שׁוּב" strong="H7725" x-morph="He,Vqi3ms"\+w*\f* \w הָ֭⁠רַע|lemma="רַע" strong="d:H7451b" x-morph="He,Td:Aamsa"\w* \w לְ⁠שֹׁרְרָ֑⁠י|lemma="שָׁרַר" strong="l:H8324" x-morph="He,R:Ncmpc:Sp1cs"\w* \w בַּ֝⁠אֲמִתְּ⁠ךָ֗|lemma="אֶמֶת" strong="b:H0571" x-morph="He,R:Ncfsc:Sp2ms"\w* @@ -8655,7 +8655,7 @@ \va 7\va* \w יָג֤וּרוּ|lemma="גּוּר" strong="H1481b" x-morph="He,Vqi3mp"\w* ׀ \w יִצְפּ֗וֹנוּ|lemma="צָפַן" strong="H6845" x-morph="He,Vqi3mp"\w* -\f + \ft K \w יצפינו|lemma="צָפַן" strong="H6845" x-morph="He,Vhi3mp"\w*\f* +\f + \ft K \+w יצפינו|lemma="צָפַן" strong="H6845" x-morph="He,Vhi3mp"\+w*\f* \w הֵ֭מָּה|lemma="הֵם" strong="H1992" x-morph="He,Pp3mp"\w* \w עֲקֵבַ֣⁠י|lemma="עָקֵב" strong="H6119" x-morph="He,Ncmpc:Sp1cs"\w* \w יִשְׁמֹ֑רוּ|lemma="שָׁמַר" strong="H8104" x-morph="He,Vqi3mp" x-tw="rc://*/tw/dict/bible/other/watch"\w* @@ -8949,7 +8949,7 @@ \w יִתְהַלְּכוּ|lemma="הָלַךְ" strong="H1980" x-morph="He,Vti3mp" x-tw="rc://*/tw/dict/bible/other/walk"\w*־\w לָ֑⁠מוֹ|lemma="" strong="l" x-morph="He,R:Sp3mp"\w* \w יִדְרֹ֥ךְ|lemma="דָּרַךְ" strong="H1869" x-morph="He,Vqi3ms"\w* \w חִ֝צָּ֗יו|lemma="חֵץ" strong="H2671" x-morph="He,Ncmpc:Sp3ms"\w* -\f + \ft K \w חצ⁠ו|lemma="חֵץ" strong="H2671" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w חצ⁠ו|lemma="חֵץ" strong="H2671" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w כְּמ֣וֹ|lemma="כְּמוֹ" strong="H3644" x-morph="He,R"\w* \w יִתְמֹלָֽלוּ|lemma="מוּל" strong="H4135b" x-morph="He,Vti3mp" x-tw="rc://*/tw/dict/bible/kt/circumcise"\w*׃ @@ -9104,7 +9104,7 @@ \va 11\va* \w אֱלֹהֵ֣י|lemma="אֱלֹהִים" strong="H0430" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/kt/god"\w* \w חַסְדִּ֣י|lemma="חֶסֶד" strong="H2617a" x-morph="He,Ncmsc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/covenantfaith"\w* -\f + \ft K \w חסד⁠ו|lemma="חֶסֶד" strong="H2617a" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w חסד⁠ו|lemma="חֶסֶד" strong="H2617a" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w יְקַדְּמֵ֑⁠נִי|lemma="קָדַם" strong="H6923" x-morph="He,Vpi3ms:Sp1cs"\w* \w אֱ֝לֹהִ֗ים|lemma="אֱלֹהִים" strong="H0430" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/kt/god"\w* \w יַרְאֵ֥⁠נִי|lemma="רָאָה" strong="H7200" x-morph="He,Vhi3ms:Sp1cs"\w* @@ -9158,7 +9158,7 @@ \va 16\va* \w הֵ֭מָּה|lemma="הֵם" strong="H1992" x-morph="He,Pp3mp"\w* \w ינועו⁠ן|lemma="נוּעַ" strong="H5128" x-morph="He,Vqi3mp:Sn"\w* -\f + \ft Q \w יְנִיע֣וּן|lemma="נוּעַ" strong="H5128" x-morph="He,Vhi3mp:Sn"\w*\f* +\f + \ft Q \+w יְנִיע֣וּן|lemma="נוּעַ" strong="H5128" x-morph="He,Vhi3mp:Sn"\+w*\f* \w לֶ⁠אֱכֹ֑ל|lemma="אָכַל" strong="l:H0398" x-morph="He,R:Vqc"\w* \w אִם|lemma="אִם" strong="H0518a" x-morph="He,C"\w*־\w לֹ֥א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w יִ֝שְׂבְּע֗וּ|lemma="שָׂבַע" strong="H7646" x-morph="He,Vqi3mp"\w* @@ -9262,7 +9262,7 @@ \w הוֹשִׁ֖יעָ⁠ה|lemma="יָשַׁע" strong="H3467" x-morph="He,Vhv2ms:Sh" x-tw="rc://*/tw/dict/bible/other/deliverer"\w* \w יְמִֽינְ⁠ךָ֣|lemma="יָמִין" strong="H3225" x-morph="He,Ncfsc:Sp2ms"\w* \w ו⁠ענ⁠נו|lemma="עֲנָה" strong="c:H6032" x-morph="He,C:Vqv2ms:Sp1cp"\w*׃ -\f + \ft Q \w וַעֲנֵֽנִי|lemma="עֲנָה" strong="c:H6032" x-morph="He,C:Vqv2ms:Sp1cs"\w*\f* +\f + \ft Q \+w וַעֲנֵֽנִי|lemma="עֲנָה" strong="c:H6032" x-morph="He,C:Vqv2ms:Sp1cs"\+w*\f* \v 6 \va 8\va* @@ -10007,7 +10007,7 @@ \w תִּצְפֶּ֑ינָה|lemma="צָפָה" strong="H6822" x-morph="He,Vqi3fp"\w* \w הַ⁠סּוֹרְרִ֓ים|lemma="סָרַר" strong="d:H5637" x-morph="He,Td:Vqrmpa"\w* ׀ \w אַל|lemma="אַל" strong="H0408" x-morph="He,Tn"\w*־\w יָר֖וּמוּ|lemma="רוּם" strong="H7311a" x-morph="He,Vqj3mp"\w* -\f + \ft K \w ירימו|lemma="רוּם" strong="H7311a" x-morph="He,Vhj3mp"\w*\f* +\f + \ft K \+w ירימו|lemma="רוּם" strong="H7311a" x-morph="He,Vhj3mp"\+w*\f* \w לָ֣⁠מוֹ|lemma="" strong="l" x-morph="He,R:Sp3mp"\w* \w סֶֽלָה|lemma="סֶלָה" strong="H5542" x-morph="He,Tj"\w*׃ @@ -11132,7 +11132,7 @@ \w אֱ֝לֹהַ֗⁠י|lemma="אֱלֹהִים" strong="H0430" x-morph="He,Ncmpc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/god"\w* \w לְ⁠עֶזְרָ֥תִ⁠י|lemma="עֶזְרָה" strong="l:H5833" x-morph="He,R:Ncfsc:Sp1cs"\w* \w חֽוּשָׁה|lemma="חִישׁ" strong="H2363" x-morph="He,Vqv2ms:Sh"\w*׃ -\f + \ft K \w חיש⁠ה|lemma="חִישׁ" strong="H2439" x-morph="He,Vqv2ms:Sh"\w*\f* +\f + \ft K \+w חיש⁠ה|lemma="חִישׁ" strong="H2439" x-morph="He,Vqv2ms:Sh"\+w*\f* \v 13 \w יֵבֹ֣שׁוּ|lemma="בּוּשׁ" strong="H0954" x-morph="He,Vqi3mp" x-tw="rc://*/tw/dict/bible/other/shame"\w* @@ -11205,13 +11205,13 @@ \v 20 \w אֲשֶׁ֤ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w הִרְאִיתַ֨נִי|lemma="רָאָה" strong="H7200" x-morph="He,Vhp2ms:Sp1cs"\w* ׀ -\f + \ft K \w הראית⁠נו|lemma="רָאָה" strong="H7200" x-morph="He,Vhp2ms:Sp1cp"\w*\f* +\f + \ft K \+w הראית⁠נו|lemma="רָאָה" strong="H7200" x-morph="He,Vhp2ms:Sp1cp"\+w*\f* \w צָר֥וֹת|lemma="צָרָה" strong="H6869b" x-morph="He,Ncfpa" x-tw="rc://*/tw/dict/bible/other/trouble"\w* \w רַבּ֗וֹת|lemma="רַב" strong="H7227a" x-morph="He,Aafpa"\w* \w וְ⁠רָ֫ע֥וֹת|lemma="רַע" strong="c:H7451a" x-morph="He,C:Aafpa"\w* \w תָּשׁ֥וּב|lemma="שׁוּב" strong="H7725" x-morph="He,Vqi2ms" x-tw="rc://*/tw/dict/bible/kt/restore"\w* \w תְּחַיֵּ֑ינִי|lemma="חָיָה" strong="H2421" x-morph="He,Vpi2ms:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/life"\w* -\f + \ft K \w תחיי⁠נו|lemma="חָיָה" strong="H2421" x-morph="He,Vpi2ms:Sp1cp"\w*\f* +\f + \ft K \+w תחיי⁠נו|lemma="חָיָה" strong="H2421" x-morph="He,Vpi2ms:Sp1cp"\+w*\f* \w וּֽ⁠מִ⁠תְּהֹמ֥וֹת|lemma="תְּהוֹם" strong="c:m:H8415" x-morph="He,C:R:Ncbpc"\w* \w הָ֝⁠אָ֗רֶץ|lemma="אֶרֶץ" strong="d:H0776" x-morph="He,Td:Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w* \w תָּשׁ֥וּב|lemma="שׁוּב" strong="H7725" x-morph="He,Vqi2ms" x-tw="rc://*/tw/dict/bible/kt/restore"\w* @@ -11403,7 +11403,7 @@ \w לְֽ⁠עוֹלָ֗ם|lemma="עוֹלָם" strong="l:H5769" x-morph="He,R:Ncmsa"\w* \w לִ⁠פְנֵי|lemma="פָּנִים" strong="l:H6440" x-morph="He,R:Ncbpc"\w*־\w שֶׁמֶשׁ֮|lemma="שֶׁמֶשׁ" strong="H8121" x-morph="He,Ncbsa"\w* \w יִנּ֪וֹן|lemma="נוּן" strong="H5125" x-morph="He,VNi3ms"\w* -\f + \ft K \w ינין|lemma="נוּן" strong="H5125" x-morph="He,Vhi3ms"\w*\f* +\f + \ft K \+w ינין|lemma="נוּן" strong="H5125" x-morph="He,Vhi3ms"\+w*\f* \w שְׁ֫מ֥⁠וֹ|lemma="שֵׁם" strong="H8034" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/name"\w* \w וְ⁠יִתְבָּ֥רְכוּ|lemma="בָּרַךְ" strong="c:H1288" x-morph="He,C:Vti3mp" x-tw="rc://*/tw/dict/bible/kt/bless"\w* \w ב֑⁠וֹ|lemma="" strong="b" x-morph="He,R:Sp3ms"\w* @@ -11455,11 +11455,11 @@ \w וַ⁠אֲנִ֗י|lemma="אֲנִי" strong="c:H0589" x-morph="He,C:Pp1cs"\w* \w כִּ֭⁠מְעַט|lemma="מְעַט" strong="k:H4592" x-morph="He,R:Ncmsa"\w* \w נָטָ֣יוּ|lemma="נָטָה" strong="H5186" x-morph="He,Vqp3cp"\w* -\f + \ft K \w נטוי|lemma="נָטָה" strong="H5186" x-morph="He,Vqsmsc"\w*\f* +\f + \ft K \+w נטוי|lemma="נָטָה" strong="H5186" x-morph="He,Vqsmsc"\+w*\f* \w רַגְלָ֑⁠י|lemma="רֶגֶל" strong="H7272" x-morph="He,Ncfdc:Sp1cs"\w* \w כְּ֝⁠אַ֗יִן|lemma="אַיִן" strong="k:H0369" x-morph="He,R:Tn"\w* \w שֻׁפְּכ֥וּ|lemma="שָׁפַךְ" strong="H8210" x-morph="He,VQp3cp"\w* -\f + \ft K \w שפכה|lemma="שָׁפַךְ" strong="H8210" x-morph="He,VQp3fs"\w*\f* +\f + \ft K \+w שפכה|lemma="שָׁפַךְ" strong="H8210" x-morph="He,VQp3fs"\+w*\f* \w אֲשֻׁרָֽ⁠י|lemma="אָשֻׁר" strong="H0838a" x-morph="He,Ncfpc:Sp1cs"\w*׃ \v 3 @@ -11520,7 +11520,7 @@ \v 10 \w לָ⁠כֵ֤ן|lemma="כֵּן" strong="l:H3651c" x-morph="He,R:D"\w* ׀ \w יָשׁ֣וּב|lemma="שׁוּב" strong="H7725" x-morph="He,Vqi3ms" x-tw="rc://*/tw/dict/bible/kt/restore"\w* -\f + \ft K \w ישיב|lemma="שׁוּב" strong="H7725" x-morph="He,Vhi3ms"\w*\f* +\f + \ft K \+w ישיב|lemma="שׁוּב" strong="H7725" x-morph="He,Vhi3ms"\+w*\f* \w עַמּ֣⁠וֹ|lemma="עַם" strong="H5971a" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* \w הֲלֹ֑ם|lemma="הֲלֹם" strong="H1988" x-morph="He,D"\w* \w וּ⁠מֵ֥י|lemma="מַיִם" strong="c:H4325" x-morph="He,C:Ncmpc"\w* @@ -11573,7 +11573,7 @@ \w זֹ֑את|lemma="זֹאת" strong="H2063" x-morph="He,Pdxfs"\w* \w עָמָ֖ל|lemma="עָמָל" strong="H5999" x-morph="He,Ncbsa"\w* \w ה֣וּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w* -\f + \ft K \w היא|lemma="הִיא" strong="H1992" x-morph="He,Pp3fs"\w*\f* +\f + \ft K \+w היא|lemma="הִיא" strong="H1992" x-morph="He,Pp3fs"\+w*\f* \w בְ⁠עֵינָֽ⁠י|lemma="עַיִן" strong="b:H5869a" x-morph="He,R:Ncbdc:Sp1cs"\w*׃ \v 17 @@ -11727,7 +11727,7 @@ \v 6 \w וְ֭עַתָּה|lemma="עַתָּה" strong="c:H6258" x-morph="He,C:D"\w* -\f + \ft K \w ו⁠עת|lemma="עֵת" strong="c:H6256" x-morph="He,C:Ncbsc"\w*\f* +\f + \ft K \+w ו⁠עת|lemma="עֵת" strong="c:H6256" x-morph="He,C:Ncbsc"\+w*\f* \w פִּתּוּחֶ֣י⁠הָ|lemma="פִּתּוּחַ" strong="H6603" x-morph="He,Ncmpc:Sp3fs"\w* \w יָּ֑חַד|lemma="יַחַד" strong="H3162a" x-morph="He,D"\w* \w בְּ⁠כַשִּׁ֥יל|lemma="כַּשִּׁיל" strong="b:H3781" x-morph="He,R:Ncmsa"\w* @@ -11778,7 +11778,7 @@ \w וִֽ⁠ימִינֶ֑⁠ךָ|lemma="יָמִין" strong="c:H3225" x-morph="He,C:Ncfsc:Sp2ms"\w* \w מִ⁠קֶּ֖רֶב|lemma="קֶרֶב" strong="m:H7130" x-morph="He,R:Ncmsc"\w* \w חֵֽיקְךָ֣|lemma="חֵיק" strong="H2436" x-morph="He,Ncmsc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/statute"\w* -\f + \ft K \w חוק⁠ך|lemma="חֹק" strong="H2706" x-morph="He,Ncmsc:Sp2ms"\w*\f* +\f + \ft K \+w חוק⁠ך|lemma="חֹק" strong="H2706" x-morph="He,Ncmsc:Sp2ms"\+w*\f* \w כַלֵּֽה|lemma="כָּלָה" strong="H3615" x-morph="He,Vpv2ms" x-tw="rc://*/tw/dict/bible/other/consume"\w*׃ \v 12 @@ -12136,7 +12136,7 @@ \va 1\va* \w לַ⁠מְנַצֵּ֥חַ|lemma="נָצַח" strong="l:H5329" x-morph="He,Rd:Vprmsa" x-tw="rc://*/tw/dict/bible/other/overseer"\w* \w עַֽל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w יְדוּת֗וּן|lemma="יְדוּתוּן" strong="H3038" x-morph="He,Np"\w* -\f + \ft K \w ידיתון|lemma="יְדוּתוּן" strong="H3038" x-morph="He,Np"\w*\f* +\f + \ft K \+w ידיתון|lemma="יְדוּתוּן" strong="H3038" x-morph="He,Np"\+w*\f* \w לְ⁠אָסָ֥ף|lemma="אָסָף" strong="l:H0623" x-morph="He,R:Np"\w* \w מִזְמֽוֹר|lemma="מִזְמוֹר" strong="H4210" x-morph="He,Ncmsa"\w*׃ @@ -12244,7 +12244,7 @@ \v 11 \va 12\va* \w אֶזְכּ֥וֹר|lemma="זָכַר" strong="H2142" x-morph="He,Vqi1cs"\w* -\f + \ft K \w אזכיר|lemma="זָכַר" strong="H2142" x-morph="He,Vhi1cs"\w*\f* +\f + \ft K \+w אזכיר|lemma="זָכַר" strong="H2142" x-morph="He,Vhi1cs"\+w*\f* \w מַֽעַלְלֵי|lemma="מַעֲלָל" strong="H4611" x-morph="He,Ncmpc"\w*־\w יָ֑הּ|lemma="יָהּ" strong="H3050" x-morph="He,Np"\w* \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w אֶזְכְּרָ֖ה|lemma="זָכַר" strong="H2142" x-morph="He,Vqh1cs"\w* \w מִ⁠קֶּ֣דֶם|lemma="קֶדֶם" strong="m:H6924a" x-morph="He,R:Ncmsa"\w* @@ -12325,7 +12325,7 @@ \w בַּ⁠יָּ֤ם|lemma="יָם" strong="b:H3220" x-morph="He,Rd:Ncmsa"\w* \w דַּרְכֶּ֗⁠ךָ|lemma="דֶּרֶךְ" strong="H1870" x-morph="He,Ncbsc:Sp2ms"\w* \w וּֽ֭שְׁבִֽילְךָ|lemma="שָׁבִיל" strong="c:H7635" x-morph="He,C:Ncmsc:Sp2ms"\w* -\f + \ft K \w ו⁠שבילי⁠ך|lemma="שָׁבִיל" strong="c:H7635" x-morph="He,C:Ncmpc:Sp2ms"\w*\f* +\f + \ft K \+w ו⁠שבילי⁠ך|lemma="שָׁבִיל" strong="c:H7635" x-morph="He,C:Ncmpc:Sp2ms"\+w*\f* \w בְּ⁠מַ֣יִם|lemma="מַיִם" strong="b:H4325" x-morph="He,R:Ncmpa"\w* \w רַבִּ֑ים|lemma="רַב" strong="H7227a" x-morph="He,Aampa"\w* \w וְ֝⁠עִקְּבוֹתֶ֗י⁠ךָ|lemma="עָקֵב" strong="c:H6119" x-morph="He,C:Ncmpc:Sp2ms"\w* @@ -13065,7 +13065,7 @@ \w אֱֽלֹהֵ֫י⁠הֶ֥ם|lemma="אֱלֹהִים" strong="H0430" x-morph="He,Ncmpc:Sp3mp" x-tw="rc://*/tw/dict/bible/kt/god"\w* \w יִוָּדַ֣ע|lemma="יָדַע" strong="H3045" x-morph="He,VNj3ms" x-tw="rc://*/tw/dict/bible/other/know"\w* \w בַּגּוֹיִ֣ם|lemma="גּוֹי" strong="b:H1471a" x-morph="He,Rd:Ncmpa" x-tw="rc://*/tw/dict/bible/other/nation"\w* -\f + \ft K \w ב⁠גיים|lemma="גּוֹי" strong="b:H1471a" x-morph="He,Rd:Ncmpa"\w*\f* +\f + \ft K \+w ב⁠גיים|lemma="גּוֹי" strong="b:H1471a" x-morph="He,Rd:Ncmpa"\+w*\f* \w לְ⁠עֵינֵ֑י⁠נוּ|lemma="עַיִן" strong="l:H5869a" x-morph="He,R:Ncbdc:Sp1cp"\w* \w נִ֝קְמַ֗ת|lemma="נְקָמָה" strong="H5360" x-morph="He,Ncfsc"\w* \w דַּֽם|lemma="דָּם" strong="H1818" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/blood"\w*־\w עֲבָדֶ֥י⁠ךָ|lemma="עֶבֶד" strong="H5650" x-morph="He,Ncmpc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/servant"\w* @@ -13855,7 +13855,7 @@ \w אַרְצֶ֑⁠ךָ|lemma="אֶרֶץ" strong="H0776" x-morph="He,Ncbsc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/earth"\w* \w שַׁ֝֗בְתָּ|lemma="שׁוּב" strong="H7725" x-morph="He,Vqp2ms" x-tw="rc://*/tw/dict/bible/kt/restore"\w* \w שבות|lemma="שְׁבוּת" strong="H7622" x-morph="He,Ncfsc" x-tw="rc://*/tw/dict/bible/other/captive"\w* -\f + \ft Q \w שְׁבִ֣ית|lemma="שְׁבוּת" strong="H7622" x-morph="He,Ncfsa"\w*\f* +\f + \ft Q \+w שְׁבִ֣ית|lemma="שְׁבוּת" strong="H7622" x-morph="He,Ncfsa"\+w*\f* \w יַעֲקֹֽב|lemma="יַעֲקֹב" strong="H3290" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jacob"\w*׃ \v 2 @@ -14571,7 +14571,7 @@ \w אָ֑תָּה|lemma="אַתָּה" strong="H0859a" x-morph="He,Pp2ms"\w* \w וּ֝⁠בִ⁠רְצֹנְ⁠ךָ֗|lemma="רָצוֹן" strong="c:b:H7522" x-morph="He,C:R:Ncmsc:Sp2ms"\w* \w תָּר֥וּם|lemma="רוּם" strong="H7311a" x-morph="He,Vqi2ms"\w* -\f + \ft K \w תרים|lemma="רוּם" strong="H7311a" x-morph="He,Vhi2ms"\w*\f* +\f + \ft K \+w תרים|lemma="רוּם" strong="H7311a" x-morph="He,Vhi2ms"\+w*\f* \w קַרְנֵֽ⁠נוּ|lemma="קֶרֶן" strong="H7161a" x-morph="He,Ncbsc:Sp1cp"\w*׃ \v 18 @@ -14670,7 +14670,7 @@ \va 29\va* \w לְ֭⁠עוֹלָ֗ם|lemma="עוֹלָם" strong="l:H5769" x-morph="He,R:Ncmsa"\w* \w אשמור|lemma="שָׁמַר" strong="H8104" x-morph="He,Vqi1cs" x-tw="rc://*/tw/dict/bible/other/watch"\w*־\w ל֣⁠וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* -\f + \ft Q \w אֶשְׁמָר|lemma="שָׁמַר" strong="H8104" x-morph="He,Vqi1cs"\w*\f* +\f + \ft Q \+w אֶשְׁמָר|lemma="שָׁמַר" strong="H8104" x-morph="He,Vqi1cs"\+w*\f* \w חַסְדִּ֑⁠י|lemma="חֶסֶד" strong="H2617a" x-morph="He,Ncmsc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/covenantfaith"\w* \w וּ֝⁠בְרִיתִ֗⁠י|lemma="בְּרִית" strong="c:H1285" x-morph="He,C:Ncfsc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/covenant"\w* \w נֶאֱמֶ֥נֶת|lemma="אָמַן" strong="H0539" x-morph="He,VNrfsa" x-tw="rc://*/tw/dict/bible/kt/faithful"\w* @@ -14964,7 +14964,7 @@ \v 8 \w שַׁתָּ֣ה|lemma="שִׁית" strong="H7896" x-morph="He,Vqp2ms"\w* -\f + \ft K \w שת|lemma="שִׁית" strong="H7896" x-morph="He,Vqp3ms"\w*\f* +\f + \ft K \+w שת|lemma="שִׁית" strong="H7896" x-morph="He,Vqp3ms"\+w*\f* \w עֲוֺנֹתֵ֣י⁠נוּ|lemma="עָוֺן" strong="H5771" x-morph="He,Ncbpc:Sp1cp" x-tw="rc://*/tw/dict/bible/kt/iniquity"\w* \w לְ⁠נֶגְדֶּ֑⁠ךָ|lemma="נֶגֶד" strong="l:H5048" x-morph="He,R:R:Sp2ms"\w* \w עֲ֝לֻמֵ֗⁠נוּ|lemma="עָלַם" strong="H5956" x-morph="He,Vqsmsc:Sp1cp"\w* @@ -15339,7 +15339,7 @@ \w יְהוָ֑ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w צ֝וּרִ֗⁠י|lemma="צוּר" strong="H6697" x-morph="He,Ncmsc:Sp1cs"\w* \w וְֽ⁠לֹא|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w*־\w עַוְלָ֥תָה|lemma="עֶוֶל" strong="H5766b" x-morph="He,Ncbsa:Sh"\w* -\f + \ft K \w עלת⁠ה|lemma="עֶוֶל" strong="H5766b" x-morph="He,Ncbsa:Sh"\w*\f* +\f + \ft K \+w עלת⁠ה|lemma="עֶוֶל" strong="H5766b" x-morph="He,Ncbsa:Sh"\+w*\f* \w בּֽ⁠וֹ|lemma="" strong="b" x-morph="He,R:Sp3ms"\w*׃ \c 93 @@ -16139,7 +16139,7 @@ \w אֱלֹ֫הִ֥ים|lemma="אֱלֹהִים" strong="H0430" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/kt/god"\w* \w הֽוּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w*־\w עָ֭שָׂ⁠נוּ|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqp3ms:Sp1cp"\w* \w ו⁠לא|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w* -\f + \ft Q \w וְל֣וֹ|lemma="" strong="l" x-morph="He,C:R:Sp3ms"\w*\f* +\f + \ft Q \+w וְל֣וֹ|lemma="" strong="l" x-morph="He,C:R:Sp3ms"\+w*\f* \w אֲנַ֑חְנוּ|lemma="אֲנַחְנוּ" strong="H0587" x-morph="He,Pp1cp"\w* \w עַ֝מּ֗⁠וֹ|lemma="עַם" strong="H5971a" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* \w וְ⁠צֹ֣אן|lemma="צֹאן" strong="c:H6629" x-morph="He,C:Ncbsc" x-tw="rc://*/tw/dict/bible/other/flock"\w* @@ -16210,7 +16210,7 @@ \v 5 \w מלושני|lemma="לָשַׁן" strong="H3960" x-morph="He,Vmrmsc"\w* -\f + \ft Q \w מְלָשְׁנִ֬י|lemma="לָשַׁן" strong="H3960" x-morph="He,Vmrmsc"\w*\f* +\f + \ft Q \+w מְלָשְׁנִ֬י|lemma="לָשַׁן" strong="H3960" x-morph="He,Vmrmsc"\+w*\f* \w בַ⁠סֵּ֨תֶר|lemma="סֵתֶר" strong="b:H5643a" x-morph="He,Rd:Ncmsa"\w* ׀ \w רֵעֵ⁠הוּ֮|lemma="רֵעַ" strong="H7453" x-morph="He,Ncmsc:Sp3ms"\w* \w אוֹת֪⁠וֹ|lemma="אֵת" strong="H0853" x-morph="He,To:Sp3ms"\w* @@ -16476,7 +16476,7 @@ \w עִנָּ֖ה|lemma="עָנָה" strong="H6031b" x-morph="He,Vpp3ms"\w* \w בַ⁠דֶּ֥רֶךְ|lemma="דֶּרֶךְ" strong="b:H1870" x-morph="He,Rd:Ncbsa"\w* \w כֹּחִ֗י|lemma="כֹּחַ" strong="H3581b" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/strength"\w* -\f + \ft K \w כח⁠ו|lemma="כֹּחַ" strong="H3581b" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w כח⁠ו|lemma="כֹּחַ" strong="H3581b" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w קִצַּ֥ר|lemma="קָצַר" strong="H7114a" x-morph="He,Vpp3ms"\w* \w יָמָֽ⁠י|lemma="יוֹם" strong="H3117" x-morph="He,Ncmpc:Sp1cs"\w*׃ @@ -17160,7 +17160,7 @@ \w עִנּ֣וּ|lemma="עָנָה" strong="H6031b" x-morph="He,Vpp3cp"\w* \w בַ⁠כֶּ֣בֶל|lemma="כֶּבֶל" strong="b:H3525" x-morph="He,Rd:Ncmsa"\w* \w רגלי⁠ו|lemma="רֶגֶל" strong="H7272" x-morph="He,Ncfdc:Sp3ms"\w* -\f + \ft Q \w רַגְל֑וֹ|lemma="רֶגֶל" strong="H7272" x-morph="He,Ncfsc:Sp3ms"\w*\f* +\f + \ft Q \+w רַגְל֑וֹ|lemma="רֶגֶל" strong="H7272" x-morph="He,Ncfsc:Sp3ms"\+w*\f* \w בַּ֝רְזֶ֗ל|lemma="בַּרְזֶל" strong="H1270" x-morph="He,Ncmsa"\w* \w בָּ֣אָה|lemma="בּוֹא" strong="H0935" x-morph="He,Vqp3fs"\w* \w נַפְשֽׁ⁠וֹ|lemma="נֶפֶשׁ" strong="H5315" x-morph="He,Ncbsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/life"\w*׃ @@ -17727,7 +17727,7 @@ \w וַ֝⁠יִּנָּחֵ֗ם|lemma="נָחַם" strong="c:H5162" x-morph="He,C:VNw3ms"\w* \w כְּ⁠רֹ֣ב|lemma="רֹב" strong="k:H7230" x-morph="He,R:Ncbsc"\w* \w חסד⁠ו|lemma="חֶסֶד" strong="H2617a" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/covenantfaith"\w*׃ -\f + \ft Q \w חֲסָדָֽיו|lemma="חֶסֶד" strong="H2617a" x-morph="He,Ncmpc:Sp3ms"\w*\f* +\f + \ft Q \+w חֲסָדָֽיו|lemma="חֶסֶד" strong="H2617a" x-morph="He,Ncmpc:Sp3ms"\+w*\f* \v 46 \w וַ⁠יִּתֵּ֣ן|lemma="נָתַן" strong="c:H5414" x-morph="He,C:Vqw3ms"\w* @@ -20037,7 +20037,7 @@ \w לִ֣⁠י|lemma="" strong="l" x-morph="He,R:Sp1cs"\w* \w יְרֵאֶ֑י⁠ךָ|lemma="יָרֵא" strong="H3373" x-morph="He,Aampc:Sp2ms"\w* \w וְ֝יֹדְעֵ֗י|lemma="יָדַע" strong="c:H3045" x-morph="He,C:Vqrmpc" x-tw="rc://*/tw/dict/bible/other/know"\w* -\f + \ft K \w ו⁠ידעו|lemma="יָדַע" strong="c:H3045" x-morph="He,C:Vqq3cp"\w*\f* +\f + \ft K \+w ו⁠ידעו|lemma="יָדַע" strong="c:H3045" x-morph="He,C:Vqq3cp"\+w*\f* \w עֵדֹתֶֽי⁠ךָ|lemma="עֵדָה" strong="H5713b" x-morph="He,Ncfpc:Sp2ms"\w*׃ \v 80 @@ -20538,7 +20538,7 @@ \w בַ֭⁠נֶּשֶׁף|lemma="נֶשֶׁף" strong="b:H5399" x-morph="He,Rd:Ncmsa"\w* \w וָ⁠אֲשַׁוֵּ֑עָ⁠ה|lemma="שָׁוַע" strong="c:H7768" x-morph="He,C:Vpw1cs:Sh"\w* \w ל⁠דברי⁠ך|lemma="דָּבָר" strong="l:H1697" x-morph="He,R:Ncmpc:Sp2ms"\w* -\f + \ft Q \w לִדְבָרְךָ֥|lemma="דָּבָר" strong="l:H1697" x-morph="He,R:Ncmsc:Sp2ms"\w*\f* +\f + \ft Q \+w לִדְבָרְךָ֥|lemma="דָּבָר" strong="l:H1697" x-morph="He,R:Ncmsc:Sp2ms"\+w*\f* \w יִחָֽלְתִּי|lemma="יָחַל" strong="H3176" x-morph="He,Vpp1cs"\w*׃ \v 148 @@ -20644,7 +20644,7 @@ \w רְדָפ֣וּ⁠נִי|lemma="רָדַף" strong="H7291" x-morph="He,Vqp3cp:Sp1cs" x-tw="rc://*/tw/dict/bible/other/persecute"\w* \w חִנָּ֑ם|lemma="חִנָּם" strong="H2600" x-morph="He,D"\w* \w ו⁠מ⁠דברי⁠ך|lemma="דָּבָר" strong="c:m:H1697" x-morph="He,C:R:Ncmpc:Sp2ms"\w* -\f + \ft Q \w וּ֝מִדְּבָרְךָ֗|lemma="דָּבָר" strong="c:m:H1697" x-morph="He,C:R:Ncmsc:Sp2ms"\w*\f* +\f + \ft Q \+w וּ֝מִדְּבָרְךָ֗|lemma="דָּבָר" strong="c:m:H1697" x-morph="He,C:R:Ncmsc:Sp2ms"\+w*\f* \w פָּחַ֥ד|lemma="פָּחַד" strong="H6342" x-morph="He,Vqp3ms"\w* \w לִבִּֽ⁠י|lemma="לֵב" strong="H3820a" x-morph="He,Ncmsc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/heart"\w*׃ @@ -21180,7 +21180,7 @@ \w שׁוּבָ֣⁠ה|lemma="שׁוּב" strong="H7725" x-morph="He,Vqv2ms:Sh" x-tw="rc://*/tw/dict/bible/kt/restore"\w* \w יְ֭הוָה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w שבות⁠נו|lemma="שְׁבוּת" strong="H7622" x-morph="He,Ncfsc:Sp1cp" x-tw="rc://*/tw/dict/bible/other/captive"\w* -\f + \ft Q \w שְׁבִיתֵ֑נוּ|lemma="שְׁבוּת" strong="H7622" x-morph="He,Ncfsc:Sp1cp"\w*\f* +\f + \ft Q \+w שְׁבִיתֵ֑נוּ|lemma="שְׁבוּת" strong="H7622" x-morph="He,Ncfsc:Sp1cp"\+w*\f* \w כַּ⁠אֲפִיקִ֥ים|lemma="אָפִיק" strong="k:H0650" x-morph="He,R:Ncmpa"\w* \w בַּ⁠נֶּֽגֶב|lemma="נֶגֶב" strong="b:H5045" x-morph="He,Rd:Ncmsa"\w*׃ @@ -21347,7 +21347,7 @@ \w חֹרְשִׁ֑ים|lemma="חָרַשׁ" strong="H2790a" x-morph="He,Vqrmpa"\w* \w הֶ֝אֱרִ֗יכוּ|lemma="אָרַךְ" strong="H0748" x-morph="He,Vhp3cp"\w* \w ל⁠מענות⁠ם|lemma="מַעֲנָה" strong="l:H4618" x-morph="He,R:Ncfpc:Sp3mp"\w*׃ -\f + \ft Q \w לְמַעֲנִיתָֽם|lemma="מַעֲנָה" strong="l:H4618" x-morph="He,R:Ncfsc:Sp3mp"\w*\f* +\f + \ft Q \+w לְמַעֲנִיתָֽם|lemma="מַעֲנָה" strong="l:H4618" x-morph="He,R:Ncfsc:Sp3mp"\+w*\f* \v 4 \w יְהוָ֥ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* @@ -22328,7 +22328,7 @@ \v 6 \w פלאיה|lemma="פִּלְאִי" strong="H6383" x-morph="He,Aafsa"\w* -\f + \ft Q \w פְּלִ֣יאָֽה|lemma="פִּלְאִי" strong="H6383" x-morph="He,Aafsa"\w*\f* +\f + \ft Q \+w פְּלִ֣יאָֽה|lemma="פִּלְאִי" strong="H6383" x-morph="He,Aafsa"\+w*\f* \w דַ֣עַת|lemma="דַּעַת" strong="H1847" x-morph="He,Ncfsa"\w* \w מִמֶּ֑⁠נִּי|lemma="מִן" strong="H4480a" x-morph="He,R:Sp1cs"\w* \w נִ֝שְׂגְּבָ֗ה|lemma="שָׂגַב" strong="H7682" x-morph="He,VNrfsa"\w* @@ -22424,7 +22424,7 @@ \w יָמִ֥ים|lemma="יוֹם" strong="H3117" x-morph="He,Ncmpa"\w* \w יֻצָּ֑רוּ|lemma="יָצַר" strong="H3335" x-morph="He,VPp3cp"\w* \w ו⁠לא|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w* -\f + \ft Q \w וְל֖וֹ|lemma="" strong="c:l" x-morph="He,C:R:Sp3ms"\w*\f* +\f + \ft Q \+w וְל֖וֹ|lemma="" strong="c:l" x-morph="He,C:R:Sp3ms"\+w*\f* \w אֶחָ֣ד|lemma="אֶחָד" strong="H0259" x-morph="He,Acmsa"\w* \w בָּ⁠הֶֽם|lemma="" strong="b" x-morph="He,R:Sp3mp"\w*׃ @@ -22601,12 +22601,12 @@ \w עֲמַ֖ל|lemma="עָמָל" strong="H5999" x-morph="He,Ncbsc"\w* \w שְׂפָתֵ֣י⁠מוֹ|lemma="שָׂפָה" strong="H8193" x-morph="He,Ncfdc:Sp3mp"\w* \w יְכַסֵּֽמוֹ|lemma="כָּסָה" strong="H3680" x-morph="He,Vpj3ms:Sp3mp"\w*׃ -\f + \ft K \w יכסו⁠מו|lemma="כָּסָה" strong="H3680" x-morph="He,Vpj3mp:Sp3mp"\w*\f* +\f + \ft K \+w יכסו⁠מו|lemma="כָּסָה" strong="H3680" x-morph="He,Vpj3mp:Sp3mp"\+w*\f* \v 10 \va 11\va* \w יִמּ֥וֹטוּ|lemma="מוֹט" strong="H4131" x-morph="He,Vqj3mp"\w* -\f + \ft ? \w ימיטו|lemma="מוֹט" strong="H4131" x-morph="He,Vhj3mp"\w*\f* +\f + \ft ? \w ימיטו|lemma="מוֹט" strong="H4131" x-morph="He,Vhj3mp"\+w*\f* \w עֲלֵי⁠הֶ֗ם|lemma="עַל" strong="H5921a" x-morph="He,R:Sp3mp"\w* \w גֶּֽחָ֫לִ֥ים|lemma="גֶּחֶל" strong="H1513" x-morph="He,Ncbpa"\w* \w בָּ⁠אֵ֥שׁ|lemma="אֵשׁ" strong="b:H0784" x-morph="He,Rd:Ncbsa" x-tw="rc://*/tw/dict/bible/other/fire"\w* @@ -22628,7 +22628,7 @@ \v 12 \va 13\va* \w יָדַ֗עְתִּי|lemma="יָדַע" strong="H3045" x-morph="He,Vqp1cs" x-tw="rc://*/tw/dict/bible/other/know"\w* -\f + \ft K \w ידעת|lemma="יָדַע" strong="H3045" x-morph="He,Vqp2ms"\w*\f* +\f + \ft K \+w ידעת|lemma="יָדַע" strong="H3045" x-morph="He,Vqp2ms"\+w*\f* \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w יַעֲשֶׂ֣ה|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqi3ms"\w* \w יְ֭הוָה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w דִּ֣ין|lemma="דִּין" strong="H1779" x-morph="He,Ncmsc"\w* @@ -23179,7 +23179,7 @@ \w נוֹרְאֹתֶ֣י⁠ךָ|lemma="יָרֵא" strong="H3372" x-morph="He,VNrfpc:Sp2ms" x-tw="rc://*/tw/dict/bible/kt/fear"\w* \w יֹאמֵ֑רוּ|lemma="אָמַר" strong="H0559" x-morph="He,Vqi3mp"\w* \w וּגְדוּלָּתְךָ֥|lemma="גְּדוּלָה" strong="c:H1420" x-morph="He,C:Ncfpc:Sp2ms"\w* -\f + \ft K \w ו⁠גדולתי⁠ך|lemma="גְּדוּלָה" strong="c:H1420" x-morph="He,C:Ncfpc:Sp2ms"\w*\f* +\f + \ft K \+w ו⁠גדולתי⁠ך|lemma="גְּדוּלָה" strong="c:H1420" x-morph="He,C:Ncfpc:Sp2ms"\+w*\f* \w אֲסַפְּרֶֽ⁠נָּה|lemma="סָפַר" strong="H5608a" x-morph="He,Vpi1cs:Sp3fs"\w*׃ \v 7 @@ -23551,7 +23551,7 @@ \v 19 \w מַגִּ֣יד|lemma="נָגַד" strong="H5046" x-morph="He,Vhrmsa"\w* \w דבר⁠ו|lemma="דָּבָר" strong="H1697" x-morph="He,Ncmsc:Sp3ms"\w* -\f + \ft Q \w דְּבָרָ֣יו|lemma="דָּבָר" strong="H1697" x-morph="He,Ncmpc:Sp3ms"\w*\f* +\f + \ft Q \+w דְּבָרָ֣יו|lemma="דָּבָר" strong="H1697" x-morph="He,Ncmpc:Sp3ms"\+w*\f* \w לְ⁠יַעֲקֹ֑ב|lemma="יַעֲקֹב" strong="l:H3290" x-morph="He,R:Np"\w* \w חֻקָּ֥י⁠ו|lemma="חֹק" strong="H2706" x-morph="He,Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/statute"\w* \w וּ֝⁠מִשְׁפָּטָ֗י⁠ו|lemma="מִשְׁפָּט" strong="c:H4941" x-morph="He,C:Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/statute"\w* @@ -23583,7 +23583,7 @@ \w כָל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w מַלְאָכָ֑י⁠ו|lemma="מַלְאָךְ" strong="H4397" x-morph="He,Ncmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/messenger"\w* \w הַֽ֝לְל֗וּ⁠הוּ|lemma="הָלַל" strong="H1984b" x-morph="He,Vpv2mp:Sp3ms"\w* \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w צְבָאָֽיו|lemma="צָבָא" strong="H6635a" x-morph="He,Ncbpc:Sp3ms"\w*׃ -\f + \ft K \w צבא⁠ו|lemma="צָבָא" strong="H6635a" x-morph="He,Ncbsc:Sp3ms"\w*\f* +\f + \ft K \+w צבא⁠ו|lemma="צָבָא" strong="H6635a" x-morph="He,Ncbsc:Sp3ms"\+w*\f* \v 3 \w הַֽ֭לְלוּ⁠הוּ|lemma="הָלַל" strong="H1984b" x-morph="He,Vpv2mp:Sp3ms"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/20-PRO.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/20-PRO.usfm index 0439d42a..38f37b3e 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/20-PRO.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/20-PRO.usfm @@ -236,7 +236,7 @@ \v 27 \w בְּ⁠בֹ֤א|lemma="בּוֹא" strong="b:H0935" x-morph="He,R:Vqc"\w* \w כ⁠שאוה|lemma="שַׁאֲוָה" strong="k:H7584" x-morph="He,R:Ncfsa"\w* ׀ -\f + \ft Q \w כְשׁוֹאָ֨ה|lemma="שַׁאֲוָה" strong="k:H7722b" x-morph="He,R:Ncfsa"\w*\f* +\f + \ft Q \+w כְשׁוֹאָ֨ה|lemma="שַׁאֲוָה" strong="k:H7722b" x-morph="He,R:Ncfsa"\+w*\f* \w פַּחְדְּ⁠כֶ֗ם|lemma="פַּחַד" strong="H6343" x-morph="He,Ncmsc:Sp2mp" x-tw="rc://*/tw/dict/bible/kt/fear"\w* \w וְֽ֭⁠אֵידְ⁠כֶם|lemma="אֵיד" strong="c:H0343" x-morph="He,C:Ncmsc:Sp2mp"\w* \w כְּ⁠סוּפָ֣ה|lemma="סוּפָה" strong="k:H5492a" x-morph="He,R:Ncfsa"\w* @@ -347,7 +347,7 @@ \v 7 \w ו⁠צפן|lemma="צָפַן" strong="c:H6845" x-morph="He,C:Vqq3ms"\w* -\f + \ft Q \w יִצְפֹּ֣ן|lemma="צָפַן" strong="c:H6845" x-morph="He,C:Vqi3ms"\w*\f* +\f + \ft Q \+w יִצְפֹּ֣ן|lemma="צָפַן" strong="c:H6845" x-morph="He,C:Vqi3ms"\+w*\f* \w לַ֭⁠יְשָׁרִים|lemma="יָשָׁר" strong="l:H3477" x-morph="He,Rd:Aampa"\w* \w תּוּשִׁיָּ֑ה|lemma="תּוּשִׁיָּה" strong="H8454" x-morph="He,Ncfsa"\w* \w מָ֝גֵ֗ן|lemma="מָגֵן" strong="H4043" x-morph="He,Ncbsa"\w* @@ -360,7 +360,7 @@ \w מִשְׁפָּ֑ט|lemma="מִשְׁפָּט" strong="H4941" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/kt/judge"\w* \w וְ⁠דֶ֖רֶךְ|lemma="דֶּרֶךְ" strong="c:H1870" x-morph="He,C:Ncbsc"\w* \w חֲסִידָ֣יו|lemma="חָסִיד" strong="H2623" x-morph="He,Aamsc:Sp3ms"\w* -\f + \ft K \w חסיד⁠ו|lemma="חָסִיד" strong="H2623" x-morph="He,Aamsc:Sp3ms"\w*\f* +\f + \ft K \+w חסיד⁠ו|lemma="חָסִיד" strong="H2623" x-morph="He,Aamsc:Sp3ms"\+w*\f* \w יִשְׁמֹֽר|lemma="שָׁמַר" strong="H8104" x-morph="He,Vqi3ms" x-tw="rc://*/tw/dict/bible/other/watch"\w*׃ \v 9 @@ -596,7 +596,7 @@ \w יְקָ֣רָה|lemma="יָקָר" strong="H3368" x-morph="He,Aafsa"\w* \w הִ֭יא|lemma="הוּא" strong="H1931" x-morph="He,Pp3fs"\w* \w מִפְּנִינִ֑ים|lemma="פָּנִין" strong="m:H6443" x-morph="He,R:Ncbpa"\w* -\f + \ft K \w מ⁠פניים|lemma="פָּנִין" strong="m:H6443" x-morph="He,R:Ncbpa"\w*\f* +\f + \ft K \+w מ⁠פניים|lemma="פָּנִין" strong="m:H6443" x-morph="He,R:Ncbpa"\+w*\f* \w וְ⁠כָל|lemma="כֹּל" strong="c:H3605" x-morph="He,C:Ncmsc"\w*־\w חֲ֝פָצֶ֗י⁠ךָ|lemma="חֵפֶץ" strong="H2656" x-morph="He,Ncmpc:Sp2ms"\w* \w לֹ֣א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w יִֽשְׁווּ|lemma="שָׁוָה" strong="H7737a" x-morph="He,Vqi3mp"\w*־\w בָֽ⁠הּ|lemma="" strong="b" x-morph="He,R:Sp3fs"\w*׃ @@ -692,13 +692,13 @@ \w בִּ⁠הְי֨וֹת|lemma="הָיָה" strong="b:H1961" x-morph="He,R:Vqc"\w* \w לְ⁠אֵ֖ל|lemma="אֵל" strong="l:H0410" x-morph="He,R:Ncmsc"\w* \w יָדְךָ֣|lemma="יָד" strong="H3027" x-morph="He,Ncbdc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/hand"\w* -\f + \ft K \w ידי⁠ך|lemma="יָד" strong="H3027" x-morph="He,Ncbdc:Sp2ms"\w*\f* +\f + \ft K \+w ידי⁠ך|lemma="יָד" strong="H3027" x-morph="He,Ncbdc:Sp2ms"\+w*\f* \w לַ⁠עֲשֽׂוֹת|lemma="עָשָׂה" strong="l:H6213a" x-morph="He,R:Vqc"\w*׃ \v 28 \w אַל|lemma="אַל" strong="H0408" x-morph="He,Tn"\w*־\w תֹּ֘אמַ֤ר|lemma="אָמַר" strong="H0559" x-morph="He,Vqj2ms"\w* \w לְרֵֽעֲךָ֨|lemma="רֵעַ" strong="l:H7453" x-morph="He,R:Ncmsc:Sp2ms"\w* ׀ -\f + \ft K \w ל⁠רעי⁠ך|lemma="רֵעַ" strong="l:H7453" x-morph="He,R:Ncmpc:Sp2ms"\w*\f* +\f + \ft K \+w ל⁠רעי⁠ך|lemma="רֵעַ" strong="l:H7453" x-morph="He,R:Ncmpc:Sp2ms"\+w*\f* \w לֵ֣ךְ|lemma="יָלַךְ" strong="H3212" x-morph="He,Vqv2ms" x-tw="rc://*/tw/dict/bible/other/walk"\w* \w וָ֭⁠שׁוּב|lemma="שׁוּב" strong="c:H7725" x-morph="He,C:Vqv2ms" x-tw="rc://*/tw/dict/bible/other/return"\w* \w וּ⁠מָחָ֥ר|lemma="מָחָר" strong="c:H4279" x-morph="He,C:Ncmsa"\w* @@ -716,7 +716,7 @@ \v 30 \w אַל|lemma="אַל" strong="H0408" x-morph="He,Tn"\w*־\w תָּרִ֣יב|lemma="רִיב" strong="H7378" x-morph="He,Vqj2ms"\w* -\f + \ft K \w תרוב|lemma="רִיב" strong="H7378" x-morph="He,Vqj2ms"\w*\f* +\f + \ft K \+w תרוב|lemma="רִיב" strong="H7378" x-morph="He,Vqj2ms"\+w*\f* \w עִם|lemma="עִם" strong="H5973a" x-morph="He,R"\w*־\w אָדָ֣ם|lemma="אָדָם" strong="H0120" x-morph="He,Ncmsa"\w* \w חִנָּ֑ם|lemma="חִנָּם" strong="H2600" x-morph="He,D"\w* \w אִם|lemma="אִם" strong="H0518a" x-morph="He,C"\w*־\w לֹ֖א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* @@ -751,7 +751,7 @@ \w אִם|lemma="אִם" strong="H0518a" x-morph="He,C"\w*־\w לַ⁠לֵּצִ֥ים|lemma="לוּץ" strong="l:H3887" x-morph="He,Rd:Aampa"\w* \w הֽוּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w*־\w יָלִ֑יץ|lemma="לוּץ" strong="H3887" x-morph="He,Vhi3ms"\w* \w וְ֝לַעֲנָוִ֗ים|lemma="עָנִי" strong="c:l:H6035" x-morph="He,C:R:Aampa"\w* -\f + \ft K \w ו⁠ל⁠עניים|lemma="עָנִי" strong="c:l:H6041" x-morph="He,C:R:Aampa"\w*\f* +\f + \ft K \+w ו⁠ל⁠עניים|lemma="עָנִי" strong="c:l:H6041" x-morph="He,C:R:Aampa"\+w*\f* \w יִתֶּן|lemma="נָתַן" strong="H5414" x-morph="He,Vqi3ms"\w*־\w חֵֽן|lemma="חֵן" strong="H2580" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/kt/favor"\w*׃ \v 35 @@ -899,7 +899,7 @@ \w שְׁ֝נָתָ֗⁠ם|lemma="שֵׁנָה" strong="H8142" x-morph="He,Ncfsc:Sp3mp"\w* \w אִם|lemma="אִם" strong="H0518a" x-morph="He,C"\w*־\w לֹ֥א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w יַכְשִֽׁילוּ|lemma="כָּשַׁל" strong="H3782" x-morph="He,Vhi3mp"\w*׃ -\f + \ft K \w יכשולו|lemma="כָּשַׁל" strong="H3782" x-morph="He,Vqi3mp"\w*\f* +\f + \ft K \+w יכשולו|lemma="כָּשַׁל" strong="H3782" x-morph="He,Vqi3mp"\+w*\f* \v 17 \w כִּ֣י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* @@ -1295,7 +1295,7 @@ \w רָ֣ע|lemma="רַע" strong="H7451b" x-morph="He,Aamsa" x-tw="rc://*/tw/dict/bible/kt/evil"\w* \w בְּ⁠כָל|lemma="כֹּל" strong="b:H3605" x-morph="He,R:Ncmsc"\w*־\w עֵ֑ת|lemma="עֵת" strong="H6256" x-morph="He,Ncbsa"\w* \w מדנים|lemma="מָדוֹן" strong="H4090" x-morph="He,Ncmpa"\w* -\f + \ft Q \w מִדְיָנִ֥ים|lemma="מָדוֹן" strong="H4079" x-morph="He,Ncmpa"\w*\f* +\f + \ft Q \+w מִדְיָנִ֥ים|lemma="מָדוֹן" strong="H4079" x-morph="He,Ncmpa"\+w*\f* \w יְשַׁלֵּֽחַ|lemma="שָׁלַח" strong="H7971" x-morph="He,Vpi3ms"\w*׃ \v 15 @@ -1848,7 +1848,7 @@ \v 17 \w אֲ֭נִי|lemma="אֲנִי" strong="H0589" x-morph="He,Pp1cs"\w* \w אֹהֲבַ֣י|lemma="אָהַב" strong="H0157" x-morph="He,Vqrmsc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/love"\w* -\f + \ft K \w אהבי⁠ה|lemma="אָהַב" strong="H0157" x-morph="He,Vqrmpc:Sp3fs"\w*\f* +\f + \ft K \+w אהבי⁠ה|lemma="אָהַב" strong="H0157" x-morph="He,Vqrmpc:Sp3fs"\+w*\f* \w אֵהָ֑ב|lemma="אָהַב" strong="H0157" x-morph="He,Vqi1cs" x-tw="rc://*/tw/dict/bible/kt/love"\w* \w וּ֝⁠מְשַׁחֲרַ֗⁠י|lemma="שָׁחַר" strong="c:H7836" x-morph="He,C:Vprmpc:Sp1cs"\w* \w יִמְצָאֻֽ⁠נְנִי|lemma="מָצָא" strong="H4672" x-morph="He,Vqi3mp:Sp1cs"\w*׃ @@ -2001,9 +2001,9 @@ \v 35 \w כִּ֣י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* \w מֹצְאַי|lemma="מָצָא" strong="H4672" x-morph="He,Vqrmpc:Sp1cs"\w* -\f + \ft Q \w מֹ֭צְאִ⁠י|lemma="מָצָא" strong="H4672" x-morph="He,Vqrmsc:Sp1cs"\w*\f* +\f + \ft Q \+w מֹ֭צְאִ⁠י|lemma="מָצָא" strong="H4672" x-morph="He,Vqrmsc:Sp1cs"\+w*\f* \w מֹצְאֵי|lemma="מָצָא" strong="H4672" x-morph="He,Vqrmpc"\w* -\f + \ft Q \w מָצָא|lemma="מָצָא" strong="H4672" x-morph="He,Vqp3ms"\w*\f* +\f + \ft Q \+w מָצָא|lemma="מָצָא" strong="H4672" x-morph="He,Vqp3ms"\+w*\f* \w חַיִּ֑ים|lemma="חַי" strong="H2416e" x-morph="He,Ncmpa"\w* \w וַ⁠יָּ֥פֶק|lemma="פּוּק" strong="c:H6329" x-morph="He,C:Vhw3ms"\w* \w רָ֝צ֗וֹן|lemma="רָצוֹן" strong="H7522" x-morph="He,Ncmsa"\w* @@ -2478,7 +2478,7 @@ \w וְ⁠סֶ֖לֶף|lemma="סֶלֶף" strong="c:H5558" x-morph="He,C:Ncmsc"\w* \w בּוֹגְדִ֣ים|lemma="בָּגַד" strong="H0898" x-morph="He,Vqrmpa"\w* \w יְשָׁדֵּֽם|lemma="שָׁדַד" strong="c:H7703" x-morph="He,Vqi3ms:Sp3mp"\w*׃ -\f + \ft K \w ו⁠שד⁠ם|lemma="שָׁדַד" strong="c:H7701" x-morph="He,C:Ncmsc:Sp3mp"\w*\f* +\f + \ft K \+w ו⁠שד⁠ם|lemma="שָׁדַד" strong="c:H7701" x-morph="He,C:Ncmsc:Sp3mp"\+w*\f* \v 4 \w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w יוֹעִ֣יל|lemma="יָעַל" strong="H3276" x-morph="He,Vhi3ms"\w* @@ -2835,7 +2835,7 @@ \w וּ⁠גְמ֥וּל|lemma="גְּמוּל" strong="c:H1576" x-morph="He,C:Ncmsc"\w* \w יְדֵי|lemma="יָד" strong="H3027" x-morph="He,Ncbdc" x-tw="rc://*/tw/dict/bible/other/hand"\w*־\w אָ֝דָ֗ם|lemma="אָדָם" strong="H0120" x-morph="He,Ncmsa"\w* \w יָשִׁ֥יב|lemma="שׁוּב" strong="H7725" x-morph="He,Vhi3ms" x-tw="rc://*/tw/dict/bible/kt/restore"\w* -\f + \ft K \w ישוב|lemma="שׁוּב" strong="H7725" x-morph="He,Vqi3ms"\w*\f* +\f + \ft K \+w ישוב|lemma="שׁוּב" strong="H7725" x-morph="He,Vqi3ms"\+w*\f* \w לֽ⁠וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w*׃ \v 15 @@ -3121,10 +3121,10 @@ \v 20 \w הוֹלֵ֣ךְ|lemma="הָלַךְ" strong="H1980" x-morph="He,Vqrmsa" x-tw="rc://*/tw/dict/bible/other/walk"\w* -\f + \ft K \w הלוך|lemma="הָלַךְ" strong="H1980" x-morph="He,Vqa"\w*\f* +\f + \ft K \+w הלוך|lemma="הָלַךְ" strong="H1980" x-morph="He,Vqa"\+w*\f* \w אֶת|lemma="אֵת" strong="H0854" x-morph="He,R"\w*־\w חֲכָמִ֣ים|lemma="חָכָם" strong="H2450" x-morph="He,Aampa" x-tw="rc://*/tw/dict/bible/other/wisemen"\w* \w יֶחְכָּ֑ם|lemma="חָכַם" strong="c:H2449" x-morph="He,C:Vqi2ms"\w* -\f + \ft K \w ו⁠חכם|lemma="חָכַם" strong="c:H2449" x-morph="He,C:Vqv2ms"\w*\f* +\f + \ft K \+w ו⁠חכם|lemma="חָכַם" strong="c:H2449" x-morph="He,C:Vqv2ms"\+w*\f* \w וְ⁠רֹעֶ֖ה|lemma="רָעָה" strong="c:H7462c" x-morph="He,C:Vqrmsa"\w* \w כְסִילִ֣ים|lemma="כְּסִיל" strong="H3684" x-morph="He,Aampa"\w* \w יֵרֽוֹעַ|lemma="רָעַע" strong="H7489a" x-morph="He,VNi3ms" x-tw="rc://*/tw/dict/bible/other/afflict"\w*׃ @@ -3349,7 +3349,7 @@ \w חוֹטֵ֑א|lemma="חָטָא" strong="H2398" x-morph="He,Vqrmsa" x-tw="rc://*/tw/dict/bible/kt/sin"\w* \w וּ⁠מְחוֹנֵ֖ן|lemma="חָנַן" strong="c:H2603a" x-morph="He,C:Vmrmsa"\w* \w עניים|lemma="עָנִי" strong="H6041" x-morph="He,Aampa"\w* -\f + \ft Q \w עֲנָוִ֣ים|lemma="עָנִי" strong="H6035" x-morph="He,Aampa"\w*\f* +\f + \ft Q \+w עֲנָוִ֣ים|lemma="עָנִי" strong="H6035" x-morph="He,Aampa"\+w*\f* \w אַשְׁרָֽי⁠ו|lemma="אֶשֶׁר" strong="H0835" x-morph="He,Ncmpc:Sp3ms"\w*׃ \v 22 @@ -3592,7 +3592,7 @@ \w נָ֭בוֹן|lemma="בִּין" strong="H0995" x-morph="He,VNrmsa" x-tw="rc://*/tw/dict/bible/other/understand"\w* \w יְבַקֶּשׁ|lemma="בָּקַשׁ" strong="H1245" x-morph="He,Vpi3ms" x-tw="rc://*/tw/dict/bible/other/seek"\w*־\w דָּ֑עַת|lemma="דַּעַת" strong="H1847" x-morph="He,Ncfsa"\w* \w וּפִ֥י|lemma="פֶּה" strong="c:H6310" x-morph="He,C:Ncbsc" x-tw="rc://*/tw/dict/bible/other/face"\w* -\f + \ft K \w ו⁠פני|lemma="פָּנִים" strong="c:H6440" x-morph="He,C:Ncbpc"\w*\f* +\f + \ft K \+w ו⁠פני|lemma="פָּנִים" strong="c:H6440" x-morph="He,C:Ncbpc"\+w*\f* \w כְ֝סִילִ֗ים|lemma="כְּסִיל" strong="H3684" x-morph="He,Aampa"\w* \w יִרְעֶ֥ה|lemma="רָעָה" strong="H7462b" x-morph="He,Vqi3ms"\w* \w אִוֶּֽלֶת|lemma="אִוֶּלֶת" strong="H0200" x-morph="He,Ncfsa"\w*׃ @@ -3921,7 +3921,7 @@ \w ט֣וֹב|lemma="טוֹב" strong="H2896a" x-morph="He,Aamsa" x-tw="rc://*/tw/dict/bible/kt/good"\w* \w שְׁפַל|lemma="שָׁפָל" strong="H8217" x-morph="He,Vqc"\w*־\w ר֭וּחַ|lemma="רוּחַ" strong="H7307" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/kt/spirit"\w* \w אֶת|lemma="אֵת" strong="H0854" x-morph="He,R"\w*־\w עֲנָוִ֑ים|lemma="עָנִי" strong="H6035" x-morph="He,Aampa"\w* -\f + \ft K \w עניים|lemma="עָנִי" strong="H6041" x-morph="He,Aampa"\w*\f* +\f + \ft K \+w עניים|lemma="עָנִי" strong="H6041" x-morph="He,Aampa"\+w*\f* \w מֵֽ⁠חַלֵּ֥ק|lemma="חָלַק" strong="m:H2505a" x-morph="He,R:Vpc"\w* \w שָׁ֝לָ֗ל|lemma="שָׁלָל" strong="H7998" x-morph="He,Ncmsa"\w* \w אֶת|lemma="אֵת" strong="H0854" x-morph="He,R"\w*־\w גֵּאִֽים|lemma="גֵּאֶה" strong="H1343" x-morph="He,Aampa"\w*׃ @@ -3992,7 +3992,7 @@ \w כֹּרֶ֣ה|lemma="כָּרָה" strong="H3738b" x-morph="He,Vqrmsa"\w* \w רָעָ֑ה|lemma="רַע" strong="H7451c" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/kt/evil"\w* \w וְ⁠עַל|lemma="עַל" strong="c:H5921a" x-morph="He,C:R"\w*־\w שפתי⁠ו|lemma="שָׂפָה" strong="H8193" x-morph="He,Ncfdc:Sp3ms"\w* -\f + \ft Q \w שְׂ֝פָת֗וֹ|lemma="שָׂפָה" strong="H8193" x-morph="He,Ncfsc:Sp3ms"\w*\f* +\f + \ft Q \+w שְׂ֝פָת֗וֹ|lemma="שָׂפָה" strong="H8193" x-morph="He,Ncfsc:Sp3ms"\+w*\f* \w כְּ⁠אֵ֣שׁ|lemma="אֵשׁ" strong="k:H0784" x-morph="He,R:Ncbsa"\w* \w צָרָֽבֶת|lemma="צָרֶבֶת" strong="H6867a" x-morph="He,Aafsa"\w*׃ @@ -4163,7 +4163,7 @@ \w תַּ֣חַת|lemma="תַּחַת" strong="H8478" x-morph="He,R"\w* \w טוֹבָ֑ה|lemma="טוֹב" strong="H2896c" x-morph="He,Aafsa" x-tw="rc://*/tw/dict/bible/kt/good"\w* \w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w תָמ֥וּשׁ|lemma="מוּשׁ" strong="H4185" x-morph="He,Vqi3fs"\w* -\f + \ft K \w תמיש|lemma="מוּשׁ" strong="H4185" x-morph="He,Vhi3fs"\w*\f* +\f + \ft K \+w תמיש|lemma="מוּשׁ" strong="H4185" x-morph="He,Vhi3fs"\+w*\f* \w רָ֝עָ֗ה|lemma="רַע" strong="H7451c" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/kt/evil"\w* \w מִ⁠בֵּיתֽ⁠וֹ|lemma="בַּיִת" strong="m:H1004b" x-morph="He,R:Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/house"\w*׃ @@ -4288,7 +4288,7 @@ \w יוֹדֵ֣עַ|lemma="יָדַע" strong="H3045" x-morph="He,Vqrmsa" x-tw="rc://*/tw/dict/bible/other/know"\w* \w דָּ֑עַת|lemma="דַּעַת" strong="H1847" x-morph="He,Ncfsa"\w* \w ו⁠קר|lemma="קַר" strong="c:H7119" x-morph="He,C:Aamsc"\w*־\w ר֝֗וּחַ|lemma="רוּחַ" strong="H7307" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/kt/spirit"\w* -\f + \ft Q \w יְקַר|lemma="קַר" strong="H3368" x-morph="He,Aamsc"\w*\f* +\f + \ft Q \+w יְקַר|lemma="קַר" strong="H3368" x-morph="He,Aamsc"\+w*\f* \w אִ֣ישׁ|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsc"\w* \w תְּבוּנָֽה|lemma="תָּבוּן" strong="H8394" x-morph="He,Ncfsa"\w*׃ @@ -4443,7 +4443,7 @@ \w הָ⁠רִאשׁ֣וֹן|lemma="רִאשׁוֹן" strong="d:H7223" x-morph="He,Td:Aomsa"\w* \w בְּ⁠רִיב֑⁠וֹ|lemma="רִיב" strong="b:H7379" x-morph="He,R:Ncbsc:Sp3ms"\w* \w וּבָֽא|lemma="בּוֹא" strong="H0935" x-morph="He,Vqq3ms"\w*־\w רֵ֝עֵ֗⁠הוּ|lemma="רֵעַ" strong="H7453" x-morph="He,Ncmsc:Sp3ms"\w* -\f + \ft K \w יבא|lemma="בּוֹא" strong="H0935" x-morph="He,Vqi3ms"\w*\f* +\f + \ft K \+w יבא|lemma="בּוֹא" strong="H0935" x-morph="He,Vqi3ms"\+w*\f* \w וַ⁠חֲקָרֽ⁠וֹ|lemma="חָקַר" strong="c:H2713" x-morph="He,C:Vqq3ms:Sp3ms"\w*׃ \v 18 @@ -4459,7 +4459,7 @@ \w נִפְשָׁ֥ע|lemma="פָּשַׁע" strong="H6586" x-morph="He,VNrmsa"\w* \w מִ⁠קִּרְיַת|lemma="קִרְיָה" strong="m:H7151" x-morph="He,R:Ncfsc"\w*־\w עֹ֑ז|lemma="עֹז" strong="H5797" x-morph="He,Ncmsa"\w* \w ו⁠מדונים|lemma="מָדוֹן" strong="c:H4066" x-morph="He,C:Ncmpa"\w* -\f + \ft Q \w וּ֝מִדְיָנִ֗ים|lemma="מִדְיָן" strong="c:H4066" x-morph="He,C:Ncmpa"\w*\f* +\f + \ft Q \+w וּ֝מִדְיָנִ֗ים|lemma="מִדְיָן" strong="c:H4066" x-morph="He,C:Ncmpa"\+w*\f* \w כִּ⁠בְרִ֥יחַ|lemma="בְּרִיחַ" strong="k:H1280" x-morph="He,R:Ncmsc"\w* \w אַרְמֽוֹן|lemma="אַרְמוֹן" strong="H0759" x-morph="He,Ncmsa"\w*׃ @@ -4574,7 +4574,7 @@ \w מְרַדֵּ֖ף|lemma="רָדַף" strong="H7291" x-morph="He,Vprmsa" x-tw="rc://*/tw/dict/bible/other/persecute"\w* \w אֲמָרִ֣ים|lemma="אֵמֶר" strong="H0561" x-morph="He,Ncmpa"\w* \w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w הֵֽמָּה|lemma="הֵם" strong="H1992" x-morph="He,Pp3mp"\w*׃ -\f + \ft Q \w לוֹ|lemma="לֹא" strong="l" x-morph="He,R:Sp3ms"\w*\f* +\f + \ft Q \+w לוֹ|lemma="לֹא" strong="l" x-morph="He,R:Sp3ms"\+w*\f* \v 8 \w קֹֽנֶה|lemma="קָנָה" strong="H7069" x-morph="He,Vqrmsa" x-tw="rc://*/tw/dict/bible/kt/redeem"\w*־\w לֵּ֭ב|lemma="לֵב" strong="H3820a" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/kt/heart"\w* @@ -4655,7 +4655,7 @@ \w בּוֹזֵ֖ה|lemma="בָּזָה" strong="H0959" x-morph="He,Vqrmsc"\w* \w דְרָכָ֣י⁠ו|lemma="דֶּרֶךְ" strong="H1870" x-morph="He,Ncbpc:Sp3ms"\w* \w יָמֽוּת|lemma="מוּת" strong="H4191" x-morph="He,Vqi3ms"\w*׃ -\f + \ft K \w יומת|lemma="מוּת" strong="H4191" x-morph="He,VHi3ms"\w*\f* +\f + \ft K \+w יומת|lemma="מוּת" strong="H4191" x-morph="He,VHi3ms"\+w*\f* \v 17 \w מַלְוֵ֣ה|lemma="לָוָה" strong="H3867b" x-morph="He,Vhrmsc"\w* @@ -4676,7 +4676,7 @@ \v 19 \w גְּֽדָל|lemma="גָּדוֹל" strong="H1419" x-morph="He,Aamsc"\w*־\w חֵ֭מָה|lemma="חֵמָה" strong="H2534" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/kt/wrath"\w* -\f + \ft K \w גרל|lemma="גּוֹרָל" strong="H1486" x-morph="He,Ncmsc"\w*\f* +\f + \ft K \+w גרל|lemma="גּוֹרָל" strong="H1486" x-morph="He,Ncmsc"\+w*\f* \w נֹ֣שֵׂא|lemma="נָשָׂא" strong="H5375" x-morph="He,Vqrmsa"\w* \w עֹ֑נֶשׁ|lemma="עֹנֶשׁ" strong="H6066" x-morph="He,Ncmsa"\w* \w כִּ֥י|lemma="כִּי" strong="H3588b" x-morph="He,C"\w* @@ -4805,7 +4805,7 @@ \w עָצֵ֣ל|lemma="עָצֵל" strong="H6102" x-morph="He,Aamsa"\w* \w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w יַחֲרֹ֑שׁ|lemma="חָרַשׁ" strong="H2790a" x-morph="He,Vqi3ms"\w* \w וְשָׁאַ֖ל|lemma="שָׁאַל" strong="H7592" x-morph="He,Vqq3ms"\w* -\f + \ft K \w ישאל|lemma="שָׁאַל" strong="H7592" x-morph="He,Vqi3ms"\w*\f* +\f + \ft K \+w ישאל|lemma="שָׁאַל" strong="H7592" x-morph="He,Vqi3ms"\+w*\f* \w בַּ⁠קָּצִ֣יר|lemma="קָצִיר" strong="b:H7105a" x-morph="He,Rd:Ncmsa"\w* \w וָ⁠אָֽיִן|lemma="אַיִן" strong="c:H0369" x-morph="He,C:Tn"\w*׃ @@ -4909,7 +4909,7 @@ \w זָ֑ר|lemma="זוּר" strong="H2114a" x-morph="He,Aamsa"\w* \w וּ⁠בְעַ֖ד|lemma="בְּעַד" strong="c:H1157" x-morph="He,C:R"\w* \w נָכְרִיָּ֣ה|lemma="נׇכְרִי" strong="H5237" x-morph="He,Aamsa" x-tw="rc://*/tw/dict/bible/other/foreigner"\w* -\f + \ft K \w נכרים|lemma="נׇכְרִי" strong="H5237" x-morph="He,Aampa"\w*\f* +\f + \ft K \+w נכרים|lemma="נׇכְרִי" strong="H5237" x-morph="He,Aampa"\+w*\f* \w חַבְלֵֽ⁠הוּ|lemma="חָבַל" strong="H2254a" x-morph="He,Vqv2ms:Sp3ms"\w*׃ \v 17 @@ -4945,13 +4945,13 @@ \w יִֽדְעַ֥ךְ|lemma="דָּעַךְ" strong="H1846" x-morph="He,Vqi3ms"\w* \w נֵ֝ר֗⁠וֹ|lemma="נִיר" strong="H5216a" x-morph="He,Ncmsc:Sp3ms"\w* \w ב⁠אישון|lemma="אִישׁוֹן" strong="b:H0380" x-morph="He,R:Ncmsc"\w* -\f + \ft Q \w בֶּאֱשׁ֥וּן|lemma="אִישׁוֹן" strong="b:H0380" x-morph="He,R:Ncmsc"\w*\f* +\f + \ft Q \+w בֶּאֱשׁ֥וּן|lemma="אִישׁוֹן" strong="b:H0380" x-morph="He,R:Ncmsc"\+w*\f* \w חֹֽשֶׁךְ|lemma="חֹשֶׁךְ" strong="H2822" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/darkness"\w*׃ \v 21 \w נַ֭חֲלָה|lemma="נַחֲלָה" strong="H5159" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/kt/inherit"\w* \w מְבֹהֶ֣לֶת|lemma="בָּחַל" strong="H0926" x-morph="He,VPsfsa"\w* -\f + \ft K \w מבחלת|lemma="בָּחַל" strong="H0973b" x-morph="He,VPsfsa"\w*\f* +\f + \ft K \+w מבחלת|lemma="בָּחַל" strong="H0973b" x-morph="He,VPsfsa"\+w*\f* \w בָּ⁠רִאשֹׁנָ֑ה|lemma="רִאשׁוֹן" strong="b:H7223" x-morph="He,Rd:Aafsa"\w* \w וְ֝⁠אַחֲרִיתָ֗⁠הּ|lemma="אַחֲרִית" strong="c:H0319" x-morph="He,C:Ncfsc:Sp3fs"\w* \w לֹ֣א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* @@ -5027,7 +5027,7 @@ \w חַבֻּר֣וֹת|lemma="חַבּוּרָה" strong="H2250" x-morph="He,Ncfpc"\w* \w פֶּ֭צַע|lemma="פֶּצַע" strong="H6482" x-morph="He,Ncmsa"\w* \w תמריק|lemma="מָרַק" strong="H4838" x-morph="He,Vhi3fs"\w* -\f + \ft Q \w תַּמְר֣וּק|lemma="מָרַק" strong="H8562" x-morph="He,Ncmsa"\w*\f* +\f + \ft Q \+w תַּמְר֣וּק|lemma="מָרַק" strong="H8562" x-morph="He,Ncmsa"\+w*\f* \w בְּ⁠רָ֑ע|lemma="רַע" strong="b:H7451a" x-morph="He,R:Aamsa"\w* \w וּ֝⁠מַכּ֗וֹת|lemma="מַכָּה" strong="c:H4347" x-morph="He,C:Ncfpc"\w* \w חַדְרֵי|lemma="חֶדֶר" strong="H2315" x-morph="He,Ncmpc"\w*־\w בָֽטֶן|lemma="בֶּטֶן" strong="H0990" x-morph="He,Ncfsa"\w*׃ @@ -5192,7 +5192,7 @@ \w בְּ⁠אֶֽרֶץ|lemma="אֶרֶץ" strong="b:H0776" x-morph="He,R:Ncbsc"\w*־\w מִדְבָּ֑ר|lemma="מִדְבָּר" strong="H4057b" x-morph="He,Ncmsa"\w* \w מֵ⁠אֵ֖שֶׁת|lemma="אִשָּׁה" strong="m:H0802" x-morph="He,R:Ncfsc"\w* \w מדונים|lemma="מָדוֹן" strong="H4066" x-morph="He,Ncmpa"\w* -\f + \ft Q \w מִדְיָנִ֣ים|lemma="מָדוֹן" strong="H4066" x-morph="He,Ncmpa"\w*\f* +\f + \ft Q \+w מִדְיָנִ֣ים|lemma="מָדוֹן" strong="H4066" x-morph="He,Ncmpa"\+w*\f* \w וָ⁠כָֽעַס|lemma="כַּעַס" strong="c:H3708a" x-morph="He,C:Ncmsa"\w*׃ \v 20 @@ -5281,9 +5281,9 @@ \w וְ֝⁠יָשָׁ֗ר|lemma="יָשָׁר" strong="c:H3477" x-morph="He,C:Aamsa"\w* \w ה֤וּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w* ׀ \w יָבִ֬ין|lemma="כּוּן" strong="H0995" x-morph="He,Vqi3ms"\w* -\f + \ft K \w יכין|lemma="כּוּן" strong="H3559a" x-morph="He,Vhi3ms"\w*\f* +\f + \ft K \+w יכין|lemma="כּוּן" strong="H3559a" x-morph="He,Vhi3ms"\+w*\f* \w דרכי⁠ו|lemma="דֶּרֶךְ" strong="H1870" x-morph="He,Ncbpc:Sp3ms"\w*׃ -\f + \ft Q \w דרכי⁠ו|lemma="דֶּרֶךְ" strong="H1870" x-morph="He,Ncbsc:Sp3ms"\w*\f* +\f + \ft Q \+w דרכי⁠ו|lemma="דֶּרֶךְ" strong="H1870" x-morph="He,Ncbsc:Sp3ms"\+w*\f* \v 30 \w אֵ֣ין|lemma="אַיִן" strong="H0369" x-morph="He,Tn"\w* @@ -5329,7 +5329,7 @@ \w רָאָ֣ה|lemma="רָאָה" strong="H7200" x-morph="He,Vqp3ms"\w* \w רָעָ֣ה|lemma="רַע" strong="H7451c" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/kt/evil"\w* \w וְנִסְתָּ֑ר|lemma="סָתַר" strong="c:H5641" x-morph="He,C:VNp3ms"\w* -\f + \ft K \w ו⁠יסתר|lemma="סָתַר" strong="c:H5641" x-morph="He,C:VNw3ms"\w*\f* +\f + \ft K \+w ו⁠יסתר|lemma="סָתַר" strong="c:H5641" x-morph="He,C:VNw3ms"\+w*\f* \w וּ֝⁠פְתָיִ֗ים|lemma="פְּתִי" strong="c:H6612a" x-morph="He,C:Aampa"\w* \w עָבְר֥וּ|lemma="עָבַר" strong="H5674a" x-morph="He,Vqp3cp"\w* \w וְֽ⁠נֶעֱנָֽשׁוּ|lemma="עָנַשׁ" strong="c:H6064" x-morph="He,C:VNp3cp"\w*׃ @@ -5376,7 +5376,7 @@ \w זוֹרֵ֣עַ|lemma="זָרַע" strong="H2232" x-morph="He,Vqrmsa"\w* \w עַ֭וְלָה|lemma="עֶוֶל" strong="H5766b" x-morph="He,Ncbsa"\w* \w יקצור|lemma="קָצַר" strong="H7114b" x-morph="He,Vqi3ms" x-tw="rc://*/tw/dict/bible/other/harvest"\w*־\w אָ֑וֶן|lemma="אָוֶן" strong="H0205" x-morph="He,Ncmsa"\w* -\f + \ft Q \w יִקְצָר|lemma="קָצַר" strong="H7114b" x-morph="He,Vqi3ms"\w*\f* +\f + \ft Q \+w יִקְצָר|lemma="קָצַר" strong="H7114b" x-morph="He,Vqi3ms"\+w*\f* \w וְ⁠שֵׁ֖בֶט|lemma="שֵׁבֶט" strong="c:H7626" x-morph="He,C:Ncmsc"\w* \w עֶבְרָת֣⁠וֹ|lemma="עֶבְרָה" strong="H5678" x-morph="He,Ncfsc:Sp3ms"\w* \w יִכְלֶֽה|lemma="כָּלָה" strong="H3615" x-morph="He,Vqi3ms" x-tw="rc://*/tw/dict/bible/other/consume"\w*׃ @@ -5401,7 +5401,7 @@ \v 11 \w אֹהֵ֥ב|lemma="אָהַב" strong="H0157" x-morph="He,Vqrmsa" x-tw="rc://*/tw/dict/bible/kt/love"\w* \w טהור|lemma="טָהוֹר" strong="H2889" x-morph="He,Aamsc" x-tw="rc://*/tw/dict/bible/kt/clean"\w*־\w לֵ֑ב|lemma="לֵב" strong="H3820a" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/kt/heart"\w* -\f + \ft Q \w טְהָר|lemma="טָהוֹר" strong="H2889" x-morph="He,Aamsc"\w*\f* +\f + \ft Q \+w טְהָר|lemma="טָהוֹר" strong="H2889" x-morph="He,Aamsc"\+w*\f* \w חֵ֥ן|lemma="חֵן" strong="H2580" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/favor"\w* \w שְׂ֝פָתָ֗י⁠ו|lemma="שָׂפָה" strong="H8193" x-morph="He,Ncfdc:Sp3ms"\w* \w רֵעֵ֥⁠הוּ|lemma="רֵעַ" strong="H7453" x-morph="He,Ncmsc:Sp3ms"\w* @@ -5433,7 +5433,7 @@ \w זְע֥וּם|lemma="זָעַם" strong="H2194" x-morph="He,Vqsmsc"\w* \w יְ֝הוָ֗ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w יפול|lemma="נָפַל" strong="H5307" x-morph="He,Vqi3ms"\w*־\w שָֽׁם|lemma="שָׁם" strong="H8033" x-morph="He,D"\w*׃ -\f + \ft Q \w יִפָּל|lemma="נָפַל" strong="H5307" x-morph="He,Vqi3ms"\w*\f* +\f + \ft Q \+w יִפָּל|lemma="נָפַל" strong="H5307" x-morph="He,Vqi3ms"\+w*\f* \v 15 \w אִ֭וֶּלֶת|lemma="אִוֶּלֶת" strong="H0200" x-morph="He,Ncfsa"\w* @@ -5484,7 +5484,7 @@ \w כָתַ֣בְתִּי|lemma="כָּתַב" strong="H3789" x-morph="He,Vqp1cs"\w* \w לְ֭⁠ךָ|lemma="" strong="l" x-morph="He,R:Sp2ms"\w* \w שָׁלִישִׁ֑ים|lemma="שִׁלְשׁוֹם" strong="H7991c" x-morph="He,Aompa"\w* -\f + \ft K \w שלשום|lemma="שִׁלְשׁוֹם" strong="H8032" x-morph="He,D"\w*\f* +\f + \ft K \+w שלשום|lemma="שִׁלְשׁוֹם" strong="H8032" x-morph="He,D"\+w*\f* \w בְּ⁠מ֖וֹעֵצֹ֣ת|lemma="מוֹעֵצָה" strong="b:H4156" x-morph="He,R:Ncfpa"\w* \w וָ⁠דָֽעַת|lemma="דַּעַת" strong="c:H1847" x-morph="He,C:Ncfsa"\w*׃ @@ -5526,7 +5526,7 @@ \v 25 \w פֶּן|lemma="פֵּן" strong="H6435" x-morph="He,C"\w*־\w תֶּאֱלַ֥ף|lemma="אָלַף" strong="H0502" x-morph="He,Vqi2ms"\w* \w אֹֽרְחֹתָ֑יו|lemma="אֹרַח" strong="H0734" x-morph="He,Ncbpc:Sp3ms"\w* -\f + \ft K \w ארחת⁠ו|lemma="אֹרַח" strong="H0734" x-morph="He,Ncbsc:Sp3ms"\w*\f* +\f + \ft K \+w ארחת⁠ו|lemma="אֹרַח" strong="H0734" x-morph="He,Ncbsc:Sp3ms"\+w*\f* \w וְ⁠לָקַחְתָּ֖|lemma="לָקַח" strong="c:H3947" x-morph="He,C:Vqq2ms"\w* \w מוֹקֵ֣שׁ|lemma="מוֹקֵשׁ" strong="H4170" x-morph="He,Ncmsa"\w* \w לְ⁠נַפְשֶֽׁ⁠ךָ|lemma="נֶפֶשׁ" strong="l:H5315" x-morph="He,R:Ncbsc:Sp2ms"\w*׃ @@ -5586,7 +5586,7 @@ \v 3 \w אַל|lemma="אַל" strong="H0408" x-morph="He,Tn"\w*־\w תתאו|lemma="אָוָה" strong="H0183" x-morph="He,Vtj2ms"\w* -\f + \ft Q \w תִּ֝תְאָ֗יו|lemma="אָוָה" strong="H0183" x-morph="He,Vtj2ms"\w*\f* +\f + \ft Q \+w תִּ֝תְאָ֗יו|lemma="אָוָה" strong="H0183" x-morph="He,Vtj2ms"\+w*\f* \w לְ⁠מַטְעַמּוֹתָ֑י⁠ו|lemma="מַטְעַם" strong="l:H4303" x-morph="He,R:Ncmpc:Sp3ms"\w* \w וְ֝⁠ה֗וּא|lemma="הוּא" strong="c:H1931" x-morph="He,C:Pp3ms"\w* \w לֶ֣חֶם|lemma="לֶחֶם" strong="H3899" x-morph="He,Ncbsc" x-tw="rc://*/tw/dict/bible/other/bread"\w* @@ -5600,7 +5600,7 @@ \v 5 \w הֲתָ֤עִיף|lemma="עוּף" strong="i:H5774a" x-morph="He,Ti:Vhi2ms"\w* -\f + \ft K \w ה⁠תעוף|lemma="עוּף" strong="i:H5774a" x-morph="He,Ti:Vqi2ms"\w*\f* +\f + \ft K \+w ה⁠תעוף|lemma="עוּף" strong="i:H5774a" x-morph="He,Ti:Vqi2ms"\+w*\f* \w עֵינֶ֥י⁠ךָ|lemma="עַיִן" strong="H5869a" x-morph="He,Ncbdc:Sp2ms"\w* \w בּ֗⁠וֹ|lemma="" strong="b" x-morph="He,R:Sp3ms"\w* \w וְֽ⁠אֵ֫ינֶ֥⁠נּוּ|lemma="אַיִן" strong="c:H0369" x-morph="He,C:Tn:Sp3ms"\w* @@ -5610,7 +5610,7 @@ \w כְנָפַ֑יִם|lemma="כָּנָף" strong="H3671" x-morph="He,Ncfda"\w* \w כְּ֝⁠נֶ֗שֶׁר|lemma="נֶשֶׁר" strong="k:H5404" x-morph="He,R:Ncmsa"\w* \w יָע֥וּף|lemma="עוּף" strong="c:H5774a" x-morph="He,C:Vqi3ms"\w* -\f + \ft K \w ו⁠עיף|lemma="עוּף" strong="c:H5774a" x-morph="He,C:Vqq3ms"\w*\f* +\f + \ft K \+w ו⁠עיף|lemma="עוּף" strong="c:H5774a" x-morph="He,C:Vqq3ms"\+w*\f* \w הַ⁠שָּׁמָֽיִם|lemma="שָׁמַיִם" strong="d:H8064" x-morph="He,Td:Ncmpa" x-tw="rc://*/tw/dict/bible/kt/heaven"\w*׃פ \v 6 @@ -5619,7 +5619,7 @@ \w רַ֣ע|lemma="רַע" strong="H7451a" x-morph="He,Aamsc" x-tw="rc://*/tw/dict/bible/kt/evil"\w* \w עָ֑יִן|lemma="עַיִן" strong="H5869a" x-morph="He,Ncbsa"\w* \w וְ⁠אַל|lemma="אַל" strong="c:H0408" x-morph="He,C:Tn"\w*־\w תתאו|lemma="אָוָה" strong="H0183" x-morph="He,Vtj2ms"\w* -\f + \ft Q \w תִּ֝תְאָ֗יו|lemma="אָוָה" strong="H0183" x-morph="He,Vtj2ms"\w*\f* +\f + \ft Q \+w תִּ֝תְאָ֗יו|lemma="אָוָה" strong="H0183" x-morph="He,Vtj2ms"\+w*\f* \w לְ⁠מַטְעַמֹּתָֽי⁠ו|lemma="מַטְעַם" strong="l:H4303" x-morph="He,R:Ncmpc:Sp3ms"\w*׃ \v 7 @@ -5761,16 +5761,16 @@ \v 24 \w גִּ֣יל|lemma="גִּיל" strong="H1523" x-morph="He,Vqa"\w* -\f + \ft K \w גול|lemma="גִּיל" strong="H1523" x-morph="He,Vqa"\w*\f* +\f + \ft K \+w גול|lemma="גִּיל" strong="H1523" x-morph="He,Vqa"\+w*\f* \w יָ֭גִיל|lemma="גִּיל" strong="H1523" x-morph="He,Vqi3ms"\w* -\f + \ft K \w יגול|lemma="גִּיל" strong="H1523" x-morph="He,Vqi3ms"\w*\f* +\f + \ft K \+w יגול|lemma="גִּיל" strong="H1523" x-morph="He,Vqi3ms"\+w*\f* \w אֲבִ֣י|lemma="אָב" strong="H0001" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/father"\w* \w צַדִּ֑יק|lemma="צַדִּיק" strong="H6662" x-morph="He,Aamsa" x-tw="rc://*/tw/dict/bible/kt/righteous"\w* \w וְיוֹלֵ֥ד|lemma="יָלַד" strong="c:H3205" x-morph="He,C:Vqrmsa"\w* -\f + \ft K \w יולד|lemma="יָלַד" strong="H3205" x-morph="He,Vqrmsa"\w*\f* +\f + \ft K \+w יולד|lemma="יָלַד" strong="H3205" x-morph="He,Vqrmsa"\+w*\f* \w חָ֝כָ֗ם|lemma="חָכָם" strong="H2450" x-morph="He,Aamsa" x-tw="rc://*/tw/dict/bible/other/wisemen"\w* \w יִשְׂמַח|lemma="שָׂמַח" strong="H8055" x-morph="He,Vqi3ms" x-tw="rc://*/tw/dict/bible/other/joy"\w*־\w בּֽ⁠וֹ|lemma="שָׂמַח" strong="b:H8055" x-morph="He,R:Sp3ms"\w*׃ -\f + \ft K \w ו⁠ישמח|lemma="שָׂמַח" strong="c:H8055" x-morph="He,C:Vqi3ms"\w*\f* +\f + \ft K \+w ו⁠ישמח|lemma="שָׂמַח" strong="c:H8055" x-morph="He,C:Vqi3ms"\+w*\f* \v 25 \w יִֽשְׂמַח|lemma="שָׂמַח" strong="H8055" x-morph="He,Vqj3ms" x-tw="rc://*/tw/dict/bible/other/joy"\w*־\w אָבִ֥י⁠ךָ|lemma="אָב" strong="H0001" x-morph="He,Ncmsc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/father"\w* @@ -5785,7 +5785,7 @@ \w וְ֝⁠עֵינֶ֗י⁠ךָ|lemma="עַיִן" strong="c:H5869a" x-morph="He,C:Ncbdc:Sp2ms"\w* \w דְּרָכַ֥⁠י|lemma="דֶּרֶךְ" strong="H1870" x-morph="He,Ncbpc:Sp1cs"\w* \w תִּצֹּֽרְנָה|lemma="רָצָה" strong="H5341" x-morph="He,Vqj3fp"\w*׃ -\f + \ft K \w תרצנה|lemma="רָצָה" strong="H7521" x-morph="He,Vqj3fp"\w*\f* +\f + \ft K \+w תרצנה|lemma="רָצָה" strong="H7521" x-morph="He,Vqj3fp"\+w*\f* \v 27 \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w שׁוּחָ֣ה|lemma="שׁוּחָה" strong="H7745" x-morph="He,Ncfsa"\w* @@ -5810,7 +5810,7 @@ \w אֲב֡וֹי|lemma="אֲבוֹי" strong="H0017" x-morph="He,Tj"\w* \w לְ⁠מִ֤י|lemma="מִי" strong="l:H4310" x-morph="He,R:Ti"\w* \w מדונים|lemma="מָדוֹן" strong="H4066" x-morph="He,Ncmpa"\w* ׀ -\f + \ft Q \w מִדְיָנִ֨ים|lemma="מָדוֹן" strong="H4066" x-morph="He,Ncmpa"\w*\f* +\f + \ft Q \+w מִדְיָנִ֨ים|lemma="מָדוֹן" strong="H4066" x-morph="He,Ncmpa"\+w*\f* \w לְ⁠מִ֥י|lemma="מִי" strong="l:H4310" x-morph="He,R:Ti"\w* \w שִׂ֗יחַ|lemma="שִׂיחַ" strong="H7879" x-morph="He,Ncmsa"\w* \w לְ֭⁠מִי|lemma="מִי" strong="l:H4310" x-morph="He,R:Ti"\w* @@ -5834,7 +5834,7 @@ \w יִתְאַ֫דָּ֥ם|lemma="אָדַם" strong="H0119" x-morph="He,Vti3ms"\w* \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w יִתֵּ֣ן|lemma="נָתַן" strong="H5414" x-morph="He,Vqi3ms"\w* \w בַּכּ֣וֹס|lemma="כּוֹס" strong="b:H3563" x-morph="He,Rd:Ncfsa"\w* -\f + \ft K \w ב⁠כיס|lemma="כִּיס" strong="b:H3599" x-morph="He,Rd:Ncmsa"\w*\f* +\f + \ft K \+w ב⁠כיס|lemma="כִּיס" strong="b:H3599" x-morph="He,Rd:Ncmsa"\+w*\f* \w עֵינ֑⁠וֹ|lemma="עַיִן" strong="H5869a" x-morph="He,Ncbsc:Sp3ms"\w* \w יִ֝תְהַלֵּ֗ךְ|lemma="הָלַךְ" strong="H1980" x-morph="He,Vti3ms" x-tw="rc://*/tw/dict/bible/other/walk"\w* \w בְּ⁠מֵישָׁרִֽים|lemma="מֵישָׁר" strong="b:H4339" x-morph="He,R:Ncmpa"\w*׃ @@ -5881,7 +5881,7 @@ \w בְּ⁠אַנְשֵׁ֣י|lemma="אִישׁ" strong="b:H0376" x-morph="He,R:Ncmpc"\w* \w רָעָ֑ה|lemma="רַע" strong="H7451c" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/kt/evil"\w* \w וְ⁠אַל|lemma="אַל" strong="c:H0408" x-morph="He,C:Tn"\w*־\w תתאו|lemma="אָוָה" strong="H0183" x-morph="He,Vtj2ms"\w* -\f + \ft Q \w תִּ֝תְאָ֗יו|lemma="אָוָה" strong="H0183" x-morph="He,Vtj2ms"\w*\f* +\f + \ft Q \+w תִּ֝תְאָ֗יו|lemma="אָוָה" strong="H0183" x-morph="He,Vtj2ms"\+w*\f* \w לִ⁠הְי֥וֹת|lemma="הָיָה" strong="l:H1961" x-morph="He,R:Vqc"\w* \w אִתָּֽ⁠ם|lemma="אֵת" strong="H0854" x-morph="He,R:Sp3mp"\w*׃ @@ -6018,7 +6018,7 @@ \v 17 \w בִּ⁠נְפֹ֣ל|lemma="נָפַל" strong="b:H5307" x-morph="He,R:Vqc"\w* \w אֽ֭וֹיִבְךָ|lemma="אֹיֵב" strong="H0341" x-morph="He,Vqrmsc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/adversary"\w* -\f + \ft K \w אויבי⁠ך|lemma="אֹיֵב" strong="H0341" x-morph="He,Vqrmpc:Sp2ms"\w*\f* +\f + \ft K \+w אויבי⁠ך|lemma="אֹיֵב" strong="H0341" x-morph="He,Vqrmpc:Sp2ms"\+w*\f* \w אַל|lemma="אַל" strong="H0408" x-morph="He,Tn"\w*־\w תִּשְׂמָ֑ח|lemma="שָׂמַח" strong="H8055" x-morph="He,Vqj2ms" x-tw="rc://*/tw/dict/bible/other/joy"\w* \w וּ֝⁠בִ⁠כָּשְׁל֗⁠וֹ|lemma="כָּשַׁל" strong="c:b:H3782" x-morph="He,C:R:VNc:Sp3ms"\w* \w אַל|lemma="אַל" strong="H0408" x-morph="He,Tn"\w*־\w יָגֵ֥ל|lemma="גִּיל" strong="H1523" x-morph="He,Vqj3ms"\w* @@ -6394,7 +6394,7 @@ \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w פִּנַּת|lemma="פִּנָּה" strong="H6438" x-morph="He,Ncfsc"\w*־\w גָּ֑ג|lemma="גָּג" strong="H1406" x-morph="He,Ncmsa"\w* \w מֵ⁠אֵ֥שֶׁת|lemma="אִשָּׁה" strong="m:H0802" x-morph="He,R:Ncfsc"\w* \w מדונים|lemma="מָדוֹן" strong="H4066" x-morph="He,Ncmpa"\w* -\f + \ft Q \w מִ֝דְיָנִ֗ים|lemma="מָדוֹן" strong="H4066" x-morph="He,Ncmpa"\w*\f* +\f + \ft Q \+w מִ֝דְיָנִ֗ים|lemma="מָדוֹן" strong="H4066" x-morph="He,Ncmpa"\+w*\f* \w וּ⁠בֵ֥ית|lemma="בַּיִת" strong="c:H1004b" x-morph="He,C:Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w* \w חָֽבֶר|lemma="חֶבֶר" strong="H2267" x-morph="He,Ncmsa"\w*׃ @@ -6459,7 +6459,7 @@ \w קִֽלְלַ֥ת|lemma="קְלָלָה" strong="H7045" x-morph="He,Ncfsc"\w* \w חִ֝נָּ֗ם|lemma="חִנָּם" strong="H2600" x-morph="He,D"\w* \w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* -\f + \ft Q \w ל֣וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w*\f* +\f + \ft Q \+w ל֣וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\+w*\f* \w תָבֹֽא|lemma="בּוֹא" strong="H0935" x-morph="He,Vqi3fs"\w*׃ \v 3 @@ -6616,7 +6616,7 @@ \w לְ⁠אֵ֑שׁ|lemma="אֵשׁ" strong="l:H0784" x-morph="He,R:Ncbsa"\w* \w וְ⁠אִ֥ישׁ|lemma="אִישׁ" strong="c:H0376" x-morph="He,C:Ncmsc"\w* \w מדונים|lemma="מָדוֹן" strong="H4066" x-morph="He,Ncmpa"\w* -\f + \ft Q \w מִ֝דְיָנִ֗ים|lemma="מָדוֹן" strong="H4066" x-morph="He,Ncmpa"\w*\f* +\f + \ft Q \+w מִ֝דְיָנִ֗ים|lemma="מָדוֹן" strong="H4066" x-morph="He,Ncmpa"\+w*\f* \w לְ⁠חַרְחַר|lemma="חָרַר" strong="l:H2787" x-morph="He,R:Vlc"\w*־\w רִֽיב|lemma="רִיב" strong="H7379" x-morph="He,Ncbsa"\w*׃פ \v 22 @@ -6638,7 +6638,7 @@ \v 24 \w בִּ֭שְׂפָתָיו|lemma="שָׂפָה" strong="b:H8193" x-morph="He,R:Ncfdc:Sp3ms"\w* -\f + \ft K \w ב⁠שפת⁠ו|lemma="שָׂפָה" strong="b:H8193" x-morph="He,R:Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w ב⁠שפת⁠ו|lemma="שָׂפָה" strong="b:H8193" x-morph="He,R:Ncfsc:Sp3ms"\+w*\f* \w יִנָּכֵ֣ר|lemma="נָכַר" strong="H5234b" x-morph="He,VNi3ms"\w* \w שׂוֹנֵ֑א|lemma="שָׂנֵא" strong="H8130" x-morph="He,Vqrmsa"\w* \w וּ֝⁠בְ⁠קִרְבּ֗⁠וֹ|lemma="קֶרֶב" strong="c:b:H7130" x-morph="He,C:R:Ncmsc:Sp3ms"\w* @@ -6762,7 +6762,7 @@ \v 10 \w רֵֽעֲ⁠ךָ֨|lemma="רֵעַ" strong="H7453" x-morph="He,Ncmsc:Sp2ms"\w* \w וְרֵ֪עַ|lemma="רֵעַ" strong="c:H7453" x-morph="He,C:Ncmsc"\w* -\f + \ft K \w ו⁠רעה|lemma="רֵעֶה" strong="c:H7463" x-morph="He,C:Ncmsc"\w*\f* +\f + \ft K \+w ו⁠רעה|lemma="רֵעֶה" strong="c:H7463" x-morph="He,C:Ncmsc"\+w*\f* \w אָבִ֡י⁠ךָ|lemma="אָב" strong="H0001" x-morph="He,Ncmsc:Sp2ms" x-tw="rc://*/tw/dict/bible/other/father"\w* \w אַֽל|lemma="אַל" strong="H0408" x-morph="He,Tn"\w*־\w תַּעֲזֹ֗ב|lemma="עָזַב" strong="H5800a" x-morph="He,Vqj2ms" x-tw="rc://*/tw/dict/bible/other/forsaken"\w* \w וּ⁠בֵ֥ית|lemma="בַּיִת" strong="c:H1004b" x-morph="He,C:Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w* @@ -6820,7 +6820,7 @@ \w סַגְרִ֑יר|lemma="סַגְרִיד" strong="H5464" x-morph="He,Ncmsa"\w* \w וְ⁠אֵ֥שֶׁת|lemma="אִשָּׁה" strong="c:H0802" x-morph="He,C:Ncfsc"\w* \w מדונים|lemma="מָדוֹן" strong="H4066" x-morph="He,Ncmpa"\w* -\f + \ft Q \w מִ֝דְיָנִ֗ים|lemma="מָדוֹן" strong="H4066" x-morph="He,Ncmpa"\w*\f* +\f + \ft Q \+w מִ֝דְיָנִ֗ים|lemma="מָדוֹן" strong="H4066" x-morph="He,Ncmpa"\+w*\f* \w נִשְׁתָּוָֽה|lemma="שָׁוָה" strong="H7737a" x-morph="He,VDp3fs"\w*׃ \v 16 @@ -6858,7 +6858,7 @@ \v 20 \w שְׁא֣וֹל|lemma="שְׁאוֹל" strong="H7585" x-morph="He,Np"\w* \w וַ֭אֲבַדּוֹ|lemma="אֲבַדּוֹן" strong="c:H0011" x-morph="He,C:Ncmsc"\w* -\f + \ft K \w ו⁠אבדה|lemma="אֲבַדּוֹן" strong="c:H0011" x-morph="He,C:Ncmsc"\w*\f* +\f + \ft K \+w ו⁠אבדה|lemma="אֲבַדּוֹן" strong="c:H0011" x-morph="He,C:Ncmsc"\+w*\f* \w לֹ֣א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w תִשְׂבַּ֑עְנָה|lemma="שָׂבַע" strong="H7646" x-morph="He,Vqi3fp"\w* \w וְ⁠עֵינֵ֥י|lemma="עַיִן" strong="c:H5869a" x-morph="He,C:Ncbdc"\w* @@ -6903,7 +6903,7 @@ \w וְ⁠אִם|lemma="אִם" strong="c:H0518a" x-morph="He,C:C"\w*־\w נֵ֝֗זֶר|lemma="נֶזֶר" strong="H5145" x-morph="He,Ncmsa"\w* \w לְ⁠ד֣וֹר|lemma="דּוֹר" strong="l:H1755" x-morph="He,R:Ncmsa" x-tw="rc://*/tw/dict/bible/other/generation"\w* \w וָדֽוֹר|lemma="דּוֹר" strong="c:H1755" x-morph="He,C:Ncmsa" x-tw="rc://*/tw/dict/bible/other/generation"\w*׃ -\f + \ft K \w דור|lemma="דּוֹר" strong="H1755" x-morph="He,Ncmsa"\w*\f* +\f + \ft K \+w דור|lemma="דּוֹר" strong="H1755" x-morph="He,Ncmsa"\+w*\f* \v 25 \w גָּלָ֣ה|lemma="גָּלָה" strong="H1540" x-morph="He,Vqp3ms" x-tw="rc://*/tw/dict/bible/other/exile"\w* @@ -7005,7 +7005,7 @@ \w ה֭וֹנ⁠וֹ|lemma="הוֹן" strong="H1952" x-morph="He,Ncmsc:Sp3ms"\w* \w בְּ⁠נֶ֣שֶׁךְ|lemma="נֶשֶׁךְ" strong="b:H5392" x-morph="He,R:Ncmsa"\w* \w וְתַרְבִּ֑ית|lemma="תַּרְבִּית" strong="c:H8636" x-morph="He,C:Ncfsa"\w* -\f + \ft K \w ו⁠ב⁠תרבית|lemma="תַּרְבִּית" strong="c:b:H8636" x-morph="He,C:R:Ncfsa"\w*\f* +\f + \ft K \+w ו⁠ב⁠תרבית|lemma="תַּרְבִּית" strong="c:b:H8636" x-morph="He,C:R:Ncfsa"\+w*\f* \w לְ⁠חוֹנֵ֖ן|lemma="חָנַן" strong="l:H2603a" x-morph="He,R:Vqrmsa"\w* \w דַּלִּ֣ים|lemma="דַּל" strong="H1800" x-morph="He,Aampa"\w* \w יִקְבְּצֶֽ⁠נּוּ|lemma="קָבַץ" strong="H6908" x-morph="He,Vqi3ms:Sp3ms"\w*׃ @@ -7082,7 +7082,7 @@ \w וְ⁠רַ֥ב|lemma="רַב" strong="c:H7227a" x-morph="He,C:Aamsc"\w* \w מַעֲשַׁקּ֑וֹת|lemma="מַעֲשַׁקָּה" strong="H4642" x-morph="He,Ncfpa"\w* \w שֹׂ֥נֵא|lemma="שָׂנֵא" strong="H8130" x-morph="He,Vqrmsc"\w* -\f + \ft K \w שנאי|lemma="שָׂנֵא" strong="H8130" x-morph="He,Vqrmpc"\w*\f* +\f + \ft K \+w שנאי|lemma="שָׂנֵא" strong="H8130" x-morph="He,Vqrmpc"\+w*\f* \w בֶ֝֗צַע|lemma="בֶּצַע" strong="H1215" x-morph="He,Ncmsa"\w* \w יַאֲרִ֥יךְ|lemma="אָרַךְ" strong="H0748" x-morph="He,Vhi3ms"\w* \w יָמִֽים|lemma="יוֹם" strong="H3117" x-morph="He,Ncmpa"\w*׃פ @@ -7532,7 +7532,7 @@ \w אַל|lemma="אַל" strong="H0408" x-morph="He,Tn"\w*־\w תַּלְשֵׁ֣ן|lemma="לָשַׁן" strong="H3960" x-morph="He,Vhj2ms"\w* \w עֶ֭בֶד|lemma="עֶבֶד" strong="H5650" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/servant"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w אדנ⁠ו|lemma="אָדוֹן" strong="H0113" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/lord"\w* -\f + \ft Q \w אֲדֹנָ֑יו|lemma="אָדוֹן" strong="H0113" x-morph="He,Ncmpc:Sp3ms"\w*\f* +\f + \ft Q \+w אֲדֹנָ֑יו|lemma="אָדוֹן" strong="H0113" x-morph="He,Ncmpc:Sp3ms"\+w*\f* \w פֶּֽן|lemma="פֵּן" strong="H6435" x-morph="He,C"\w*־\w יְקַלֶּלְ⁠ךָ֥|lemma="קָלַל" strong="H7043" x-morph="He,Vpi3ms:Sp2ms"\w* \w וְ⁠אָשָֽׁמְתָּ|lemma="אָשַׁם" strong="c:H0816" x-morph="He,C:Vqq2ms"\w*׃ @@ -7613,7 +7613,7 @@ \w נִפְלְא֣וּ|lemma="פָּלָא" strong="H6381" x-morph="He,VNp3cp" x-tw="rc://*/tw/dict/bible/kt/miracle"\w* \w מִמֶּ֑⁠נִּי|lemma="מִן" strong="H4480a" x-morph="He,R:Sp1cs"\w* \w וְ֝אַרְבָּעָ֗ה|lemma="אַרְבַּע" strong="c:H0702" x-morph="He,C:Acmsa"\w* -\f + \ft K \w ו⁠ארבע|lemma="אַרְבַּע" strong="c:H0702" x-morph="He,C:Acfsa"\w*\f* +\f + \ft K \+w ו⁠ארבע|lemma="אַרְבַּע" strong="c:H0702" x-morph="He,C:Acfsa"\+w*\f* \w לֹ֣א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w יְדַעְתִּֽי⁠ם|lemma="יָדַע" strong="H3045" x-morph="He,Vqp1cs:Sp3mp" x-tw="rc://*/tw/dict/bible/other/know"\w*׃ @@ -7789,7 +7789,7 @@ \w שְׁתוֹ|lemma="שָׁתָה" strong="H8354" x-morph="He,Vqc"\w*־\w יָ֑יִן|lemma="יַיִן" strong="H3196" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/wine"\w* \w וּ֝⁠לְ⁠רוֹזְנִ֗ים|lemma="רָזַן" strong="c:l:H7336" x-morph="He,C:R:Vqrmpa"\w* \w או|lemma="אוֹ" strong="H0176b" x-morph="He,C"\w* -\f + \ft Q \w אֵ֣י|lemma="אֵי" strong="H0335" x-morph="He,Ti"\w*\f* +\f + \ft Q \+w אֵ֣י|lemma="אֵי" strong="H0335" x-morph="He,Ti"\+w*\f* \w שֵׁכָֽר|lemma="שֵׁכָר" strong="H7941" x-morph="He,Ncmsa"\w*׃ \v 5 @@ -7887,7 +7887,7 @@ \w מִ⁠פְּרִ֥י|lemma="פְּרִי" strong="m:H6529" x-morph="He,R:Ncmsc"\w* \w כַ֝פֶּ֗י⁠הָ|lemma="כַּף" strong="H3709" x-morph="He,Ncfdc:Sp3fs" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w נָ֣טְעָה|lemma="נָטַע" strong="H5193" x-morph="He,Vqp3fs"\w* -\f + \ft K \w נטע|lemma="נָטַע" strong="H5193" x-morph="He,Vqp3ms"\w*\f* +\f + \ft K \+w נטע|lemma="נָטַע" strong="H5193" x-morph="He,Vqp3ms"\+w*\f* \w כָּֽרֶם|lemma="כֶּרֶם" strong="H3754" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/other/vineyard"\w*׃ \v 17 @@ -7903,7 +7903,7 @@ \w סַחְרָ֑⁠הּ|lemma="סַחַר" strong="H5504" x-morph="He,Ncmsc:Sp3fs"\w* \w לֹֽא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w יִכְבֶּ֖ה|lemma="כָּבָה" strong="H3518" x-morph="He,Vqi3ms"\w* \w בַלַּ֣יְלָה|lemma="לַיְלָה" strong="b:H3915" x-morph="He,Rd:Ncmsa"\w* -\f + \ft K \w ב⁠ליל|lemma="לַיִל" strong="b:H3915" x-morph="He,Rd:Ncmsa"\w*\f* +\f + \ft K \+w ב⁠ליל|lemma="לַיִל" strong="b:H3915" x-morph="He,Rd:Ncmsa"\+w*\f* \w נֵרָֽ⁠הּ|lemma="נִיר" strong="H5216a" x-morph="He,Ncmsc:Sp3fs"\w*׃ \v 19 diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/21-ECC.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/21-ECC.usfm index 19273241..71b6abb1 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/21-ECC.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/21-ECC.usfm @@ -1018,7 +1018,7 @@ \w קֵץ֙|lemma="קֵץ" strong="H7093" x-morph="He,Ncmsa"\w* \w לְ⁠כָל|lemma="כֹּל" strong="l:H3605" x-morph="He,R:Ncmsc"\w*־\w עֲמָל֔⁠וֹ|lemma="עָמָל" strong="H5999" x-morph="He,Ncbsc:Sp3ms"\w* \w גַּם|lemma="גַּם" strong="H1571" x-morph="He,Ta"\w*־\w עֵינ֖וֹ|lemma="עַיִן" strong="H5869a" x-morph="He,Ncbsc:Sp3ms"\w* -\f + \ft K \w עיני⁠ו|lemma="עַיִן" strong="H5869a" x-morph="He,Ncbdc:Sp3ms"\w*\f* +\f + \ft K \+w עיני⁠ו|lemma="עַיִן" strong="H5869a" x-morph="He,Ncbdc:Sp3ms"\+w*\f* \w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w תִשְׂבַּ֣ע|lemma="שָׂבַע" strong="H7646" x-morph="He,Vqi3fs"\w* \w עֹ֑שֶׁר|lemma="עֹשֶׁר" strong="H6239" x-morph="He,Ncmsa"\w* \w וּ⁠לְ⁠מִ֣י|lemma="מִי" strong="c:l:H4310" x-morph="He,C:R:Ti"\w* ׀ @@ -1137,7 +1137,7 @@ \va 4:17\va* \w שְׁמֹ֣ר|lemma="שָׁמַר" strong="H8104" x-morph="He,Vqv2ms" x-tw="rc://*/tw/dict/bible/other/watch"\w* \w רגלי⁠ך|lemma="רֶגֶל" strong="H7272" x-morph="He,Ncfdc:Sp2ms"\w* -\f + \ft Q \w רַגְלְךָ֗|lemma="רֶגֶל" strong="H7272" x-morph="He,Ncfsdc:Sp2ms"\w*\f* +\f + \ft Q \+w רַגְלְךָ֗|lemma="רֶגֶל" strong="H7272" x-morph="He,Ncfsdc:Sp2ms"\+w*\f* \w כַּ⁠אֲשֶׁ֤ר|lemma="אֲשֶׁר" strong="k:H0834d" x-morph="He,R:Tr"\w* \w תֵּלֵךְ֙|lemma="יָלַךְ" strong="H3212" x-morph="He,Vqi2ms" x-tw="rc://*/tw/dict/bible/other/walk"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w בֵּ֣ית|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w* @@ -1268,7 +1268,7 @@ \w אֶ֖רֶץ|lemma="אֶרֶץ" strong="H0776" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w* \w בַּ⁠כֹּ֣ל|lemma="כֹּל" strong="b:H3605" x-morph="He,Rd:Ncmsa"\w* \w היא|lemma="הוּא" strong="H1931" x-morph="He,Pp3fs"\w* -\f + \ft Q \w ה֑וּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3fs"\w*\f* +\f + \ft Q \+w ה֑וּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3fs"\+w*\f* \w מֶ֥לֶךְ|lemma="מֶלֶךְ" strong="H4428" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* \w לְ⁠שָׂדֶ֖ה|lemma="שָׂדֶה" strong="l:H7704b" x-morph="He,R:Ncmsa"\w* \w נֶעֱבָֽד|lemma="עָבַד" strong="H5647" x-morph="He,VNp3ms" x-tw="rc://*/tw/dict/bible/other/servant"\w*׃ @@ -1296,7 +1296,7 @@ \w לִ⁠בְעָלֶ֔י⁠הָ|lemma="בַּעַל" strong="l:H1167" x-morph="He,R:Ncmpc:Sp3fs"\w* \w כִּ֖י|lemma="כִּי" strong="H3588b" x-morph="He,C"\w* \w אִם|lemma="אִם" strong="H0518b" x-morph="He,C"\w*־\w רְא֥וּת|lemma="רְאִית" strong="H7212" x-morph="He,Ncmsc"\w* -\f + \ft K \w ראית|lemma="רְאִית" strong="H7212" x-morph="He,Ncmsc"\w*\f* +\f + \ft K \+w ראית|lemma="רְאִית" strong="H7212" x-morph="He,Ncmsc"\+w*\f* \w עֵינָֽי⁠ו|lemma="עַיִן" strong="H5869a" x-morph="He,Ncbdc:Sp3ms"\w*׃ \v 12 @@ -1396,7 +1396,7 @@ \w תַּֽחַת|lemma="תַּחַת" strong="H8478" x-morph="He,R"\w*־\w הַ⁠שֶּׁ֗מֶשׁ|lemma="שֶׁמֶשׁ" strong="d:H8121" x-morph="He,Td:Ncbsa"\w* \w מִסְפַּ֧ר|lemma="מִסְפָּר" strong="H4557" x-morph="He,Ncmsc"\w* \w יְמֵי|lemma="יוֹם" strong="H3117" x-morph="He,Ncmpc"\w*־\w חי⁠ו|lemma="חַי" strong="H2416e" x-morph="He,Ncmsc:Sp3ms"\w* -\f + \ft K \w חַיָּ֛יו|lemma="חַי" strong="H2416e" x-morph="He,Ncmpc:Sp3ms"\w*\f* +\f + \ft K \+w חַיָּ֛יו|lemma="חַי" strong="H2416e" x-morph="He,Ncmpc:Sp3ms"\+w*\f* \w אֲשֶׁר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w*־\w נָֽתַן|lemma="נָתַן" strong="H5414" x-morph="He,Vqp3ms"\w*־\w ל֥⁠וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* \w הָ⁠אֱלֹהִ֖ים|lemma="אֱלֹהִים" strong="d:H0430" x-morph="He,Td:Ncmpa" x-tw="rc://*/tw/dict/bible/kt/god"\w* \w כִּי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w ה֥וּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w* @@ -1573,7 +1573,7 @@ \w לָ⁠דִ֔ין|lemma="דִּין" strong="l:H1777" x-morph="He,R:Vqc"\w* \w עִ֥ם|lemma="עִם" strong="H5973a" x-morph="He,R"\w* \w ש⁠התקיף|lemma="תָּקַף" strong="s:H8623" x-morph="He,Tr:Aamsa"\w* -\f + \ft K \w ש⁠התקיף|lemma="תָּקַף" strong="s:H8630" x-morph="He,Tr:Vhc"\w*\f* +\f + \ft K \+w ש⁠התקיף|lemma="תָּקַף" strong="s:H8630" x-morph="He,Tr:Vhc"\+w*\f* \w מִמֶּֽ⁠נּוּ|lemma="מִן" strong="H4480a" x-morph="He,R:Sp3ms"\w*׃ \v 11 @@ -1855,7 +1855,7 @@ \w לִבֶּ֑⁠ךָ|lemma="לֵב" strong="H3820a" x-morph="He,Ncmsc:Sp2ms" x-tw="rc://*/tw/dict/bible/kt/heart"\w* \w אֲשֶׁ֥ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w גַּם|lemma="גַּם" strong="H1571" x-morph="He,Ta"\w*־\w אַתָּ֖ה|lemma="אַתָּה" strong="H0859c" x-morph="He,Pp2ms"\w* -\f + \ft K \w את|lemma="אַתָּה" strong="H0859c" x-morph="He,Pp2fs"\w*\f* +\f + \ft K \+w את|lemma="אַתָּה" strong="H0859c" x-morph="He,Pp2fs"\+w*\f* \w קִלַּ֥לְתָּ|lemma="קָלַל" strong="H7043" x-morph="He,Vpp2ms"\w* \w אֲחֵרִֽים|lemma="אַחֵר" strong="H0312" x-morph="He,Aampa"\w*׃ @@ -2298,7 +2298,7 @@ \w כִּי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w מִי֙|lemma="מִי" strong="H4310" x-morph="He,Ti"\w* \w אֲשֶׁ֣ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w יְחֻבַּ֔ר|lemma="חָבַר" strong="H2266" x-morph="He,VPi3ms"\w* -\f + \ft K \w יבחר|lemma="בָּחַר" strong="H0977" x-morph="He,VPi3ms"\w*\f* +\f + \ft K \+w יבחר|lemma="בָּחַר" strong="H0977" x-morph="He,VPi3ms"\+w*\f* \w אֶ֥ל|lemma="אֵל" strong="H0413" x-morph="He,R"\w* \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w הַ⁠חַיִּ֖ים|lemma="חַי" strong="d:H2416a" x-morph="He,Td:Aampa" x-tw="rc://*/tw/dict/bible/kt/life"\w* \w יֵ֣שׁ|lemma="יֵשׁ" strong="H3426" x-morph="He,Tm"\w* @@ -2563,7 +2563,7 @@ \v 3 \w וְ⁠גַם|lemma="גַּם" strong="c:H1571" x-morph="He,C:Ta"\w*־\w בַּ⁠דֶּ֛רֶךְ|lemma="דֶּרֶךְ" strong="b:H1870" x-morph="He,Rd:Ncbsa"\w* \w כ⁠ש⁠ה⁠סכל|lemma="סָכָל" strong="k:s:d:H5530" x-morph="He,R:Tr:Td:Ncmsa"\w* -\f + \ft Q \w כְּשֶׁסָּכָ֥ל|lemma="סָכָל" strong="k:s:d:H5530" x-morph="He,R:Tr:Ncmsa"\w*\f* +\f + \ft Q \+w כְּשֶׁסָּכָ֥ל|lemma="סָכָל" strong="k:s:d:H5530" x-morph="He,R:Tr:Ncmsa"\+w*\f* \w הֹלֵ֖ךְ|lemma="הָלַךְ" strong="H1980" x-morph="He,Vqrmsa" x-tw="rc://*/tw/dict/bible/other/walk"\w* \w לִבּ֣⁠וֹ|lemma="לֵב" strong="H3820a" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/heart"\w* \w חָסֵ֑ר|lemma="חָסֵר" strong="H2638" x-morph="He,Vqp3ms"\w* @@ -2752,7 +2752,7 @@ \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ⁠קּ֔וֹל|lemma="קוֹל" strong="d:H6963a" x-morph="He,Td:Ncmsa"\w* \w וּ⁠בַ֥עַל|lemma="בַּעַל" strong="c:H1167" x-morph="He,C:Ncmsc"\w* \w כְּנָפַ֖יִם|lemma="כָּנָף" strong="d:H3671" x-morph="He,Ncfda"\w* -\f + \ft K \w ה⁠כנפים|lemma="כָּנָף" strong="d:H3671" x-morph="He,Td:Ncfda"\w*\f* +\f + \ft K \+w ה⁠כנפים|lemma="כָּנָף" strong="d:H3671" x-morph="He,Td:Ncfda"\+w*\f* \w יַגֵּ֥יד|lemma="נָגַד" strong="H5046" x-morph="He,Vhi3ms"\w* \w דָּבָֽר|lemma="דָּבָר" strong="H1697" x-morph="He,Ncmsa"\w*׃ @@ -2987,7 +2987,7 @@ \w עַ֣ד|lemma="עַד" strong="H5704" x-morph="He,R"\w* \w אֲשֶׁ֤ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w לֹֽא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w יֵרָתֵק֙|lemma="רָתַק" strong="H7576" x-morph="He,VNi3ms"\w* -\f + \ft K \w ירחק|lemma="רָחַק" strong="H7368" x-morph="He,Vqi3ms"\w*\f* +\f + \ft K \+w ירחק|lemma="רָחַק" strong="H7368" x-morph="He,Vqi3ms"\+w*\f* \w חֶ֣בֶל|lemma="חֶבֶל" strong="H2256a" x-morph="He,Ncbsc"\w* \w הַ⁠כֶּ֔סֶף|lemma="כֶּסֶף" strong="d:H3701" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/silver"\w* \w וְ⁠תָרֻ֖ץ|lemma="רָצַץ" strong="c:H7533" x-morph="He,C:Vqi3fs"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/22-SNG.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/22-SNG.usfm index e5b15849..ab0c59ab 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/22-SNG.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/22-SNG.usfm @@ -181,7 +181,7 @@ \w בָּתֵּ֨י⁠נוּ֙|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmpc:Sp1cp" x-tw="rc://*/tw/dict/bible/other/house"\w* \w אֲרָזִ֔ים|lemma="אֶרֶז" strong="H0730" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/other/cedar"\w* \w רַהִיטֵ֖נוּ|lemma="רָהִיט" strong="H7351" x-morph="He,Ncmsc:Sp1cp"\w* -\f + \ft K \w רחיט⁠נו|lemma="רָהִיט" strong="H7351" x-morph="He,Ncmsc:Sp1cp"\w*\f* +\f + \ft K \+w רחיט⁠נו|lemma="רָהִיט" strong="H7351" x-morph="He,Ncmsc:Sp1cp"\+w*\f* \w בְּרוֹתִֽים|lemma="בְּרוֹת" strong="H1266" x-morph="He,Ncmpa"\w*׃ \c 2 @@ -297,7 +297,7 @@ \v 11 \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w הִנֵּ֥ה|lemma="הִנֵּה" strong="H2009" x-morph="He,Tm"\w* \w ה⁠סתו|lemma="סְתָו" strong="d:H5638" x-morph="He,Td:Ncmsa"\w* -\f + \ft Q \w הַסְּתָ֖יו|lemma="סְתָו" strong="d:H5638" x-morph="He,Td:Ncmsa"\w*\f* +\f + \ft Q \+w הַסְּתָ֖יו|lemma="סְתָו" strong="d:H5638" x-morph="He,Td:Ncmsa"\+w*\f* \w עָבָ֑ר|lemma="עָבַר" strong="H5674a" x-morph="He,Vqp3ms"\w* \w הַ⁠גֶּ֕שֶׁם|lemma="גֶּשֶׁם" strong="d:H1653" x-morph="He,Td:Ncmsa"\w* \w חָלַ֖ף|lemma="חָלַף" strong="H2498" x-morph="He,Vqp3ms"\w* @@ -326,7 +326,7 @@ \w רֵ֑יחַ|lemma="רֵיחַ" strong="H7381" x-morph="He,Ncmsa"\w* \w ק֥וּמִי|lemma="קוּם" strong="H6965b" x-morph="He,Vqv2fs"\w* \w לכי|lemma="הָלַךְ" strong="H3212" x-morph="He,Vqv2fs" x-tw="rc://*/tw/dict/bible/other/walk"\w* -\f + \ft Q \w לָךְ|lemma="" strong="l" x-morph="He,R:Sp2fs"\w*\f* +\f + \ft Q \+w לָךְ|lemma="" strong="l" x-morph="He,R:Sp2fs"\+w*\f* \w רַעְיָתִ֥⁠י|lemma="רַעְיָה" strong="H7474" x-morph="He,Ncfsc:Sp1cs"\w* \w יָפָתִ֖⁠י|lemma="יָפֶה" strong="H3303" x-morph="He,Aafsc:Sp1cs"\w* \w וּ⁠לְכִי|lemma="יָלַךְ" strong="c:H3212" x-morph="He,C:Vqv2fs"\w*־\w לָֽ⁠ךְ|lemma="" strong="l" x-morph="He,R:Sp2fs"\w*׃ס @@ -641,7 +641,7 @@ \w כַלָּ֑ה|lemma="כַּלָּה" strong="H3618" x-morph="He,Ncfsa"\w* \w לִבַּבְתִּ֨י⁠נִי֙|lemma="לָבַב" strong="H3823a" x-morph="He,Vpp2fs:Sp1cs"\w* \w בְּאַחַ֣ת|lemma="אֶחָד" strong="b:H0259" x-morph="He,R:Acfsa"\w* -\f + \ft K \w ב⁠אחד|lemma="אֶחָד" strong="b:H0259" x-morph="He,R:Acmsa"\w*\f* +\f + \ft K \+w ב⁠אחד|lemma="אֶחָד" strong="b:H0259" x-morph="He,R:Acmsa"\+w*\f* \w מֵ⁠עֵינַ֔יִ⁠ךְ|lemma="עַיִן" strong="m:H5869a" x-morph="He,R:Ncbdc:Sp2fs"\w* \w בְּ⁠אַחַ֥ד|lemma="אֶחָד" strong="b:H0259" x-morph="He,R:Acmsc"\w* \w עֲנָ֖ק|lemma="עָנָק" strong="H6060b" x-morph="He,Ncmsa"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/23-ISA.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/23-ISA.usfm index 424723a9..102066bb 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/23-ISA.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/23-ISA.usfm @@ -872,7 +872,7 @@ \w צִיּ֔וֹן|lemma="צִיּוֹן" strong="H6726" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/zion"\w* \w וַ⁠תֵּלַ֨כְנָה֙|lemma="יָלַךְ" strong="c:H3212" x-morph="He,C:Vqw3fp"\w* \w נְטוּי֣וֹת|lemma="נָטָה" strong="H5186" x-morph="He,Vqsfpa"\w* -\f + \ft K \w נטוות|lemma="נָטָה" strong="H5186" x-morph="He,Vqsfpa"\w*\f* +\f + \ft K \+w נטוות|lemma="נָטָה" strong="H5186" x-morph="He,Vqsfpa"\+w*\f* \w גָּר֔וֹן|lemma="גָּרוֹן" strong="H1627" x-morph="He,Ncmsa"\w* \w וּֽ⁠מְשַׂקְּר֖וֹת|lemma="שָׂקַר" strong="c:H8265" x-morph="He,C:Vprfpa"\w* \w עֵינָ֑יִם|lemma="עַיִן" strong="H5869a" x-morph="He,Ncbda"\w* @@ -1465,7 +1465,7 @@ \w ל֖⁠וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* \w כַּ⁠לָּבִ֑יא|lemma="לָבִיא" strong="k:H3833c" x-morph="He,Rd:Ncbsa"\w* \w ו⁠שאג|lemma="שָׁאַג" strong="c:H7580" x-morph="He,C:Vqq3ms"\w* -\f + \ft Q \w יִשְׁאַ֨ג|lemma="שָׁאַג" strong="c:H7580" x-morph="He,C:Vqi3ms"\w*\f* +\f + \ft Q \+w יִשְׁאַ֨ג|lemma="שָׁאַג" strong="c:H7580" x-morph="He,C:Vqi3ms"\+w*\f* \w כַּ⁠כְּפִירִ֤ים|lemma="כְּפִיר" strong="k:H3715a" x-morph="He,Rd:Ncmpa"\w* \w וְ⁠יִנְהֹם֙|lemma="נָהַם" strong="c:H5098" x-morph="He,C:Vqi3ms"\w* \w וְ⁠יֹאחֵ֣ז|lemma="אָחַז" strong="c:H0270" x-morph="He,C:Vqi3ms"\w* @@ -2376,7 +2376,7 @@ \w הִרְבִּ֣יתָ|lemma="רָבָה" strong="H7235a" x-morph="He,Vhp2ms"\w* \w הַ⁠גּ֔וֹי|lemma="גּוֹי" strong="d:H1471a" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/nation"\w* \w ל֖וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* -\f + \ft K \w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*\f* +\f + \ft K \+w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\+w*\f* \w הִגְדַּ֣לְתָּ|lemma="גָּדַל" strong="H1431" x-morph="He,Vhp2ms" x-tw="rc://*/tw/dict/bible/other/proud"\w* \w הַ⁠שִּׂמְחָ֑ה|lemma="שִׂמְחָה" strong="d:H8057" x-morph="He,Td:Ncfsa" x-tw="rc://*/tw/dict/bible/other/joy"\w* \w שָׂמְח֤וּ|lemma="שָׂמַח" strong="H8055" x-morph="He,Vqp3cp" x-tw="rc://*/tw/dict/bible/other/joy"\w* @@ -2439,7 +2439,7 @@ \v 7 \va 6\va* \w לְמַרְבֵּ֨ה|lemma="מַרְבֶה" strong="l:H4766" x-morph="He,R:Ncmsc"\w* -\f + \ft K \w ל⁠םרבה|lemma="רַב" strong="l:H7227" x-morph="He,R:Sp3mp:Aafsc"\w*\f* +\f + \ft K \+w ל⁠םרבה|lemma="רַב" strong="l:H7227" x-morph="He,R:Sp3mp:Aafsc"\+w*\f* \w הַ⁠מִּשְׂרָ֜ה|lemma="מִשְׂרָה" strong="d:H4951" x-morph="He,Td:Ncfsa"\w* \w וּ⁠לְ⁠שָׁל֣וֹם|lemma="שָׁלוֹם" strong="c:l:H7965" x-morph="He,C:R:Ncmsa"\w* \w אֵֽין|lemma="אַיִן" strong="H0369" x-morph="He,Tn"\w*־\w קֵ֗ץ|lemma="קֵץ" strong="H7093" x-morph="He,Ncmsa"\w* @@ -2718,7 +2718,7 @@ \w וְ⁠לָ⁠בֹ֣ז|lemma="בָּזַז" strong="c:l:H0962" x-morph="He,C:R:Vqc"\w* \w בַּ֔ז|lemma="בַּז" strong="H0957" x-morph="He,Ncmsa"\w* \w ו⁠ל⁠שימ⁠ו|lemma="שִׂים" strong="c:l:H7760b" x-morph="He,C:R:Vqc:Sp3ms"\w* -\f + \ft Q \w וּלְשׂוּמ֥וֹ|lemma="שִׂים" strong="c:l:H7760b" x-morph="He,C:R:Vqc:Sp3ms"\w*\f* +\f + \ft Q \+w וּלְשׂוּמ֥וֹ|lemma="שִׂים" strong="c:l:H7760b" x-morph="He,C:R:Vqc:Sp3ms"\+w*\f* \w מִרְמָ֖ס|lemma="מִרְמָס" strong="H4823" x-morph="He,Ncmsa"\w* \w כְּ⁠חֹ֥מֶר|lemma="חֹמֶר" strong="k:H2563a" x-morph="He,R:Ncmsc"\w* \w חוּצֽוֹת|lemma="חוּץ" strong="H2351" x-morph="He,Ncmpa"\w*׃ @@ -2807,7 +2807,7 @@ \w גְּבוּלֹ֣ת|lemma="גְּבוּלָה" strong="H1367" x-morph="He,Ncfpc"\w* \w עַמִּ֗ים|lemma="עַם" strong="H5971a" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* \w ו⁠עתידתי⁠הם|lemma="עָתִיד" strong="c:H6264" x-morph="He,C:Aampc:Sp3mp"\w* -\f + \ft Q \w וַעֲתוּדֽוֹתֵיהֶם֙|lemma="עָתוּד" strong="c:H6259" x-morph="He,C:Aampc:Sp3mp"\w*\f* +\f + \ft Q \+w וַעֲתוּדֽוֹתֵיהֶם֙|lemma="עָתוּד" strong="c:H6259" x-morph="He,C:Aampc:Sp3mp"\+w*\f* \w שׁוֹשֵׂ֔תִי|lemma="שָׁסָה" strong="H8154" x-morph="He,Vmp1cs"\w* \w וְ⁠אוֹרִ֥יד|lemma="יָרַד" strong="c:H3381" x-morph="He,C:Vhi1cs"\w* \w כַּ⁠אבִּ֖יר|lemma="אַבִּיר" strong="k:H0047" x-morph="He,R:Aamsa"\w* @@ -3053,7 +3053,7 @@ \w יָד⁠וֹ֙|lemma="יָד" strong="H3027" x-morph="He,Ncbsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w הַ֣ר|lemma="הַר" strong="H2022" x-morph="He,Ncmsc"\w* \w בַּת|lemma="בַּת" strong="H1323" x-morph="He,Ncfsc"\w*־\w צִיּ֔וֹן|lemma="צִיּוֹן" strong="H6726" x-morph="He,Np"\w* -\f + \ft K \w בית|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc"\w*\f* +\f + \ft K \+w בית|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc"\+w*\f* \w גִּבְעַ֖ת|lemma="גִּבְעָה" strong="H1389" x-morph="He,Ncfsc"\w* \w יְרוּשָׁלִָֽם|lemma="יְרוּשָׁלִַ͏ם" strong="H3389" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jerusalem"\w*׃ס @@ -3371,7 +3371,7 @@ \w גֵא֖וּת|lemma="גֵּאוּת" strong="H1348" x-morph="He,Ncfsa"\w* \w עָשָׂ֑ה|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqp3ms"\w* \w מוּדַ֥עַת|lemma="יָדַע" strong="H3045" x-morph="He,VHsfsa" x-tw="rc://*/tw/dict/bible/other/know"\w* -\f + \ft K \w מידעת|lemma="יָדַע" strong="H3045" x-morph="He,VPsfsa"\w*\f* +\f + \ft K \+w מידעת|lemma="יָדַע" strong="H3045" x-morph="He,VPsfsa"\+w*\f* \w זֹ֖את|lemma="זֹאת" strong="H2063" x-morph="He,Pdxfs"\w* \w בְּ⁠כָל|lemma="כֹּל" strong="b:H3605" x-morph="He,R:Ncmsc"\w*־\w הָ⁠אָֽרֶץ|lemma="אֶרֶץ" strong="d:H0776" x-morph="He,Td:Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w*׃ @@ -3574,7 +3574,7 @@ \w בָּֽתֵּי⁠הֶ֔ם|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmpc:Sp3mp" x-tw="rc://*/tw/dict/bible/other/house"\w* \w וּ⁠נְשֵׁי⁠הֶ֖ם|lemma="אִשָּׁה" strong="c:H0802" x-morph="He,C:Ncfpc:Sp3mp"\w* \w תשגלנה|lemma="שָׁגַל" strong="H7693" x-morph="He,VNi3fp"\w*׃ -\f + \ft Q \w תִּשָּׁכַֽבְנָה|lemma="שָׁכַב" strong="H7901" x-morph="He,VNi3fp"\w*\f* +\f + \ft Q \+w תִּשָּׁכַֽבְנָה|lemma="שָׁכַב" strong="H7901" x-morph="He,VNi3fp"\+w*\f* \v 17 \w הִנְ⁠נִ֛י|lemma="הֵן" strong="H2005" x-morph="He,Tm:Sp1cs"\w* @@ -4204,7 +4204,7 @@ \v 3 \w הביאו|lemma="בּוֹא" strong="H0935" x-morph="He,Vhv2mp"\w* -\f + \ft Q \w הָבִ֤יאִי|lemma="בּוֹא" strong="H0935" x-morph="He,Vhv2fs"\w*\f* +\f + \ft Q \+w הָבִ֤יאִי|lemma="בּוֹא" strong="H0935" x-morph="He,Vhv2fs"\+w*\f* \w עֵצָה֙|lemma="עֵצָה" strong="H6098" x-morph="He,Ncfsa"\w* \w עֲשׂ֣וּ|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqv2mp"\w* \w פְלִילָ֔ה|lemma="פְּלִילָה" strong="H6415" x-morph="He,Ncfsa"\w* @@ -4634,7 +4634,7 @@ \w יְהוָה֙|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w אֵלַ֔⁠י|lemma="אֵל" strong="H0413" x-morph="He,R:Sp1cs"\w* \w אשקוטה|lemma="שָׁקַט" strong="H8252" x-morph="He,Vqh1cs"\w* -\f + \ft Q \w אֶשְׁקֳטָ֖ה|lemma="שָׁקַט" strong="H8252" x-morph="He,Vqh1cs"\w*\f* +\f + \ft Q \+w אֶשְׁקֳטָ֖ה|lemma="שָׁקַט" strong="H8252" x-morph="He,Vqh1cs"\+w*\f* \w וְ⁠אַבִּ֣יטָה|lemma="נָבַט" strong="c:H5027" x-morph="He,C:Vhh1cs"\w* \w בִ⁠מְכוֹנִ֑⁠י|lemma="מָכוֹן" strong="b:H4349" x-morph="He,R:Ncmsc:Sp1cs"\w* \w כְּ⁠חֹ֥ם|lemma="חֹם" strong="k:H2527" x-morph="He,R:Ncmsc"\w* @@ -5819,7 +5819,7 @@ \w בְּתוּלַ֣ת|lemma="בְּתוּלָה" strong="H1330" x-morph="He,Ncfsc" x-tw="rc://*/tw/dict/bible/other/virgin"\w* \w בַּת|lemma="בַּת" strong="H1323" x-morph="He,Ncfsc"\w*־\w צִיד֗וֹן|lemma="צִידוֹן" strong="H6721" x-morph="He,Np"\w* \w כתיים|lemma="כִּתִּי" strong="H3794" x-morph="He,Ngmpa"\w* -\f + \ft Q \w כִּתִּים֙|lemma="כִּתִּי" strong="H3794" x-morph="He,Ngmpa"\w*\f* +\f + \ft Q \+w כִּתִּים֙|lemma="כִּתִּי" strong="H3794" x-morph="He,Ngmpa"\+w*\f* \w ק֣וּמִי|lemma="קוּם" strong="H6965b" x-morph="He,Vqv2fs" x-tw="rc://*/tw/dict/bible/other/decree"\w* \w עֲבֹ֔רִי|lemma="עָבַר" strong="H5674a" x-morph="He,Vqv2fs" x-tw="rc://*/tw/dict/bible/kt/transgression"\w* \w גַּם|lemma="גַּם" strong="H1571" x-morph="He,Ta"\w*־\w שָׁ֖ם|lemma="שָׁם" strong="H8033" x-morph="He,D"\w* @@ -5839,7 +5839,7 @@ \w לְ⁠צִיִּ֑ים|lemma="צִיִּי" strong="l:H6728" x-morph="He,R:Ncmpa"\w* \w הֵקִ֣ימוּ|lemma="קוּם" strong="H6965b" x-morph="He,Vhp3cp" x-tw="rc://*/tw/dict/bible/other/decree"\w* \w בחיני⁠ו|lemma="בַּחַן" strong="H0975" x-morph="He,Ncmpc:Sp3ms"\w* -\f + \ft Q \w בַחוּנָ֗יו|lemma="בַּחַן" strong="H0975" x-morph="He,Ncmpc:Sp3ms"\w*\f* +\f + \ft Q \+w בַחוּנָ֗יו|lemma="בַּחַן" strong="H0975" x-morph="He,Ncmpc:Sp3ms"\+w*\f* \w עֹרְרוּ֙|lemma="עָרַר" strong="H6209" x-morph="He,Vmp3cp"\w* \w אַרְמְנוֹתֶ֔י⁠הָ|lemma="אַרְמוֹן" strong="H0759" x-morph="He,Ncmpc:Sp3fs"\w* \w שָׂמָ֖⁠הּ|lemma="שׂוּם" strong="H7760a" x-morph="He,Vqp3ms:Sp3fs"\w* @@ -6347,7 +6347,7 @@ \w כְּ⁠הִדּ֥וּשׁ|lemma="דּוּשׁ" strong="k:H1758" x-morph="He,R:VNc"\w* \w מַתְבֵּ֖ן|lemma="מַתְבֵּן" strong="H4963" x-morph="He,Ncmsa"\w* \w בְּמ֥וֹ|lemma="בְּמוֹ" strong="H1119" x-morph="He,R"\w* -\f + \ft K \w ב⁠מי|lemma="מַיִם" strong="b:H4325" x-morph="He,R:Ncmpc"\w*\f* +\f + \ft K \+w ב⁠מי|lemma="מַיִם" strong="b:H4325" x-morph="He,R:Ncmpc"\+w*\f* \w מַדְמֵנָֽה|lemma="מַדְמֵנָה" strong="H4087" x-morph="He,Ncfsa"\w*׃ \v 11 @@ -6601,12 +6601,12 @@ \w בַ⁠חֲדָרֶ֔י⁠ךָ|lemma="חֶדֶר" strong="b:H2315" x-morph="He,R:Ncmpc:Sp2ms"\w* \w וּֽ⁠סְגֹ֥ר|lemma="סָגַר" strong="c:H5462" x-morph="He,C:Vqv2ms"\w* \w דלתי⁠ך|lemma="דֶּלֶת" strong="H1817b" x-morph="He,Ncfpc:Sp2ms"\w* -\f + \ft Q \w דְּלָתְךָ֖lemma="דֶּלֶת" strong="H1817b" x-morph="He,Ncfsc:Sp2ms"\w*\f* +\f + \ft Q \+w דְּלָתְךָ֖lemma="דֶּלֶת" strong="H1817b" x-morph="He,Ncfsc:Sp2ms"\+w*\f* \w בַּעֲדֶ֑⁠ךָ|lemma="בְּעַד" strong="H1157" x-morph="He,R:Sp2ms"\w* \w חֲבִ֥י|lemma="חָבָה" strong="H2247" x-morph="He,Vqv2fs"\w* \w כִ⁠מְעַט|lemma="מְעַט" strong="k:H4592" x-morph="He,R:Ncmsc"\w*־\w רֶ֖גַע|lemma="רֶגַע" strong="H7281" x-morph="He,Ncmsa"\w* \w עַד|lemma="עַד" strong="H5704" x-morph="He,R"\w*־\w יעבור|lemma="עָבַר" strong="H5674a" x-morph="He,Vqi3ms" x-tw="rc://*/tw/dict/bible/kt/transgression"\w*־\w זָֽעַם|lemma="זַעַם" strong="H2195" x-morph="He,Ncmsa"\w*׃ -\f + \ft Q \w יַעֲבָר|lemma="עָבַר" strong="H5674a" x-morph="He,Vqi3ms"\w*\f* +\f + \ft Q \+w יַעֲבָר|lemma="עָבַר" strong="H5674a" x-morph="He,Vqi3ms"\+w*\f* \v 21 @@ -7026,10 +7026,10 @@ \w עָשִׂ֣ינוּ|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqp1cp"\w* \w חֹזֶ֑ה|lemma="חֹזֶה" strong="H2374" x-morph="He,Ncmsa"\w* \w שׁ֣וֹט|lemma="שַׁיִט" strong="H7752" x-morph="He,Ncmsa"\w* -\f + \ft K \w שיט|lemma="שַׁיִט" strong="H7885" x-morph="He,Ncmsa"\w*\f* +\f + \ft K \+w שיט|lemma="שַׁיִט" strong="H7885" x-morph="He,Ncmsa"\+w*\f* \w שׁוֹטֵ֤ף|lemma="שָׁטַף" strong="H7857" x-morph="He,Vqrmsa"\w* \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w יַֽעֲבֹר֙|lemma="עָבַר" strong="H5674a" x-morph="He,Vqi3ms" x-tw="rc://*/tw/dict/bible/kt/transgression"\w* -\f + \ft K \w עבר|lemma="עָבַר" strong="H5674a" x-morph="He,Vqp3ms"\w*\f* +\f + \ft K \+w עבר|lemma="עָבַר" strong="H5674a" x-morph="He,Vqp3ms"\+w*\f* \w לֹ֣א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w יְבוֹאֵ֔⁠נוּ|lemma="בּוֹא" strong="H0935" x-morph="He,Vqi3ms:Sp1cp"\w* \w כִּ֣י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* @@ -7384,7 +7384,7 @@ \w אֹת֗⁠וֹ|lemma="אֵת" strong="H0853" x-morph="He,To:Sp3ms"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w יוֹדֵ֥עַ|lemma="יָדַע" strong="H3045" x-morph="He,Vqrmsc" x-tw="rc://*/tw/dict/bible/other/know"\w* \w סֵ֛פֶר|lemma="סֵפֶר" strong="d:H5612a" x-morph="He,Ncmsa"\w* -\f + \ft K \w ה⁠ספר|lemma="סֵפֶר" strong="d:H5612a" x-morph="He,Td:Ncmsa"\w*\f* +\f + \ft K \+w ה⁠ספר|lemma="סֵפֶר" strong="d:H5612a" x-morph="He,Td:Ncmsa"\+w*\f* \w לֵ⁠אמֹ֖ר|lemma="אָמַר" strong="l:H0559" x-morph="He,R:Vqc"\w* \w קְרָ֣א|lemma="קָרָא" strong="H7121" x-morph="He,Vqv2ms" x-tw="rc://*/tw/dict/bible/other/cry" x-tw="rc://*/tw/dict/bible/kt/call"\w* \w נָא|lemma="נָא" strong="H4994" x-morph="He,Te"\w*־\w זֶ֑ה|lemma="זֶה" strong="H2088" x-morph="He,Pdxms"\w* @@ -7626,7 +7626,7 @@ \v 5 \w כֹּ֣ל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsa"\w* \w הֹבִ֔ישׁ|lemma="בָּאַשׁ" strong="H0954" x-morph="He,Vhi3ms"\w* -\f + \ft K \w הבאיש|lemma="בָּאַשׁ" strong="H0887" x-morph="He,Vhp3ms"\w*\f* +\f + \ft K \+w הבאיש|lemma="בָּאַשׁ" strong="H0887" x-morph="He,Vhp3ms"\+w*\f* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w עַ֖ם|lemma="עַם" strong="H5971a" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* \w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w יוֹעִ֣ילוּ|lemma="יָעַל" strong="H3276" x-morph="He,Vhi3mp"\w* \w לָ֑⁠מוֹ|lemma="" strong="l" x-morph="He,R:Sp3mp"\w* @@ -8054,14 +8054,14 @@ \w וּ⁠בְ⁠מִלְחֲמ֥וֹת|lemma="מִלְחָמָה" strong="c:b:H4421" x-morph="He,C:R:Ncfpc"\w* \w תְּנוּפָ֖ה|lemma="תְּנוּפָה" strong="H8573" x-morph="He,Ncfsa"\w* \w נִלְחַם|lemma="לָחַם" strong="H3898a" x-morph="He,VNp3ms"\w*־\w בָּֽם|lemma="" strong="b" x-morph="He,R:Sp3mp"\w*׃ -\f + \ft K \w ב⁠ה|lemma="" strong="b" x-morph="He,R:Sp3fs"\w*\f* +\f + \ft K \+w ב⁠ה|lemma="" strong="b" x-morph="He,R:Sp3fs"\+w*\f* \v 33 \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w עָר֤וּךְ|lemma="עָרַךְ" strong="H6186a" x-morph="He,Vqsmsa"\w* \w מֵֽ⁠אֶתְמוּל֙|lemma="אֶתְמוֹל" strong="m:H0865" x-morph="He,R:Ncmsa"\w* \w תָּפְתֶּ֔ה|lemma="תׇּפְתֶּה" strong="H8613" x-morph="He,Np"\w* \w גַּם|lemma="גַּם" strong="H1571" x-morph="He,Ta"\w*־\w הוא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w* -\f + \ft Q \w הִ֛יא|lemma="הִיא" strong="H1931" x-morph="He,Pp3fs"\w*\f* +\f + \ft Q \+w הִ֛יא|lemma="הִיא" strong="H1931" x-morph="He,Pp3fs"\+w*\f* \w לַ⁠מֶּ֥לֶךְ|lemma="מֶלֶךְ" strong="l:H4428" x-morph="He,Rd:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* \w הוּכָ֖ן|lemma="כּוּן" strong="H3559a" x-morph="He,VHp3ms"\w* \w הֶעְמִ֣יק|lemma="עָמַק" strong="H6009" x-morph="He,Vhp3ms"\w* @@ -8313,7 +8313,7 @@ \w יָעָ֔ץ|lemma="יָעַץ" strong="H3289" x-morph="He,Vqp3ms" x-tw="rc://*/tw/dict/bible/other/counselor"\w* \w לְ⁠חַבֵּ֤ל|lemma="חָבַל" strong="l:H2254b" x-morph="He,R:Vpc"\w* \w ענוים|lemma="עָנָו" strong="H6035" x-morph="He,Aampa"\w* -\f + \ft Q \w עֲנִיִּים֙|lemma="עָנָו" strong="H6041" x-morph="He,Aampa"\w*\f* +\f + \ft Q \+w עֲנִיִּים֙|lemma="עָנָו" strong="H6041" x-morph="He,Aampa"\+w*\f* \w בְּ⁠אִמְרֵי|lemma="אֵמֶר" strong="b:H0561" x-morph="He,R:Ncmpc"\w*־\w שֶׁ֔קֶר|lemma="שֶׁקֶר" strong="H8267" x-morph="He,Ncmsa"\w* \w וּ⁠בְ⁠דַבֵּ֥ר|lemma="דָבַר" strong="c:b:H1696" x-morph="He,C:R:Vpc"\w* \w אֶבְי֖וֹן|lemma="אֶבְיוֹן" strong="H0034" x-morph="He,Aamsa"\w* @@ -8406,7 +8406,7 @@ \w מִדְבָּר֙|lemma="מִדְבָּר" strong="H4057b" x-morph="He,Ncmsa"\w* \w לַ⁠כַּרְמֶ֔ל|lemma="כַּרְמֶל" strong="l:H3759" x-morph="He,Rd:Ncmsa"\w* \w וְהַכַּרְמֶ֖ל|lemma="כַּרְמֶל" strong="c:d:H3759" x-morph="He,C:Td:Ncmsa"\w* -\f + \ft K \w ו⁠כרמל|lemma="כַּרְמֶל" strong="c:H3759" x-morph="He,C:Ncmsa"\w*\f* +\f + \ft K \+w ו⁠כרמל|lemma="כַּרְמֶל" strong="c:H3759" x-morph="He,C:Ncmsa"\+w*\f* \w לַ⁠יַּ֥עַר|lemma="יַעַר" strong="l:H3293a" x-morph="He,Rd:Ncmsa"\w* \w יֵחָשֵֽׁב|lemma="חָשַׁב" strong="H2803" x-morph="He,VNi3ms"\w*׃ @@ -9339,10 +9339,10 @@ \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w הַ֣⁠חוֹמָ֔ה|lemma="חוֹמָה" strong="d:H2346" x-morph="He,Td:Ncfsa"\w* \w לֶ⁠אֱכֹ֣ל|lemma="אָכַל" strong="l:H0398" x-morph="He,R:Vqc"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w חראי⁠הם|lemma="חֶרֶא" strong="H2716" x-morph="He,Ncmpc:Sp3mp"\w* -\f + \ft Q \w |lemma="חֶרֶא" strong="H6675" x-morph="He,Ncfpc:Sp3mp"\w*\f* +\f + \ft Q \+w |lemma="חֶרֶא" strong="H6675" x-morph="He,Ncfpc:Sp3mp"\+w*\f* \w וְ⁠לִ⁠שְׁתּ֛וֹת|lemma="שָׁתָה" strong="c:l:H8354" x-morph="He,C:R:Vqc"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w שיני⁠הם|lemma="שַׁיִן" strong="H7890" x-morph="He,Ncmpc:Sp3mp"\w* -\f + \ft Q \w מֵימֵי|lemma="מַיִם" strong="H4325" x-morph="He,Ncmpc"\w* \w רַגְלֵיהֵם|lemma="שַׁיִן" strong="H7272" x-morph="He,Ncmdc:Sp3mp"\w*\f* +\f + \ft Q \+w מֵימֵי|lemma="מַיִם" strong="H4325" x-morph="He,Ncmpc"\w* \w רַגְלֵיהֵם|lemma="שַׁיִן" strong="H7272" x-morph="He,Ncmdc:Sp3mp"\+w*\f* \w עִמָּ⁠כֶֽם|lemma="עִם" strong="H5973a" x-morph="He,R:Sp2mp"\w*׃ \v 13 @@ -9953,7 +9953,7 @@ \w וְ⁠נִטְע֥וּ|lemma="נָטַע" strong="c:H5193" x-morph="He,C:Vqv2mp"\w* \w כְרָמִ֖ים|lemma="כֶּרֶם" strong="H3754" x-morph="He,Ncbpa" x-tw="rc://*/tw/dict/bible/other/vineyard"\w* \w וְאִכְל֥וּ|lemma="אָכַל" strong="c:H0398" x-morph="He,C:Vqv2mp" x-tw="rc://*/tw/dict/bible/other/devour"\w* -\f + \ft K \w ו⁠אכול|lemma="אָכַל" strong="c:H0398" x-morph="He,C:Vqa"\w*\f* +\f + \ft K \+w ו⁠אכול|lemma="אָכַל" strong="c:H0398" x-morph="He,C:Vqa"\+w*\f* \w פִרְיָֽ⁠ם|lemma="פְּרִי" strong="H6529" x-morph="He,Ncmsc:Sp3mp" x-tw="rc://*/tw/dict/bible/other/fruit"\w*׃ \v 31 @@ -10382,7 +10382,7 @@ \w וַ⁠יַּרְאֵ֣⁠ם|lemma="רָאָה" strong="c:H7200" x-morph="He,C:Vhw3ms:Sp3mp"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w בֵּ֣ית|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w* \w נְכֹת֡וֹ|lemma="נְכֹת" strong="H5238" x-morph="He,Ncfsc:Sp3ms"\w* -\f + \ft K \w נכת⁠ה|lemma="נְכֹת" strong="H5238" x-morph="He,Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w נכת⁠ה|lemma="נְכֹת" strong="H5238" x-morph="He,Ncfsc:Sp3ms"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ⁠כֶּסֶף֩|lemma="כֶּסֶף" strong="d:H3701" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/silver"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w הַ⁠זָּהָ֨ב|lemma="זָהָב" strong="d:H2091" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/gold"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w הַ⁠בְּשָׂמִ֜ים|lemma="בֶּשֶׂם" strong="d:H1314" x-morph="He,Td:Ncmpa"\w* @@ -11205,7 +11205,7 @@ \w וְ⁠תָרֵ֔עוּ|lemma="רָעַע" strong="c:H7489a" x-morph="He,C:Vhi2mp"\w* \w וְ⁠נִשְׁתָּ֖עָה|lemma="שָׁעָה" strong="c:H8159" x-morph="He,C:Vqh1cp"\w* \w וְנִרְאֶ֥ה|lemma="רָאָה" strong="c:H7200" x-morph="He,C:Vqh1cp"\w* -\f + \ft K \w ו⁠נרא|lemma="רָאָה" strong="c:H7200" x-morph="He,C:Vqi1cp"\w*\f* +\f + \ft K \+w ו⁠נרא|lemma="רָאָה" strong="c:H7200" x-morph="He,C:Vqi1cp"\+w*\f* \w יַחְדָּֽו|lemma="יַחַד" strong="H3162b" x-morph="He,D"\w*׃ \v 24 @@ -11523,7 +11523,7 @@ \v 20 \w ראית|lemma="רָאָה" strong="H7200" x-morph="He,Vqp2ms"\w* -\f + \ft Q \w רָא֥וֹת|lemma="רָאָה" strong="H7200" x-morph="He,Vqa"\w*\f* +\f + \ft Q \+w רָא֥וֹת|lemma="רָאָה" strong="H7200" x-morph="He,Vqa"\+w*\f* \w רַבּ֖וֹת|lemma="רַב" strong="H7227a" x-morph="He,Aafpa"\w* \w וְ⁠לֹ֣א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w* \w תִשְׁמֹ֑ר|lemma="שָׁמַר" strong="H8104" x-morph="He,Vqi2ms" x-tw="rc://*/tw/dict/bible/other/watch"\w* @@ -11571,7 +11571,7 @@ \v 24 \w מִֽי|lemma="מִי" strong="H4310" x-morph="He,Ti"\w*־\w נָתַ֨ן|lemma="נָתַן" strong="H5414" x-morph="He,Vqp3ms"\w* \w לִמְשִׁסָּ֧ה|lemma="מְשִׁסָּה" strong="l:H4933" x-morph="He,R:Ncfsa"\w* -\f + \ft K \w ל⁠משוסה|lemma="מְשִׁסָּה" strong="l:H4933" x-morph="He,R:Ncfsa"\w*\f* +\f + \ft K \+w ל⁠משוסה|lemma="מְשִׁסָּה" strong="l:H4933" x-morph="He,R:Ncfsa"\+w*\f* \w יַעֲקֹ֛ב|lemma="יַעֲקֹב" strong="H3290" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jacob"\w* \w וְ⁠יִשְׂרָאֵ֥ל|lemma="יִשְׂרָאֵל" strong="c:H3478" x-morph="He,C:Np"\w* \w לְ⁠בֹזְזִ֖ים|lemma="בָּזַז" strong="l:H0962" x-morph="He,R:Vqrmpa"\w* @@ -12174,7 +12174,7 @@ \w עָשָׂ֖ה|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqp3ms"\w* \w לְ⁠פִסְל֑⁠וֹ|lemma="פֶּסֶל" strong="l:H6459" x-morph="He,R:Ncmsc:Sp3ms"\w* \w יסגוד|lemma="סָגַד" strong="H5456" x-morph="He,Vqi3ms"\w*־\w ל֤⁠וֹ|lemma="סָגַד" strong="l:H5456" x-morph="He,R:Sp3ms"\w* -\f + \ft Q \w יִסְגָּד|lemma="סָגַד" strong="H5456" x-morph="He,Vqi3ms"\w*\f* +\f + \ft Q \+w יִסְגָּד|lemma="סָגַד" strong="H5456" x-morph="He,Vqi3ms"\+w*\f* \w וְ⁠יִשְׁתַּ֨חוּ֙|lemma="שָׁחָה" strong="c:H7812" x-morph="He,C:Vvi3ms" x-tw="rc://*/tw/dict/bible/kt/worship"\w* \w וְ⁠יִתְפַּלֵּ֣ל|lemma="פָּלַל" strong="c:H6419" x-morph="He,C:Vti3ms" x-tw="rc://*/tw/dict/bible/kt/pray"\w* \w אֵלָ֔י⁠ו|lemma="אֵל" strong="H0413" x-morph="He,R:Sp3ms"\w* @@ -12371,7 +12371,7 @@ \w אֵלֵ֔ךְ|lemma="יָלַךְ" strong="H3212" x-morph="He,Vqi1cs" x-tw="rc://*/tw/dict/bible/other/walk"\w* \w וַ⁠הֲדוּרִ֖ים|lemma="הָדַר" strong="c:H1921" x-morph="He,C:Ncmpa"\w* \w אֲיַשֵּׁ֑ר|lemma="יָשַׁר" strong="H3474" x-morph="He,Vpi1cs"\w* -\f + \ft K \w אושר|lemma="יָשַׁר" strong="H3474" x-morph="He,Vhi1cs"\w*\f* +\f + \ft K \+w אושר|lemma="יָשַׁר" strong="H3474" x-morph="He,Vhi1cs"\+w*\f* \w דַּלְת֤וֹת|lemma="דֶּלֶת" strong="H1817c" x-morph="He,Ncfpc"\w* \w נְחוּשָׁה֙|lemma="נְחוּשָׁה" strong="H5154" x-morph="He,Ncfsa"\w* \w אֲשַׁבֵּ֔ר|lemma="שָׁבַר" strong="H7665" x-morph="He,Vpi1cs"\w* @@ -12853,7 +12853,7 @@ \w מֶרְחָ֖ק|lemma="מֶרְחָק" strong="H4801" x-morph="He,Ncmsa"\w* \w אִ֣ישׁ|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsc"\w* \w עֲצָתִ֑י|lemma="עֵצָה" strong="H6098" x-morph="He,Ncfsc:Sp1cs"\w* -\f + \ft K \w עצת⁠ו|lemma="עֵצָה" strong="H6098" x-morph="He,Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w עצת⁠ו|lemma="עֵצָה" strong="H6098" x-morph="He,Ncfsc:Sp3ms"\+w*\f* \w אַף|lemma="אַף" strong="H0637" x-morph="He,Ta"\w*־\w דִּבַּ֨רְתִּי֙|lemma="דָבַר" strong="H1696" x-morph="He,Vpp1cs"\w* \w אַף|lemma="אַף" strong="H0637" x-morph="He,Ta"\w*־\w אֲבִיאֶ֔⁠נָּה|lemma="בּוֹא" strong="H0935" x-morph="He,Vhi1cs:Sp3fs"\w* \w יָצַ֖רְתִּי|lemma="יָצַר" strong="H3335" x-morph="He,Vqp1cs"\w* @@ -13066,7 +13066,7 @@ \w יַעַמְדוּ|lemma="עָמַד" strong="H5975" x-morph="He,Vqj3mp" x-tw="rc://*/tw/dict/bible/kt/appoint"\w*־\w נָ֨א|lemma="נָא" strong="H4994" x-morph="He,Te"\w* \w וְ⁠יוֹשִׁיעֻ֜⁠ךְ|lemma="יָשַׁע" strong="c:H3467" x-morph="He,C:Vhj3mp:Sp2fs" x-tw="rc://*/tw/dict/bible/other/deliverer"\w* \w הֹבְרֵ֣י|lemma="הָבַר" strong="H1895" x-morph="He,Vqrmpc"\w* -\f + \ft K \w הברו|lemma="הָבַר" strong="H1895" x-morph="He,Vqp3cp"\w*\f* +\f + \ft K \+w הברו|lemma="הָבַר" strong="H1895" x-morph="He,Vqp3cp"\+w*\f* \w שָׁמַ֗יִם|lemma="שָׁמַיִם" strong="H8064" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/kt/heaven"\w* \w הַֽ⁠חֹזִים֙|lemma="חֹזֶה" strong="d:H2374" x-morph="He,Td:Vqrmpa"\w* \w בַּ⁠כּ֣וֹכָבִ֔ים|lemma="כּוֹכָב" strong="b:H3556" x-morph="He,Rd:Ncmpa"\w* @@ -13464,7 +13464,7 @@ \w אֵלָ֔י⁠ו|lemma="אֵל" strong="H0413" x-morph="He,R:Sp3ms"\w* \w וְ⁠יִשְׂרָאֵ֖ל|lemma="יִשְׂרָאֵל" strong="c:H3478" x-morph="He,C:Np"\w* \w ל֣וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* -\f + \ft K \w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*\f* +\f + \ft K \+w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\+w*\f* \w יֵאָסֵ֑ף|lemma="אָסַף" strong="H0622" x-morph="He,VNi3ms" x-tw="rc://*/tw/dict/bible/other/assembly"\w* \w וְ⁠אֶכָּבֵד֙|lemma="כָּבַד" strong="c:H3513" x-morph="He,C:VNi1cs"\w* \w בְּ⁠עֵינֵ֣י|lemma="עַיִן" strong="b:H5869a" x-morph="He,R:Ncbdc"\w* @@ -13483,7 +13483,7 @@ \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w שִׁבְטֵ֣י|lemma="שֵׁבֶט" strong="H7626" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/other/tribe"\w* \w יַעֲקֹ֔ב|lemma="יַעֲקֹב" strong="H3290" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jacob"\w* \w ו⁠נצירי|lemma="נָצַר" strong="c:H5341" x-morph="He,C:Vqsmpc"\w* -\f + \ft K \w ו⁠נצירי|lemma="נָצַר" strong="c:H5341" x-morph="He,C:Vqsmpc"\w*\f* +\f + \ft K \+w ו⁠נצירי|lemma="נָצַר" strong="c:H5341" x-morph="He,C:Vqsmpc"\+w*\f* \w יִשְׂרָאֵ֖ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w לְ⁠הָשִׁ֑יב|lemma="שׁוּב" strong="l:H7725" x-morph="He,R:Vhc" x-tw="rc://*/tw/dict/bible/kt/restore"\w* \w וּ⁠נְתַתִּ֨י⁠ךָ֙|lemma="נָתַן" strong="c:H5414" x-morph="He,C:Vqq1cs:Sp2ms"\w* @@ -13588,7 +13588,7 @@ \w וְ⁠גִ֣ילִי|lemma="גִּיל" strong="c:H1523" x-morph="He,C:Vqv2fs"\w* \w אָ֔רֶץ|lemma="אֶרֶץ" strong="H0776" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w* \w וּפִצְח֥וּ|lemma="פָּצַח" strong="H6476" x-morph="He,C:Vqv2mp"\w* -\f + \ft K \w יפצחו|lemma="פָּצַח" strong="H6476" x-morph="He,Vqj3mp"\w*\f* +\f + \ft K \+w יפצחו|lemma="פָּצַח" strong="H6476" x-morph="He,Vqj3mp"\+w*\f* \w הָרִ֖ים|lemma="הַר" strong="H2022" x-morph="He,Ncmpa"\w* \w רִנָּ֑ה|lemma="רִנָּה" strong="H7440" x-morph="He,Ncfsa"\w* \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w נִחַ֤ם|lemma="נָחַם" strong="H5162" x-morph="He,Vpp3ms" x-tw="rc://*/tw/dict/bible/other/comfort"\w* @@ -14337,7 +14337,7 @@ \w שְּׁבִ֖י|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqv2fs"\w* \w יְרֽוּשָׁלִָ֑ם|lemma="יְרוּשָׁלִַ͏ם" strong="H3389" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jerusalem"\w* \w הִֽתְפַּתְּחִי֙|lemma="פָּתַח" strong="H6605a" x-morph="He,Vtv2fs"\w* -\f + \ft K \w התפתחו|lemma="פָּתַח" strong="H6605a" x-morph="He,Vtv2mp"\w*\f* +\f + \ft K \+w התפתחו|lemma="פָּתַח" strong="H6605a" x-morph="He,Vtv2mp"\+w*\f* \w מוֹסְרֵ֣י|lemma="מוֹסֵר" strong="H4147" x-morph="He,Ncbpc"\w* \w צַוָּארֵ֔⁠ךְ|lemma="צַוָּאר" strong="H6677a" x-morph="He,Ncmsc:Sp2fs"\w* \w שְׁבִיָּ֖ה|lemma="שְׁבִי" strong="H7628b" x-morph="He,Aafsa"\w* @@ -14376,7 +14376,7 @@ \w עַמִּ֖⁠י|lemma="עַם" strong="H5971a" x-morph="He,Ncmsc:Sp1cs" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* \w חִנָּ֑ם|lemma="חִנָּם" strong="H2600" x-morph="He,D"\w* \w מֹשְׁלָ֤יו|lemma="מָשַׁל" strong="H4910" x-morph="He,Vqrmpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/dominion"\w* -\f + \ft K \w משל⁠ו|lemma="מָשַׁל" strong="H4910" x-morph="He,Vqrmsc:Sp3ms"\w*\f* +\f + \ft K \+w משל⁠ו|lemma="מָשַׁל" strong="H4910" x-morph="He,Vqrmsc:Sp3ms"\+w*\f* \w יְהֵילִ֨ילוּ֙|lemma="יָלַל" strong="H3213" x-morph="He,Vhi3mp"\w* \w נְאֻם|lemma="נְאֻם" strong="H5002" x-morph="He,Ncmsc"\w*־\w יְהוָ֔ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w וְ⁠תָמִ֥יד|lemma="תָּמִיד" strong="c:H8548" x-morph="He,C:Ncmsa"\w* @@ -14899,7 +14899,7 @@ \v 16 \w הן|lemma="הֵן" strong="H2005" x-morph="He,Tm"\w* -\f + \ft Q \w הִנֵּ֤ה|lemma="הִנֵּ֤ה" strong="H2009" x-morph="He,Tm"\w*\f* +\f + \ft Q \+w הִנֵּ֤ה|lemma="הִנֵּ֤ה" strong="H2009" x-morph="He,Tm"\+w*\f* \w אָֽנֹכִי֙|lemma="אָנֹכִי" strong="H0595" x-morph="He,Pp1cs" x-tw="rc://*/tw/dict/bible/kt/pray"\w* \w בָּרָ֣אתִי|lemma="בָּרָא" strong="H1254a" x-morph="He,Vqp1cs"\w* \w חָרָ֔שׁ|lemma="חָרָשׁ" strong="H2796" x-morph="He,Ncmsa"\w* @@ -15114,7 +15114,7 @@ \w יַעֲלֶ֣ה|lemma="עָלָה" strong="H5927" x-morph="He,Vqi3ms"\w* \w בְר֔וֹשׁ|lemma="בְּרוֹשׁ" strong="H1265" x-morph="He,Ncmsa"\w* \w וְתַ֥חַת|lemma="תַּחַת" strong="c:H8478" x-morph="He,C:R"\w* -\f + \ft K \w תחת|lemma="תַּחַת" strong="H8478" x-morph="He,R"\w*\f* +\f + \ft K \+w תחת|lemma="תַּחַת" strong="H8478" x-morph="He,R"\+w*\f* \w הַ⁠סִּרְפַּ֖ד|lemma="סַרְפָּד" strong="d:H5636" x-morph="He,Td:Ncmsa"\w* \w יַעֲלֶ֣ה|lemma="עָלָה" strong="H5927" x-morph="He,Vqi3ms"\w* \w הֲדַ֑ס|lemma="הֲדַס" strong="H1918" x-morph="He,Ncmsa"\w* @@ -15265,7 +15265,7 @@ \v 10 \w צֹפָ֞יו|lemma="צָפָה" strong="H6822" x-morph="He,Vqrmpc:Sp3ms"\w* -\f + \ft K \w צפו|lemma="צָפָה" strong="H6822" x-morph="He,Vqp3cp"\w*\f* +\f + \ft K \+w צפו|lemma="צָפָה" strong="H6822" x-morph="He,Vqp3cp"\+w*\f* \w עִוְרִ֤ים|lemma="עִוֵּר" strong="H5787" x-morph="He,Aampa"\w* \w כֻּלָּ⁠ם֙|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc:Sp3mp"\w* \w לֹ֣א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* @@ -15556,7 +15556,7 @@ \v 19 \w בּוֹרֵ֖א|lemma="בָּרָא" strong="H1254a" x-morph="He,Vqrmsa"\w* \w נִ֣יב|lemma="נִיב" strong="H5108" x-morph="He,Ncmsc"\w* -\f + \ft K \w נוב|lemma="נִיב" strong="H5108" x-morph="He,Ncmsc"\w*\f* +\f + \ft K \+w נוב|lemma="נִיב" strong="H5108" x-morph="He,Ncmsc"\+w*\f* \w שְׂפָתָ֑יִם|lemma="שָׂפָה" strong="H8193" x-morph="He,Ncfda"\w* \w שָׁל֨וֹם|lemma="שָׁלוֹם" strong="H7965" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/peace"\w* ׀ \w שָׁל֜וֹם|lemma="שָׁלוֹם" strong="H7965" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/peace"\w* @@ -15813,7 +15813,7 @@ \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w יְהוָ֔ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w וְ⁠הִרְכַּבְתִּ֖י⁠ךָ|lemma="רָכַב" strong="c:H7392" x-morph="He,C:Vhq1cs:Sp2ms" x-tw="rc://*/tw/dict/bible/other/horse"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w בָּ֣מֳותֵי|lemma="בָּמָה" strong="H1116" x-morph="He,Ncfpc"\w* -\f + \ft Q \w בָּ֣מֳתֵי|lemma="בָּמָה" strong="H1116" x-morph="He,Ncfsc"\w*\f* +\f + \ft Q \+w בָּ֣מֳתֵי|lemma="בָּמָה" strong="H1116" x-morph="He,Ncfsc"\+w*\f* \w אָ֑רֶץ|lemma="אֶרֶץ" strong="H0776" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w* \w וְ⁠הַאֲכַלְתִּ֗י⁠ךָ|lemma="אָכַל" strong="c:H0398" x-morph="He,C:Vhq1cs:Sp2ms" x-tw="rc://*/tw/dict/bible/other/devour"\w* \w נַחֲלַת֙|lemma="נַחֲלָה" strong="H5159" x-morph="He,Ncfsc" x-tw="rc://*/tw/dict/bible/kt/inherit"\w* @@ -16429,7 +16429,7 @@ \w אָ֑רֶץ|lemma="אֶרֶץ" strong="H0776" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w* \w נֵ֧צֶר|lemma="נֵצֶר" strong="H5342" x-morph="He,Ncmsc"\w* \w מַטָּעַ֛י|lemma="מַטָּע" strong="H4302" x-morph="He,Ncmsc:Sp1cs"\w* -\f + \ft K \w מטע⁠ו|lemma="מַטָּע" strong="H4302" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w מטע⁠ו|lemma="מַטָּע" strong="H4302" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w מַעֲשֵׂ֥ה|lemma="מַעֲשֶׂה" strong="H4639" x-morph="He,Ncmsc"\w* \w יָדַ֖⁠י|lemma="יָד" strong="H3027" x-morph="He,Ncbdc:Sp1cs" x-tw="rc://*/tw/dict/bible/other/hand"\w* \w לְ⁠הִתְפָּאֵֽר|lemma="פָּאַר" strong="l:H6286a" x-morph="He,R:Vtc"\w*׃ @@ -16669,7 +16669,7 @@ \w תִּפְאֶ֖רֶת|lemma="תִּפְאָרָה" strong="H8597" x-morph="He,Ncfsa"\w* \w בְּ⁠יַד|lemma="יָד" strong="b:H3027" x-morph="He,R:Ncbsc" x-tw="rc://*/tw/dict/bible/other/hand"\w*־\w יְהוָ֑ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w וּצְנִ֥יף|lemma="צָנִיף" strong="c:H6797" x-morph="He,C:Ncbsc"\w* -\f + \ft K \w ו⁠צנוף|lemma="צָנַף" strong="c:H6801" x-morph="He,C:Vqa"\w*\f* +\f + \ft K \+w ו⁠צנוף|lemma="צָנַף" strong="c:H6801" x-morph="He,C:Vqa"\+w*\f* \w מְלוּכָ֖ה|lemma="מְלוּכָה" strong="H4410" x-morph="He,Ncfsa"\w* \w בְּ⁠כַף|lemma="כַּף" strong="b:H3709" x-morph="He,R:Ncfsc"\w*־\w אֱלֹהָֽיִ⁠ךְ|lemma="אֱלֹהִים" strong="H0430" x-morph="He,Ncmpc:Sp2fs" x-tw="rc://*/tw/dict/bible/kt/god"\w*׃ @@ -16919,7 +16919,7 @@ \v 9 \w בְּֽ⁠כָל|lemma="כֹּל" strong="b:H3605" x-morph="He,R:Ncmsc"\w*־\w צָרָתָ֣⁠ם|lemma="צָרָה" strong="H6869b" x-morph="He,Ncfsc:Sp3mp" x-tw="rc://*/tw/dict/bible/other/trouble"\w* ׀ \w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* -\f + \ft Q \w ל֣וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w*\f* +\f + \ft Q \+w ל֣וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\+w*\f* \w צָ֗ר|lemma="צַר" strong="H6862b" x-morph="He,Aamsa"\w* \w וּ⁠מַלְאַ֤ךְ|lemma="מַלְאָךְ" strong="c:H4397" x-morph="He,C:Ncmsc"\w* \w פָּנָי⁠ו֙|lemma="פָּנִים" strong="H6440" x-morph="He,Ncbpc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/face"\w* @@ -17269,7 +17269,7 @@ \w בְּשַׂ֣ר|lemma="בָּשָׂר" strong="H1320" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/flesh"\w* \w הַ⁠חֲזִ֔יר|lemma="חֲזִיר" strong="d:H2386" x-morph="He,Td:Ncmsa"\w* \w וּמְרַ֥ק|lemma="מָרָק" strong="c:H4839" x-morph="He,C:Ncmsc"\w* -\f + \ft K \w ו⁠פרק|lemma="פָּרָק" strong="c:H6564" x-morph="He,C:Ncmsc"\w*\f* +\f + \ft K \+w ו⁠פרק|lemma="פָּרָק" strong="c:H6564" x-morph="He,C:Ncmsc"\+w*\f* \w פִּגֻּלִ֖ים|lemma="פִּגּוּל" strong="H6292" x-morph="He,Ncmpa"\w* \w כְּלֵי⁠הֶֽם|lemma="כְּלִי" strong="H3627" x-morph="He,Ncmpc:Sp3mp"\w*׃ @@ -17314,7 +17314,7 @@ \w פְעֻלָּתָ֛⁠ם|lemma="פְּעֻלָּה" strong="H6468" x-morph="He,Ncfsc:Sp3mp"\w* \w רִֽאשֹׁנָ֖ה|lemma="רִאשׁוֹן" strong="H7223" x-morph="He,Aafsa"\w* \w על|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w חֵיקָֽ⁠ם|lemma="חֵיק" strong="H2436" x-morph="He,Ncmsc:Sp3mp"\w*׃ס -\f + \ft Q \w אֶל|lemma="אֶל" strong="H0413" x-morph="He,R"\w*\f* +\f + \ft Q \+w אֶל|lemma="אֶל" strong="H0413" x-morph="He,R"\+w*\f* \v 8 \w כֹּ֣ה|lemma="כֹּה" strong="H3541" x-morph="He,D"\w* ׀ @@ -17843,7 +17843,7 @@ \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w הַ⁠גַּנּ֗וֹת|lemma="גַּנָּה" strong="d:H1593" x-morph="He,Td:Ncfpa"\w* \w אַחַ֤ר|lemma="אַחַר" strong="H0310a" x-morph="He,R"\w* \w אַחַת֙|lemma="אֶחָד" strong="H0259" x-morph="He,Acfsa"\w* -\f + \ft K \w אחד|lemma="אֶחָד" strong="H0259" x-morph="He,Acmsa"\w*\f* +\f + \ft K \+w אחד|lemma="אֶחָד" strong="H0259" x-morph="He,Acmsa"\+w*\f* \w בַּ⁠תָּ֔וֶךְ|lemma="תָּוֶךְ" strong="b:H8432" x-morph="He,Rd:Ncmsa"\w* \w אֹֽכְלֵי֙|lemma="אָכַל" strong="H0398" x-morph="He,Vqrmpc" x-tw="rc://*/tw/dict/bible/other/devour"\w* \w בְּשַׂ֣ר|lemma="בָּשָׂר" strong="H1320" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/kt/flesh"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/25-LAM.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/25-LAM.usfm index 24ecd5f6..af0ac523 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/25-LAM.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/25-LAM.usfm @@ -94,7 +94,7 @@ \v 6 \w וַ⁠יֵּצֵ֥א|lemma="יָצָא" strong="c:H3318" x-morph="He,C:Vqw3ms" x-tw="rc://*/tw/dict/bible/kt/command"\w* \w מן|lemma="מִן" strong="H4480a" x-morph="He,R"\w*־\w בת|lemma="בַּת" strong="H1323" x-morph="He,Ncfsc"\w*־\w צִיּ֖וֹן|lemma="צִיּוֹן" strong="H6726" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/zion"\w* -\f + \ft Q \w מִבַּת|lemma="מִן" strong="H4480a" x-morph="He,R" lemma="בַּת" strong="H1323" x-morph="He,Ncfsc"\w*\f* +\f + \ft Q \+w מִבַּת|lemma="מִן" strong="H4480a" x-morph="He,R" lemma="בַּת" strong="H1323" x-morph="He,Ncfsc"\+w*\f* \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w הֲדָרָ֑⁠הּ|lemma="הָדָר" strong="H1926" x-morph="He,Ncmsc:Sp3fs"\w* \w הָי֣וּ|lemma="הָיָה" strong="H1961" x-morph="He,Vqp3cp"\w* \w שָׂרֶ֗י⁠הָ|lemma="שַׂר" strong="H8269" x-morph="He,Ncmpc:Sp3fs" x-tw="rc://*/tw/dict/bible/other/prince"\w* @@ -187,7 +187,7 @@ \w לֶ֔חֶם|lemma="לֶחֶם" strong="H3899" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/other/bread"\w* \w נָתְנ֧וּ|lemma="נָתַן" strong="H5414" x-morph="He,Vqp3cp"\w* \w מַחֲמַדֵּיהֶ֛ם|lemma="מַחְמֻד" strong="H4261" x-morph="He,Ncmpc:Sp3mp"\w* -\f + \ft K \w מחמודי⁠הם|lemma="מַחְמֻד" strong="H4262" x-morph="He,Ncmpc:Sp3mp"\w*\f* +\f + \ft K \+w מחמודי⁠הם|lemma="מַחְמֻד" strong="H4262" x-morph="He,Ncmpc:Sp3mp"\+w*\f* \w בְּ⁠אֹ֖כֶל|lemma="אֹכֶל" strong="b:H0400" x-morph="He,R:Ncmsa"\w* \w לְ⁠הָשִׁ֣יב|lemma="שׁוּב" strong="l:H7725" x-morph="He,R:Vhc" x-tw="rc://*/tw/dict/bible/kt/restore"\w* \w נָ֑פֶשׁ|lemma="נֶפֶשׁ" strong="H5315" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/kt/life"\w* @@ -311,7 +311,7 @@ \w מָרִ֑יתִי|lemma="מָרָה" strong="H4784" x-morph="He,Vqp1cs" x-tw="rc://*/tw/dict/bible/other/rebel"\w* \w שִׁמְעוּ|lemma="שָׁמַע" strong="H8085" x-morph="He,Vqv2mp"\w*־\w נָ֣א|lemma="נָא" strong="H4994" x-morph="He,Te"\w* \w כָל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w עמים|lemma="עַם" strong="H5971a" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/other/peoplegroup"\w* -\f + \ft Q \w הָֽעַמִּ֗ים|lemma="עַם" strong="c:H5971a" x-morph="He,Td:Ncmpa"\w*\f* +\f + \ft Q \+w הָֽעַמִּ֗ים|lemma="עַם" strong="c:H5971a" x-morph="He,Td:Ncmpa"\+w*\f* \w וּ⁠רְאוּ֙|lemma="רָאָה" strong="c:H7200" x-morph="He,C:Vqv2mp"\w* \w מַכְאֹבִ֔⁠י|lemma="מַכְאֹב" strong="H4341" x-morph="He,Ncmsc:Sp1cs"\w* \w בְּתוּלֹתַ֥⁠י|lemma="בְּתוּלָה" strong="H1330" x-morph="He,Ncfpc:Sp1cs" x-tw="rc://*/tw/dict/bible/other/virgin"\w* @@ -410,7 +410,7 @@ \w בִּלַּ֨ע|lemma="בָּלַע" strong="H1104" x-morph="He,Vpp3ms"\w* \w אֲדֹנָ֜⁠י|lemma="אֲדֹנָי" strong="H0136" x-morph="He,Ncmpc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/lord"\w* \w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* -\f + \ft Q \w וְלֹ֣א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w*\f* +\f + \ft Q \+w וְלֹ֣א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\+w*\f* \w חָמַ֗ל|lemma="חָמַל" strong="H2550" x-morph="He,Vqp3ms"\w* \w אֵ֚ת|lemma="אֵת" strong="H0853" x-morph="He,To"\w* \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w נְא֣וֹת|lemma="נָאָה" strong="H4999" x-morph="He,Ncfpc"\w* @@ -616,7 +616,7 @@ \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w עֲוֺנֵ֖⁠ךְ|lemma="עָוֺן" strong="H5771" x-morph="He,Ncbsc:Sp2fs" x-tw="rc://*/tw/dict/bible/kt/iniquity"\w* \w לְ⁠הָשִׁ֣יב|lemma="שׁוּב" strong="l:H7725" x-morph="He,R:Vhc" x-tw="rc://*/tw/dict/bible/kt/restore"\w* \w שְׁבוּתֵ֑ךְ|lemma="שְׁבוּת" strong="H7622" x-morph="He,Ncfsc:Sp2fs" x-tw="rc://*/tw/dict/bible/other/captive"\w* -\f + \ft K \w שבית⁠ך|lemma="שְׁבוּת" strong="H7622" x-morph="He,Ncfsc:Sp2fs"\w*\f* +\f + \ft K \+w שבית⁠ך|lemma="שְׁבוּת" strong="H7622" x-morph="He,Ncfsc:Sp2fs"\+w*\f* \w וַ⁠יֶּ֣חֱזוּ|lemma="חָזָה" strong="c:H2372" x-morph="He,C:Vqw3mp"\w* \w לָ֔⁠ךְ|lemma="" strong="l" x-morph="He,R:Sp2fs"\w* \w מַשְׂא֥וֹת|lemma="מַשְׂאֵת" strong="H4864" x-morph="He,Ncfpc"\w* @@ -699,7 +699,7 @@ \w ק֣וּמִי|lemma="קוּם" strong="H6965b" x-morph="He,Vqv2fs"\w* ׀ \w רֹ֣נִּי|lemma="רָנַן" strong="H7442b" x-morph="He,Vqv2fs"\w* \w בַלַּ֗יְלָה|lemma="לַיִל" strong="b:H3915" x-morph="He,Rd:Ncmsa"\w* -\f + \ft K \w ב⁠ליל|lemma="לַיִל" strong="b:H3915" x-morph="He,Rd:Ncmsa"\w*\f* +\f + \ft K \+w ב⁠ליל|lemma="לַיִל" strong="b:H3915" x-morph="He,Rd:Ncmsa"\+w*\f* \w לְ⁠רֹאשׁ֙|lemma="רֹאשׁ" strong="l:H7218a" x-morph="He,R:Ncmsc"\w* \w אַשְׁמֻר֔וֹת|lemma="אַשְׁמֻרָה" strong="H0821" x-morph="He,Ncfpa"\w* \w שִׁפְכִ֤י|lemma="שָׁפַךְ" strong="H8210" x-morph="He,Vqv2fs"\w* @@ -845,7 +845,7 @@ \w הוּא֙|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w* \w לִ֔⁠י|lemma="" strong="l" x-morph="He,R:Sp1cs"\w* \w אריה|lemma="אַרְיֵה" strong="H0738b" x-morph="He,Ncmsa"\w* -\f + \ft Q \w אֲרִ֖י|lemma="אֲרִי" strong="H0738a" x-morph="He,Ncmsa"\w*\f* +\f + \ft Q \+w אֲרִ֖י|lemma="אֲרִי" strong="H0738a" x-morph="He,Ncmsa"\+w*\f* \w בְּ⁠מִסְתָּרִֽים|lemma="מִסְתָּר" strong="b:H4565" x-morph="He,R:Ncmpa"\w*׃ \v 11 @@ -912,7 +912,7 @@ \w זָכ֣וֹר|lemma="זָכַר" strong="H2142" x-morph="He,Vqa"\w* \w תִּזְכּ֔וֹר|lemma="זָכַר" strong="H2142" x-morph="He,Vqi3fs"\w* \w וְתָשׁ֥וֹחַ|lemma="שׁוּחַ" strong="c:H7743" x-morph="He,C:Vqi3fs"\w* -\f + \ft K \w ו⁠תשיח|lemma="שׁוּחַ" strong="c:H7743" x-morph="He,C:Vhi3fs"\w*\f* +\f + \ft K \+w ו⁠תשיח|lemma="שׁוּחַ" strong="c:H7743" x-morph="He,C:Vhi3fs"\+w*\f* \w עָלַ֖⁠י|lemma="עַל" strong="H5921a" x-morph="He,R:Sp1cs"\w* \w נַפְשִֽׁ⁠י|lemma="נֶפֶשׁ" strong="H5315" x-morph="He,Ncbsc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/life"\w*׃ @@ -1004,7 +1004,7 @@ \w וְ⁠רִחַ֖ם|lemma="רָחַם" strong="c:H7355" x-morph="He,C:Vpq3ms"\w* \w כְּ⁠רֹ֥ב|lemma="רֹב" strong="k:H7230" x-morph="He,R:Ncbsc"\w* \w חסד⁠ו|lemma="חֶסֶד" strong="H2617a" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/covenantfaith"\w*׃ -\f + \ft Q \w חֲסָדָֽיו|lemma="חֶסֶד" strong="H2617a" x-morph="He,Ncmpc:Sp3ms"\w*\f* +\f + \ft Q \+w חֲסָדָֽיו|lemma="חֶסֶד" strong="H2617a" x-morph="He,Ncmpc:Sp3ms"\+w*\f* \v 33 \w כִּ֣י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* @@ -1060,7 +1060,7 @@ \w חָ֔י|lemma="חַי" strong="H2416a" x-morph="He,Aamsa" x-tw="rc://*/tw/dict/bible/kt/life"\w* \w גֶּ֖בֶר|lemma="גֶּבֶר" strong="H1397" x-morph="He,Ncmsa"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w חֲטָאָֽיו|lemma="חֵטְא" strong="H2399" x-morph="He,Ncmpc:Sp3ms"\w*׃ס -\f + \ft K \w חטא⁠ו|lemma="חֵטְא" strong="H2399" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w חטא⁠ו|lemma="חֵטְא" strong="H2399" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \v 40 \w נַחְפְּשָׂ֤ה|lemma="חָפַשׂ" strong="H2664" x-morph="He,Vqh1cp"\w* @@ -1286,7 +1286,7 @@ \v 3 \w גַּם|lemma="גַּם" strong="H1571" x-morph="He,Ta"\w*־\w תַּנִּים֙|lemma="תַּנָּה" strong="H8568" x-morph="He,Ncbpa"\w* -\f + \ft Q \w תנין|lemma="תַּנָּה" strong="H8568" x-morph="He,Ncbpa"\w*\f* +\f + \ft Q \+w תנין|lemma="תַּנָּה" strong="H8568" x-morph="He,Ncbpa"\+w*\f* \w חָ֣לְצוּ|lemma="חָלַץ" strong="H2502a" x-morph="He,Vqp3cp"\w* \w שַׁ֔ד|lemma="שַׁד" strong="H7699a" x-morph="He,Ncmsa"\w* \w הֵינִ֖יקוּ|lemma="יָנַק" strong="H3243" x-morph="He,Vhp3cp"\w* @@ -1400,7 +1400,7 @@ \w הֶאֱמִ֨ינוּ֙|lemma="אָמַן" strong="H0539" x-morph="He,Vhp3cp" x-tw="rc://*/tw/dict/bible/kt/faithful"\w* \w מַלְכֵי|lemma="מֶלֶךְ" strong="H4428" x-morph="He,Ncmpc" x-tw="rc://*/tw/dict/bible/other/king"\w*־\w אֶ֔רֶץ|lemma="אֶרֶץ" strong="H0776" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w* \w ו⁠כל|lemma="כֹּל" strong="c:H3605" x-morph="He,C:Ncmsc"\w* -\f + \ft Q \w כֹּ֖ל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*\f* +\f + \ft Q \+w כֹּ֖ל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\+w*\f* \w יֹשְׁבֵ֣י|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqrmpc"\w* \w תֵבֵ֑ל|lemma="תֵּבֵל" strong="H8398" x-morph="He,Ncfsa"\w* \w כִּ֤י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* @@ -1460,13 +1460,13 @@ \w לֹ֣א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w נָשָׂ֔אוּ|lemma="נָשָׂא" strong="H5375" x-morph="He,Vqp3cp"\w* \w זקנים|lemma="זָקֵן" strong="H2205" x-morph="He,Aampa" x-tw="rc://*/tw/dict/bible/other/elder"\w* -\f + \ft Q \w וּזְקֵנִ֖ים|lemma="זָקֵן" strong="c:H2205" x-morph="He,C:Aampa"\w*\f* +\f + \ft Q \+w וּזְקֵנִ֖ים|lemma="זָקֵן" strong="c:H2205" x-morph="He,C:Aampa"\+w*\f* \w לֹ֥א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w חָנָֽנוּ|lemma="חָנַן" strong="H2603a" x-morph="He,Vqp3cp"\w*׃ס \v 17 \w עוֹדֵ֙ינוּ֙|lemma="עוֹד" strong="H5750" x-morph="He,D:Sp1cp"\w* -\f + \ft K \w עוד⁠ינה|lemma="עוֹד" strong="H5750" x-morph="He,D:Sp3fp"\w*\f* +\f + \ft K \+w עוד⁠ינה|lemma="עוֹד" strong="H5750" x-morph="He,D:Sp3fp"\+w*\f* \w תִּכְלֶ֣ינָה|lemma="כָּלָה" strong="H3615" x-morph="He,Vqi3fp" x-tw="rc://*/tw/dict/bible/other/consume"\w* \w עֵינֵ֔י⁠נוּ|lemma="עַיִן" strong="H5869a" x-morph="He,Ncbdc:Sp1cp"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w עֶזְרָתֵ֖⁠נוּ|lemma="עֶזְרָה" strong="H5833" x-morph="He,Ncfsc:Sp1cp"\w* @@ -1519,7 +1519,7 @@ \w וְ⁠שִׂמְחִי֙|lemma="שָׂמַח" strong="c:H8055" x-morph="He,C:Vqv2fs" x-tw="rc://*/tw/dict/bible/other/joy"\w* \w בַּת|lemma="בַּת" strong="H1323" x-morph="He,Ncfsc"\w*־\w אֱד֔וֹם|lemma="אֱדֹם" strong="H0123" x-morph="He,Np"\w* \w יוֹשֶׁ֖בֶת|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqrfsa"\w* -\f + \ft K \w יושבתי|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqrfsc"\w*\f* +\f + \ft K \+w יושבתי|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqrfsc"\+w*\f* \w בְּ⁠אֶ֣רֶץ|lemma="אֶרֶץ" strong="b:H0776" x-morph="He,R:Ncbsc"\w* \w ע֑וּץ|lemma="עוּץ" strong="H5780" x-morph="He,Np"\w* \w גַּם|lemma="גַּם" strong="H1571" x-morph="He,Ta"\w*־\w עָלַ֨יִ⁠ךְ֙|lemma="עַל" strong="H5921a" x-morph="He,R:Sp2fs"\w* @@ -1548,7 +1548,7 @@ \w מֶֽה|lemma="מָה" strong="H4100" x-morph="He,Ti"\w*־\w הָ֣יָה|lemma="הָיָה" strong="H1961" x-morph="He,Vqp3ms"\w* \w לָ֔⁠נוּ|lemma="" strong="l" x-morph="He,R:Sp1cp"\w* \w הביט|lemma="נָבַט" strong="H5027" x-morph="He,Vhv2ms"\w* -\f + \ft Q \w הַבִּ֖יטָה|lemma="נָבַט" strong="H5027" x-morph="He,Vhv2ms:Sh"\w*\f* +\f + \ft Q \+w הַבִּ֖יטָה|lemma="נָבַט" strong="H5027" x-morph="He,Vhv2ms:Sh"\+w*\f* \w וּ⁠רְאֵ֥ה|lemma="רָאָה" strong="c:H7200" x-morph="He,C:Vqv2ms"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w חֶרְפָּתֵֽ⁠נוּ|lemma="חֶרְפָּה" strong="H2781" x-morph="He,Ncfsc:Sp1cp" x-tw="rc://*/tw/dict/bible/other/shame"\w*׃ @@ -1563,7 +1563,7 @@ \w יְתוֹמִ֤ים|lemma="יָתוֹם" strong="H3490" x-morph="He,Ncmpa"\w* \w הָיִ֨ינוּ֙|lemma="הָיָה" strong="H1961" x-morph="He,Vqp1cp"\w* \w אין|lemma="אַיִן" strong="H0369" x-morph="He,Tn"\w* -\f + \ft Q \w וְאֵ֣ין|lemma="אַיִן" strong="c:H0369" x-morph="He,C:Tn"\w*\f* +\f + \ft Q \+w וְאֵ֣ין|lemma="אַיִן" strong="c:H0369" x-morph="He,C:Tn"\+w*\f* \w אָ֔ב|lemma="אָב" strong="H0001" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/father"\w* \w אִמֹּתֵ֖י⁠נוּ|lemma="אֵם" strong="H0517" x-morph="He,Ncfpc:Sp1cp"\w* \w כְּ⁠אַלְמָנֽוֹת|lemma="אַלְמָנָה" strong="k:H0490" x-morph="He,R:Ncfpa"\w*׃ @@ -1582,7 +1582,7 @@ \w נִרְדָּ֔פְנוּ|lemma="רָדַף" strong="H7291" x-morph="He,VNp1cp" x-tw="rc://*/tw/dict/bible/other/persecute"\w* \w יָגַ֖עְנוּ|lemma="יָגַע" strong="H3021" x-morph="He,Vqp1cp"\w* \w לא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* -\f + \ft Q \w וְלֹ֥א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w*\f* +\f + \ft Q \+w וְלֹ֥א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\+w*\f* \w הֽוּנַ֖ח|lemma="נוּחַ" strong="H5117" x-morph="He,VHp3ms" x-tw="rc://*/tw/dict/bible/other/rest"\w* \w לָֽ⁠נוּ|lemma="" strong="l" x-morph="He,R:Sp1cp"\w*׃ @@ -1598,9 +1598,9 @@ \w אֲבֹתֵ֤י⁠נוּ|lemma="אָב" strong="H0001" x-morph="He,Ncmpc:Sp1cp" x-tw="rc://*/tw/dict/bible/other/father"\w* \w חָֽטְאוּ֙|lemma="חָטָא" strong="H2398" x-morph="He,Vqp3cp" x-tw="rc://*/tw/dict/bible/kt/sin"\w* \w אינ⁠ם|lemma="אַיִן" strong="H0369" x-morph="He,Tn:Sp3mp"\w* -\f + \ft Q \w וְאֵינָ֔ם|lemma="אַיִן" strong="c:H0369" x-morph="He,C:Tn:Sp3mp"\w*\f* +\f + \ft Q \+w וְאֵינָ֔ם|lemma="אַיִן" strong="c:H0369" x-morph="He,C:Tn:Sp3mp"\+w*\f* \w אנחנו|lemma="אֲנַחְנוּ" strong="H0587" x-morph="He,Pp1cp"\w* -\f + \ft Q \w וַאֲנַ֖חְנוּ|lemma="אֲנַחְנוּ" strong="c:H0587" x-morph="He,C:Pp1cp"\w*\f* +\f + \ft Q \+w וַאֲנַ֖חְנוּ|lemma="אֲנַחְנוּ" strong="c:H0587" x-morph="He,C:Pp1cp"\+w*\f* \w עֲוֺנֹתֵי⁠הֶ֥ם|lemma="עָוֺן" strong="H5771" x-morph="He,Ncbpc:Sp3mp" x-tw="rc://*/tw/dict/bible/kt/iniquity"\w* \w סָבָֽלְנוּ|lemma="סָבַל" strong="H5445" x-morph="He,Vqp1cp"\w*׃ @@ -1715,7 +1715,7 @@ \w יְהוָ֤ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* ׀ \w אֵלֶ֨י⁠ךָ֙|lemma="אֵל" strong="H0413" x-morph="He,R:Sp2ms"\w* \w ו⁠נשוב|lemma="שׁוּב" strong="c:H7725" x-morph="He,C:Vqi1cp" x-tw="rc://*/tw/dict/bible/other/return"\w* -\f + \ft Q \w וְֽנָשׁ֔וּבָה|lemma="שׁוּב" strong="c:H7725" x-morph="He,C:Vqh1cp"\w*\f* +\f + \ft Q \+w וְֽנָשׁ֔וּבָה|lemma="שׁוּב" strong="c:H7725" x-morph="He,C:Vqh1cp"\+w*\f* \w חַדֵּ֥שׁ|lemma="חָדַשׁ" strong="H2318" x-morph="He,Vpv2ms"\w* \w יָמֵ֖י⁠נוּ|lemma="יוֹם" strong="H3117" x-morph="He,Ncmpc:Sp1cp"\w* \w כְּ⁠קֶֽדֶם|lemma="קֶדֶם" strong="k:H6924a" x-morph="He,R:Ncmsa"\w*׃ diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/26-EZK.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/26-EZK.usfm index f8a53a16..1ea1fce3 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/26-EZK.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/26-EZK.usfm @@ -11369,7 +11369,7 @@ \w סַֽרְעַפֹּתָ֜י⁠ו|lemma="סַרְעַפָּה" strong="H5634" x-morph="He,Ncfpc:Sp3ms"\w* \w וַ⁠תֶּאֱרַ֧כְנָה|lemma="אָרַךְ" strong="c:H0748" x-morph="He,C:Vqw3fp"\w* \w פֹארֹתָ֛יו|lemma="פְּאֹרָה" strong="H6288" x-morph="He,Ncfpc:Sp3ms"\w* -\f + \ft K \w פארת⁠ו|lemma="פְּאֹרָה" strong="H6288" x-morph="He,Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w פארת⁠ו|lemma="פְּאֹרָה" strong="H6288" x-morph="He,Ncfsc:Sp3ms"\+w*\f* \w מִ⁠מַּ֥יִם|lemma="מַיִם" strong="m:H4325" x-morph="He,R:Ncmpa"\w* \w רַבִּ֖ים|lemma="רַב" strong="H7227a" x-morph="He,Aampa"\w* \w בְּ⁠שַׁלְּחֽ⁠וֹ|lemma="שָׁלַח" strong="b:H7971" x-morph="He,R:Vpc:Sp3ms"\w*׃ @@ -12034,7 +12034,7 @@ \w פַרְעֹ֔ה|lemma="פַּרְעֹה" strong="H6547" x-morph="He,Np"\w* \w וְ⁠נִחַ֖ם|lemma="נָחַם" strong="c:H5162" x-morph="He,C:VNq3ms"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w הֲמוֹנ֑וֹ|lemma="הָמוֹן" strong="H1995a" x-morph="He,Ncmsc:Sp3ms"\w* -\f + \ft K \w המונ⁠ה|lemma="הָמוֹן" strong="H1995a" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w המונ⁠ה|lemma="הָמוֹן" strong="H1995a" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w חַלְלֵי|lemma="חָלָל" strong="H2491a" x-morph="He,Aampc"\w*־\w חֶ֨רֶב֙|lemma="חֶרֶב" strong="H2719" x-morph="He,Ncfsa" x-tw="rc://*/tw/dict/bible/other/sword"\w* \w פַּרְעֹ֣ה|lemma="פַּרְעֹה" strong="H6547" x-morph="He,Np"\w* \w וְ⁠כָל|lemma="כֹּל" strong="c:H3605" x-morph="He,C:Ncmsc"\w*־\w חֵיל֔⁠וֹ|lemma="חַיִל" strong="H2428" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/prosper"\w* @@ -12045,7 +12045,7 @@ \v 32 \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w נָתַ֥תִּי|lemma="נָתַן" strong="H5414" x-morph="He,Vqp1cs"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w חתית⁠ו|lemma="חִתִּית" strong="H2851" x-morph="He,Ncfsc:Sp3ms"\w* -\f + \ft Q \w חִתִּיתִ֖י|lemma="חִתִּית" strong="H2851" x-morph="He,Ncfsc:Sp1cs"\w*\f* +\f + \ft Q \+w חִתִּיתִ֖י|lemma="חִתִּית" strong="H2851" x-morph="He,Ncfsc:Sp1cs"\+w*\f* \w בְּ⁠אֶ֣רֶץ|lemma="אֶרֶץ" strong="b:H0776" x-morph="He,R:Ncbsc"\w* \w חַיִּ֑ים|lemma="חַי" strong="H2416a" x-morph="He,Aampa" x-tw="rc://*/tw/dict/bible/kt/life"\w* \w וְ⁠הֻשְׁכַּב֩|lemma="שָׁכַב" strong="c:H7901" x-morph="He,C:VHq3ms"\w* @@ -12274,7 +12274,7 @@ \w וְ⁠עָ֣שָׂה|lemma="עָשָׂה" strong="c:H6213a" x-morph="He,C:Vqq3ms"\w* \w עָ֑וֶל|lemma="עֶוֶל" strong="H5766a" x-morph="He,Ncbsa"\w* \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w צִדְקֹתָיו֙|lemma="צְדָקָה" strong="H6666" x-morph="He,Ncfpc:Sp3ms"\w* -\f + \ft K \w צדקת⁠ו|lemma="צְדָקָה" strong="H6666" x-morph="He,Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w צדקת⁠ו|lemma="צְדָקָה" strong="H6666" x-morph="He,Ncfsc:Sp3ms"\+w*\f* \w לֹ֣א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w תִזָּכַ֔רְנָה|lemma="זָכַר" strong="H2142" x-morph="He,VNi3fp"\w* \w וּ⁠בְ⁠עַוְל֥⁠וֹ|lemma="עֶוֶל" strong="c:b:H5766a" x-morph="He,C:R:Ncbsc:Sp3ms"\w* @@ -12312,7 +12312,7 @@ \v 16 \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w חַטֹּאתָיו֙|lemma="חַטָּאָה" strong="H2403b" x-morph="He,Ncfpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/sin"\w* -\f + \ft K \w חטאת⁠ו|lemma="חַטָּאָה" strong="H2403b" x-morph="He,Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w חטאת⁠ו|lemma="חַטָּאָה" strong="H2403b" x-morph="He,Ncfsc:Sp3ms"\+w*\f* \w אֲשֶׁ֣ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w חָטָ֔א|lemma="חָטָא" strong="H2398" x-morph="He,Vqp3ms" x-tw="rc://*/tw/dict/bible/kt/sin"\w* \w לֹ֥א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* @@ -13145,7 +13145,7 @@ \w וְ⁠עָרֶ֖י⁠ךָ|lemma="עִיר" strong="c:H5892b" x-morph="He,C:Ncfpc:Sp2ms"\w* \w לֹ֣א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w תישבנה|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqi3fp"\w* -\f + \ft Q \w תָשֹׁ֑בְנָה|lemma="שׁוּב" strong="H7725" x-morph="He,Vqi3fp"\w*\f* +\f + \ft Q \+w תָשֹׁ֑בְנָה|lemma="שׁוּב" strong="H7725" x-morph="He,Vqi3fp"\+w*\f* \w וִֽ⁠ידַעְתֶּ֖ם|lemma="יָדַע" strong="c:H3045" x-morph="He,C:Vqq2mp" x-tw="rc://*/tw/dict/bible/other/know"\w* \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w אֲנִ֥י|lemma="אֲנִי" strong="H0589" x-morph="He,Pp1cs"\w* \w יְהוָֽה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w*׃ @@ -13194,7 +13194,7 @@ \w יִשְׂרָאֵ֖ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w לֵ⁠אמֹ֣ר|lemma="אָמַר" strong="l:H0559" x-morph="He,R:Vqc"\w* ׀ \w שָׁמֵ֑מוּ|lemma="שָׁמֵם" strong="H8074" x-morph="He,Vqp3cp" x-tw="rc://*/tw/dict/bible/other/amazed"\w* -\f + \ft K \w שממה|lemma="שָׁמֵם" strong="H8074" x-morph="He,Vqp3fs"\w*\f* +\f + \ft K \+w שממה|lemma="שָׁמֵם" strong="H8074" x-morph="He,Vqp3fs"\+w*\f* \w לָ֥⁠נוּ|lemma="" strong="l" x-morph="He,R:Sp1cp"\w* \w נִתְּנ֖וּ|lemma="נָתַן" strong="H5414" x-morph="He,VNp3cp"\w* \w לְ⁠אָכְלָֽה|lemma="אׇכְלָה" strong="l:H0402" x-morph="He,R:Ncfsa"\w*׃ @@ -13458,10 +13458,10 @@ \w אֹכֶ֥לֶת|lemma="אָכַל" strong="H0398" x-morph="He,Vqrfsc" x-tw="rc://*/tw/dict/bible/other/devour"\w* \w אָדָ֖ם|lemma="אָדָם" strong="H0120" x-morph="He,Ncmsa"\w* \w אָ֑תְּ|lemma="אַתָּה" strong="H0859b" x-morph="He,Pp2fs"\w* -\f + \ft K \w אתי|lemma="אַתָּה" strong="H0859c" x-morph="He,Pp2fs"\w*\f* +\f + \ft K \+w אתי|lemma="אַתָּה" strong="H0859c" x-morph="He,Pp2fs"\+w*\f* \w וּ⁠מְשַׁכֶּ֥לֶת|lemma="שָׁכֹל" strong="c:H7921a" x-morph="He,C:Vprfsc"\w* \w גוי⁠ך|lemma="גּוֹי" strong="H1471a" x-morph="He,Ncmsc:Sp2fs" x-tw="rc://*/tw/dict/bible/other/nation"\w* -\f + \ft Q \w גּוֹיַ֖יִךְ|lemma="גּוֹי" strong="H1471a" x-morph="He,Ncmpc:Sp2fs"\w*\f* +\f + \ft Q \+w גּוֹיַ֖יִךְ|lemma="גּוֹי" strong="H1471a" x-morph="He,Ncmpc:Sp2fs"\+w*\f* \w הָיִֽית|lemma="הָיָה" strong="H1961" x-morph="He,Vqp2fs"\w*׃ \v 14 @@ -13470,10 +13470,10 @@ \w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w תֹ֣אכְלִי|lemma="אָכַל" strong="H0398" x-morph="He,Vqi2fs" x-tw="rc://*/tw/dict/bible/other/devour"\w* \w ע֔וֹד|lemma="עוֹד" strong="H5750" x-morph="He,D"\w* \w ו⁠גוי⁠ך|lemma="גּוֹי" strong="c:H1471a" x-morph="He,C:Ncmsc:Sp2fs"\w* -\f + \ft Q \w וְגוֹיַ֖יִךְ|lemma="גּוֹי" strong="c:H1471a" x-morph="He,C:Ncmpc:Sp2fs"\w*\f* +\f + \ft Q \+w וְגוֹיַ֖יִךְ|lemma="גּוֹי" strong="c:H1471a" x-morph="He,C:Ncmpc:Sp2fs"\+w*\f* \w לֹ֣א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w תְשַׁכְּלִי|lemma="שָׁכַל" strong="H7921" x-morph="He,Vpi2fs"\w*־\w ע֑וֹד|lemma="עוֹד" strong="H5750" x-morph="He,D"\w* -\f + \ft K \w תכשלי|lemma="כָּשַׁל" strong="H3782" x-morph="He,Vpi2fs"\w*\f* +\f + \ft K \+w תכשלי|lemma="כָּשַׁל" strong="H3782" x-morph="He,Vpi2fs"\+w*\f* \w נְאֻ֖ם|lemma="נְאֻם" strong="H5002" x-morph="He,Ncmsc"\w* \w אֲדֹנָ֥⁠י|lemma="אֲדֹנָי" strong="H0136" x-morph="He,Ncmpc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/lord"\w* \w יְהוִֽה|lemma="יְהֹוִה" strong="H3069" x-morph="He,Np"\w*׃ @@ -13489,9 +13489,9 @@ \w לֹ֣א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w תִשְׂאִי|lemma="נָשָׂא" strong="H5375" x-morph="He,Vqi2fs"\w*־\w ע֑וֹד|lemma="עוֹד" strong="H5750" x-morph="He,D"\w* \w ו⁠גוי⁠ך|lemma="גּוֹי" strong="c:H1471a" x-morph="He,C:Ncmsc:Sp2fs"\w* -\f + \ft Q \w וְגוֹיַ֙יִךְ֙|lemma="גּוֹי" strong="c:H1471a" x-morph="He,C:Ncmsc:Sp2fs"\w*\f* +\f + \ft Q \+w וְגוֹיַ֙יִךְ֙|lemma="גּוֹי" strong="c:H1471a" x-morph="He,C:Ncmsc:Sp2fs"\+w*\f* \w לֹא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w תַכְשִׁ֣לִי|lemma="כָּשַׁל" strong="H3782" x-morph="He,Vhi2fs"\w* -\f + \ft Or perhaps \w תְשַׁכְּלִי|lemma="שָׁכַל" strong="H7921" x-morph="He,Vpi2fs"\w*\f* +\f + \ft Or perhaps \+w תְשַׁכְּלִי|lemma="שָׁכַל" strong="H7921" x-morph="He,Vpi2fs"\+w*\f* \w ע֔וֹד|lemma="עוֹד" strong="H5750" x-morph="He,D"\w* \w נְאֻ֖ם|lemma="נְאֻם" strong="H5002" x-morph="He,Ncmsc"\w* \w אֲדֹנָ֥⁠י|lemma="אֲדֹנָי" strong="H0136" x-morph="He,Ncmpc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/lord"\w* @@ -14056,7 +14056,7 @@ \w וְ⁠לִ⁠בְנֵ֥י|lemma="בֵּן" strong="c:l:H1121a" x-morph="He,C:R:Ncmpc" x-tw="rc://*/tw/dict/bible/kt/son"\w* \w יִשְׂרָאֵ֖ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w חֲבֵרָ֑יו|lemma="חָבֵר" strong="H2270" x-morph="He,Ncmpc:Sp3ms"\w* -\f + \ft K \w חבר⁠ו|lemma="חָבֵר" strong="H2270" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w חבר⁠ו|lemma="חָבֵר" strong="H2270" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w וּ⁠לְקַח֙|lemma="לָקַח" strong="c:H3947" x-morph="He,C:Vqv2ms"\w* \w עֵ֣ץ|lemma="עֵץ" strong="H6086" x-morph="He,Ncmsa"\w* \w אֶחָ֔ד|lemma="אֶחָד" strong="H0259" x-morph="He,Acmsa"\w* @@ -14068,7 +14068,7 @@ \w וְ⁠כָל|lemma="כֹּל" strong="c:H3605" x-morph="He,C:Ncmsc"\w*־\w בֵּ֥ית|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w* \w יִשְׂרָאֵ֖ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w חֲבֵרָֽיו|lemma="חָבֵר" strong="H2270" x-morph="He,Ncmsc:Sp3ms"\w*׃ -\f + \ft K \w חבר⁠ו|lemma="חָבֵר" strong="H2270" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w חבר⁠ו|lemma="חָבֵר" strong="H2270" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \v 17 \w וְ⁠קָרַ֨ב|lemma="קָרַב" strong="c:H7126" x-morph="He,C:Vpv2ms"\w* @@ -14110,7 +14110,7 @@ \w וְ⁠שִׁבְטֵ֥י|lemma="שֵׁבֶט" strong="c:H7626" x-morph="He,C:Ncmpc"\w* \w יִשְׂרָאֵ֖ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w חֲבֵרָ֑יו|lemma="חָבֵר" strong="H2270" x-morph="He,Ncmsc:Sp3ms"\w* -\f + \ft K \w חבר⁠ו|lemma="חָבֵר" strong="H2270" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w חבר⁠ו|lemma="חָבֵר" strong="H2270" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w וְ⁠נָתַתִּי֩|lemma="נָתַן" strong="c:H5414" x-morph="He,C:Vqq1cs"\w* \w אוֹתָ֨⁠ם|lemma="אֵת" strong="H0853" x-morph="He,To:Sp3mp"\w* \w עָלָ֜י⁠ו|lemma="עַל" strong="H5921a" x-morph="He,R:Sp3ms"\w* @@ -14168,7 +14168,7 @@ \w לְ⁠מֶ֑לֶךְ|lemma="מֶלֶךְ" strong="l:H4428" x-morph="He,R:Ncmsa" x-tw="rc://*/tw/dict/bible/other/king"\w* \w וְ⁠לֹ֤א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w* \w יִֽהְיוּ|lemma="הָיָה" strong="H1961" x-morph="He,Vqi3mp"\w*־\w עוֹד֙|lemma="הָיָה" strong="H1961" x-morph="He,D"\w* -\f + \ft K \w יהיה|lemma="הָיָה" strong="H1961" x-morph="He,Vqi3ms"\w*\f* +\f + \ft K \+w יהיה|lemma="הָיָה" strong="H1961" x-morph="He,Vqi3ms"\+w*\f* \w לִ⁠שְׁנֵ֣י|lemma="שְׁנַיִם" strong="l:H8147" x-morph="He,R:Acmdc"\w* \w גוֹיִ֔ם|lemma="גּוֹי" strong="H1471a" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/other/nation"\w* \w וְ⁠לֹ֨א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w* @@ -15033,7 +15033,7 @@ \w עַתָּ֗ה|lemma="עַתָּה" strong="H6258" x-morph="He,D"\w* \w אָשִׁיב֙|lemma="שׁוּב" strong="H7725" x-morph="He,Vhi1cs" x-tw="rc://*/tw/dict/bible/kt/restore"\w* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w שבית|lemma="שְׁבִית" strong="H7622" x-morph="He,Ncfsc" x-tw="rc://*/tw/dict/bible/other/captive"\w* -\f + \ft Q \w שְׁב֣וּת|lemma="שְׁבִית" strong="H7622" x-morph="He,Ncfsc"\w*\f* +\f + \ft Q \+w שְׁב֣וּת|lemma="שְׁבִית" strong="H7622" x-morph="He,Ncfsc"\+w*\f* \w יַֽעֲקֹ֔ב|lemma="יַעֲקֹב" strong="H3290" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jacob"\w* \w וְ⁠רִֽחַמְתִּ֖י|lemma="רָחַם" strong="c:H7355" x-morph="He,C:Vpq1cs"\w* \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w בֵּ֣ית|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w* @@ -15215,7 +15215,7 @@ \w הַ⁠קָּדִ֔ימָ⁠ה|lemma="קָדִים" strong="d:H6921" x-morph="He,Td:Ncmsa:Sd"\w* \w וַ⁠יַּ֖עַל|lemma="עָלָה" strong="c:H5927" x-morph="He,C:Vqw3ms"\w* \w בְּמַֽעֲלוֹתָ֑יו|lemma="מַעֲלָה" strong="b:H4609b" x-morph="He,R:Ncfpc:Sp3ms"\w* -\f + \ft K \w ב⁠מעלות⁠ו|lemma="מַעֲלָה" strong="b:H4609b" x-morph="He,R:Ncfpc:Sp3ms"\w*\f* +\f + \ft K \+w ב⁠מעלות⁠ו|lemma="מַעֲלָה" strong="b:H4609b" x-morph="He,R:Ncfpc:Sp3ms"\+w*\f* \w וַ⁠יָּ֣מָד|lemma="מָדַד" strong="c:H4058" x-morph="He,C:Vqw3ms"\w* ׀ \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w סַ֣ף|lemma="סַף" strong="H5592b" x-morph="He,Ncmsc"\w* \w הַ⁠שַּׁ֗עַר|lemma="שַׁעַר" strong="d:H8179" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/gate"\w* @@ -15265,7 +15265,7 @@ \w שְׁמֹנֶ֣ה|lemma="שְׁמֹנֶה" strong="H8083" x-morph="He,Acfsa"\w* \w אַמּ֔וֹת|lemma="אַמָּה" strong="H0520a" x-morph="He,Ncfpa"\w* \w וְאֵילָ֖יו|lemma="אַיִל" strong="c:H0352b" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠איל⁠ו|lemma="אַיִל" strong="c:H0352b" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠איל⁠ו|lemma="אַיִל" strong="c:H0352b" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w שְׁתַּ֣יִם|lemma="שְׁנַיִם" strong="H8147" x-morph="He,Acfda"\w* \w אַמּ֑וֹת|lemma="אַמָּה" strong="H0520a" x-morph="He,Ncfpa"\w* \w וְ⁠אֻלָ֥ם|lemma="אוּלָם" strong="c:H0197" x-morph="He,C:Ncmsc"\w* @@ -15348,7 +15348,7 @@ \w פְּנֵי֙|lemma="פָּנִים" strong="H6440" x-morph="He,Ncbpc" x-tw="rc://*/tw/dict/bible/other/face"\w* \w הַ⁠שַּׁ֣עַר|lemma="שַׁעַר" strong="d:H8179" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/gate"\w* \w הָֽאִית֔וֹן|lemma="יְאִתוֹן" strong="d:H2978" x-morph="He,Td:Ncmsa"\w* -\f + \ft K \w ה⁠יאתון|lemma="יְאִתוֹן" strong="d:H2978" x-morph="He,Td:Ncmsa"\w*\f* +\f + \ft K \+w ה⁠יאתון|lemma="יְאִתוֹן" strong="d:H2978" x-morph="He,Td:Ncmsa"\+w*\f* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w לִ⁠פְנֵ֕י|lemma="פָּנִים" strong="l:H6440" x-morph="He,R:Ncbpc"\w* \w אֻלָ֥ם|lemma="אוּלָם" strong="H0197" x-morph="He,Ncmsc"\w* \w הַ⁠שַּׁ֖עַר|lemma="שַׁעַר" strong="d:H8179" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/gate"\w* @@ -15429,15 +15429,15 @@ \v 21 \w וְתָאָ֗יו|lemma="תָּא" strong="c:H8372" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠תא⁠ו|lemma="תָּא" strong="c:H8372" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠תא⁠ו|lemma="תָּא" strong="c:H8372" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w שְׁלוֹשָׁ֤ה|lemma="שָׁלוֹשׁ" strong="H7969" x-morph="He,Acmsa"\w* \w מִ⁠פּוֹ֙|lemma="פֹּה" strong="m:H6311" x-morph="He,R:D"\w* \w וּ⁠שְׁלֹשָׁ֣ה|lemma="שָׁלוֹשׁ" strong="c:H7969" x-morph="He,C:Acmsa"\w* \w מִ⁠פּ֔וֹ|lemma="פֹּה" strong="m:H6311" x-morph="He,R:D"\w* \w וְאֵילָ֤יו|lemma="אַיִל" strong="c:H0352b" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠איל⁠ו|lemma="אַיִל" strong="c:H0352b" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠איל⁠ו|lemma="אַיִל" strong="c:H0352b" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w וְאֵֽלַמָּיו֙|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠אלמ⁠ו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠אלמ⁠ו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w הָיָ֔ה|lemma="הָיָה" strong="H1961" x-morph="He,Vqp3ms"\w* \w כְּ⁠מִדַּ֖ת|lemma="מִדָּה" strong="k:H4060a" x-morph="He,R:Ncfsc"\w* \w הַ⁠שַּׁ֣עַר|lemma="שַׁעַר" strong="d:H8179" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/gate"\w* @@ -15452,11 +15452,11 @@ \v 22 \w וְחַלּוֹנָ֤יו|lemma="חַלּוֹן" strong="c:H2474" x-morph="He,C:Ncbpc:Sp3ms"\w* -\f + \ft K \w ו⁠חלונ⁠ו|lemma="חַלּוֹן" strong="c:H2474" x-morph="He,C:Ncbsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠חלונ⁠ו|lemma="חַלּוֹן" strong="c:H2474" x-morph="He,C:Ncbsc:Sp3ms"\+w*\f* \w וְאֵֽלַמָּיו֙|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠אלמ⁠ו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠אלמ⁠ו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w וְתִ֣מֹרָ֔יו|lemma="תִּמֹּר" strong="c:H8561" x-morph="He,C:Ncfpc:Sp3ms"\w* -\f + \ft K \w ו⁠תמר⁠ו|lemma="תִּמֹּר" strong="c:H8561" x-morph="He,C:Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠תמר⁠ו|lemma="תִּמֹּר" strong="c:H8561" x-morph="He,C:Ncfsc:Sp3ms"\+w*\f* \w כְּ⁠מִדַּ֣ת|lemma="מִדָּה" strong="k:H4060a" x-morph="He,R:Ncfsc"\w* \w הַ⁠שַּׁ֔עַר|lemma="שַׁעַר" strong="d:H8179" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/gate"\w* \w אֲשֶׁ֥ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* @@ -15467,7 +15467,7 @@ \w שֶׁ֨בַע֙|lemma="שֶׁבַע" strong="H7651" x-morph="He,Acfsa"\w* \w יַֽעֲלוּ|lemma="עָלָה" strong="H5927" x-morph="He,Vqi3mp"\w*־\w ב֔⁠וֹ|lemma="" strong="b" x-morph="He,R:Sp3ms"\w* \w וְאֵֽילַמָּ֖יו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠אילמ⁠ו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠אילמ⁠ו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w לִ⁠פְנֵי⁠הֶֽם|lemma="פָּנִים" strong="l:H6440" x-morph="He,R:Ncbpc:Sp3mp"\w*׃ \v 23 @@ -15493,9 +15493,9 @@ \w הַ⁠דָּר֑וֹם|lemma="דָּרוֹם" strong="d:H1864" x-morph="He,Td:Ncmsa"\w* \w וּ⁠מָדַ֤ד|lemma="מָדַד" strong="c:H4058" x-morph="He,C:Vqq3ms"\w* \w אֵילָיו֙|lemma="אַיִל" strong="H0352b" x-morph="He,Ncmpc:Sp3ms"\w* -\f + \ft K \w איל⁠ו|lemma="אַיִל" strong="H0352b" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w איל⁠ו|lemma="אַיִל" strong="H0352b" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w וְאֵ֣ילַמָּ֔יו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠אילמ⁠ו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠אילמ⁠ו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w כַּ⁠מִּדּ֖וֹת|lemma="מִדָּה" strong="k:H4060a" x-morph="He,Rd:Ncfpa"\w* \w הָ⁠אֵֽלֶּה|lemma="אֵלֶּה" strong="d:H0428" x-morph="He,Td:Pdxcp"\w*׃ @@ -15503,7 +15503,7 @@ \w וְ⁠חַלּוֹנִ֨ים|lemma="חַלּוֹן" strong="c:H2474" x-morph="He,C:Ncbpa"\w* \w ל֤⁠וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* \w וּלְאֵֽילַמָּיו֙|lemma="אֵילָם" strong="c:l:H0361" x-morph="He,C:R:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠ל⁠אילמ⁠ו|lemma="אֵילָם" strong="c:l:H0361" x-morph="He,C:R:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠ל⁠אילמ⁠ו|lemma="אֵילָם" strong="c:l:H0361" x-morph="He,C:R:Ncmsc:Sp3ms"\+w*\f* \w סָבִ֣יב|lemma="סָבִיב" strong="H5439" x-morph="He,Ncbsa"\w* ׀ \w סָבִ֔יב|lemma="סָבִיב" strong="H5439" x-morph="He,Ncbsa"\w* \w כְּ⁠הַ⁠חֲלֹּנ֖וֹת|lemma="חַלּוֹן" strong="k:d:H2474" x-morph="He,R:Td:Ncbpa"\w* @@ -15520,10 +15520,10 @@ \w וּ⁠מַעֲל֤וֹת|lemma="מַעֲלָה" strong="c:H4609b" x-morph="He,C:Ncfpa"\w* \w שִׁבְעָה֙|lemma="שֶׁבַע" strong="H7651" x-morph="He,Acmsa"\w* \w עלות⁠ו|lemma="עֹלָה" strong="H5930c" x-morph="He,Ncfpc:Sp3ms"\w* -\f + \ft K \w עלות⁠ו|lemma="עֹלָה" strong="H5930c" x-morph="He,Ncfpc:Sp3ms"\w*\f* -\f + \ft Or perhaps \w מַעֲלָֽיו|lemma="מַעֲלֶה" strong="H4608" x-morph="He,Ncmpc:Sp3ms"\w*\f* +\f + \ft K \+w עלות⁠ו|lemma="עֹלָה" strong="H5930c" x-morph="He,Ncfpc:Sp3ms"\+w*\f* +\f + \ft Or perhaps \+w מַעֲלָֽיו|lemma="מַעֲלֶה" strong="H4608" x-morph="He,Ncmpc:Sp3ms"\+w*\f* \w וְאֵֽלַמָּ֖יו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠אלמ⁠ו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠אלמ⁠ו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w לִ⁠פְנֵי⁠הֶ֑ם|lemma="פָּנִים" strong="l:H6440" x-morph="He,R:Ncbpc:Sp3mp"\w* \w וְ⁠תִמֹרִ֣ים|lemma="תִּמֹּר" strong="c:H8561" x-morph="He,C:Ncfpa"\w* \w ל֗⁠וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* @@ -15532,7 +15532,7 @@ \w וְ⁠אֶחָ֥ד|lemma="אֶחָד" strong="c:H0259" x-morph="He,C:Acmsa"\w* \w מִ⁠פּ֖וֹ|lemma="פֹּה" strong="m:H6311" x-morph="He,R:D"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w אֵילָֽיו|lemma="אַיִל" strong="H0352b" x-morph="He,Ncmpc:Sp3ms"\w*׃ -\f + \ft K \w איל⁠ו|lemma="אַיִל" strong="H0352b" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w איל⁠ו|lemma="אַיִל" strong="H0352b" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \v 27 \w וְ⁠שַׁ֛עַר|lemma="שַׁעַר" strong="c:H8179" x-morph="He,C:Ncmsa" x-tw="rc://*/tw/dict/bible/other/gate"\w* @@ -15562,17 +15562,17 @@ \v 29 \w וְתָאָ֞יו|lemma="תָּא" strong="c:H8372" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠תא⁠ו|lemma="תָּא" strong="c:H8372" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠תא⁠ו|lemma="תָּא" strong="c:H8372" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w וְאֵילָ֤יו|lemma="אַיִל" strong="c:H0352b" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠איל⁠ו|lemma="אַיִל" strong="c:H0352b" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠איל⁠ו|lemma="אַיִל" strong="c:H0352b" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w וְאֵֽלַמָּיו֙|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠אלמ⁠ו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠אלמ⁠ו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w כַּ⁠מִּדּ֣וֹת|lemma="מִדָּה" strong="k:H4060a" x-morph="He,Rd:Ncfpa"\w* \w הָ⁠אֵ֔לֶּה|lemma="אֵלֶּה" strong="d:H0428" x-morph="He,Td:Pdxcp"\w* \w וְ⁠חַלּוֹנ֥וֹת|lemma="חַלּוֹן" strong="c:H2474" x-morph="He,C:Ncbpa"\w* \w ל֛⁠וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* \w וּלְאֵלַמָּ֖יו|lemma="אֵילָם" strong="c:l:H0361" x-morph="He,C:R:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠ל⁠אלמ⁠ו|lemma="אֵילָם" strong="c:l:H0361" x-morph="He,C:R:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠ל⁠אלמ⁠ו|lemma="אֵילָם" strong="c:l:H0361" x-morph="He,C:R:Ncmsc:Sp3ms"\+w*\f* \w סָבִ֣יב|lemma="סָבִיב" strong="H5439" x-morph="He,Ncbsa"\w* ׀ \w סָבִ֑יב|lemma="סָבִיב" strong="H5439" x-morph="He,Ncbsa"\w* \w חֲמִשִּׁ֤ים|lemma="חֲמִשִּׁים" strong="H2572" x-morph="He,Acbpa"\w* @@ -15597,16 +15597,16 @@ \v 31 \w וְ⁠אֵלַמָּ֗י⁠ו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ואלמו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ואלמו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w חָצֵר֙|lemma="חָצֵר" strong="H2691a" x-morph="He,Ncbsa"\w* \w הַ⁠חִ֣צוֹנָ֔ה|lemma="חִיצוֹן" strong="d:H2435" x-morph="He,Td:Aafsa"\w* \w וְ⁠תִמֹרִ֖ים|lemma="תִּמֹּר" strong="c:H8561" x-morph="He,C:Ncfpa"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w אֵילָ֑יו|lemma="אַיִל" strong="H0352b" x-morph="He,Ncmpc:Sp3ms"\w* -\f + \ft K \w איל⁠ו|lemma="אַיִל" strong="H0352b" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w איל⁠ו|lemma="אַיִל" strong="H0352b" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w וּ⁠מַעֲל֥וֹת|lemma="מַעֲלָה" strong="c:H4609b" x-morph="He,C:Ncfpa"\w* \w שְׁמוֹנֶ֖ה|lemma="שְׁמֹנֶה" strong="H8083" x-morph="He,Acfsa"\w* \w מַעֲלָֽיו|lemma="מַעֲלֶה" strong="H4608" x-morph="He,Ncmpc:Sp3ms"\w*׃ -\f + \ft K \w מעל⁠ו|lemma="מַעֲלֶה" strong="H4608" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w מעל⁠ו|lemma="מַעֲלֶה" strong="H4608" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \v 32 \w וַ⁠יְבִיאֵ֛⁠נִי|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vhw3ms:Sp1cs"\w* @@ -15621,17 +15621,17 @@ \v 33 \w וְתָאָ֞יו|lemma="תָּא" strong="c:H8372" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠תא⁠ו|lemma="תָּא" strong="c:H8372" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠תא⁠ו|lemma="תָּא" strong="c:H8372" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w וְאֵלָ֤יו|lemma="אַיִל" strong="c:H0352b" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ואלו|lemma="אַיִל" strong="c:H0352b" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ואלו|lemma="אַיִל" strong="c:H0352b" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w וְאֵֽלַמָּיו֙|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠אלמ⁠ו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠אלמ⁠ו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w כַּ⁠מִּדּ֣וֹת|lemma="מִדָּה" strong="k:H4060a" x-morph="He,Rd:Ncfpa"\w* \w הָ⁠אֵ֔לֶּה|lemma="אֵלֶּה" strong="d:H0428" x-morph="He,Td:Pdxcp"\w* \w וְ⁠חַלּוֹנ֥וֹת|lemma="חַלּוֹן" strong="c:H2474" x-morph="He,C:Ncbpa"\w* \w ל֛⁠וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* \w וּלְאֵלַמָּ֖יו|lemma="אֵילָם" strong="c:l:H0361" x-morph="He,C:R:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠ל⁠אלמ⁠ו|lemma="אֵילָם" strong="c:l:H0361" x-morph="He,C:R:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠ל⁠אלמ⁠ו|lemma="אֵילָם" strong="c:l:H0361" x-morph="He,C:R:Ncmsc:Sp3ms"\+w*\f* \w סָבִ֣יב|lemma="סָבִיב" strong="H5439" x-morph="He,Ncbsa"\w* ׀ \w סָבִ֑יב|lemma="סָבִיב" strong="H5439" x-morph="He,Ncbsa"\w* \w אֹ֚רֶךְ|lemma="אֹרֶךְ" strong="H0753" x-morph="He,Ncmsa"\w* @@ -15644,18 +15644,18 @@ \v 34 \w וְאֵלַמָּ֗יו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠אלמ⁠ו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠אלמ⁠ו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w לֶֽ⁠חָצֵר֙|lemma="חָצֵר" strong="l:H2691a" x-morph="He,Rd:Ncbsa" x-tw="rc://*/tw/dict/bible/other/courtyard"\w* \w הַ⁠חִ֣יצוֹנָ֔ה|lemma="חִיצוֹן" strong="d:H2435" x-morph="He,Td:Aafsa"\w* \w וְ⁠תִמֹרִ֥ים|lemma="תִּמֹּר" strong="c:H8561" x-morph="He,C:Ncfpa"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w אֵלָ֖יו|lemma="אַיִל" strong="H0352b" x-morph="He,Ncmpc:Sp3ms"\w* -\f + \ft K \w אל⁠ו|lemma="אַיִל" strong="H0352b" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w אל⁠ו|lemma="אַיִל" strong="H0352b" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w מִ⁠פּ֣וֹ|lemma="פֹּה" strong="m:H6311" x-morph="He,R:D"\w* \w וּ⁠מִ⁠פּ֑וֹ|lemma="פֹּה" strong="c:m:H6311" x-morph="He,C:R:D"\w* \w וּ⁠שְׁמֹנֶ֥ה|lemma="שְׁמֹנֶה" strong="c:H8083" x-morph="He,C:Acfsa"\w* \w מַעֲל֖וֹת|lemma="מַעֲלָה" strong="H4609b" x-morph="He,Ncfpa"\w* \w מַעֲלָֽיו|lemma="מַעֲלֶה" strong="H4608" x-morph="He,Ncmpc:Sp3ms"\w*׃ -\f + \ft K \w מעל⁠ו|lemma="מַעֲלֶה" strong="H4608" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w מעל⁠ו|lemma="מַעֲלֶה" strong="H4608" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \v 35 \w וַ⁠יְבִיאֵ֖⁠נִי|lemma="בּוֹא" strong="c:H0935" x-morph="He,C:Vhw3ms:Sp1cs"\w* @@ -15667,11 +15667,11 @@ \v 36 \w תָּאָיו֙|lemma="תָּא" strong="H8372" x-morph="He,Ncmpc:Sp3ms"\w* -\f + \ft K \w תא⁠ו|lemma="תָּא" strong="H8372" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w תא⁠ו|lemma="תָּא" strong="H8372" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w אֵלָ֣יו|lemma="אַיִל" strong="H0352b" x-morph="He,Ncmpc:Sp3ms"\w* -\f + \ft K \w אל⁠ו|lemma="אַיִל" strong="H0352b" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w אל⁠ו|lemma="אַיִל" strong="H0352b" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w וְאֵֽלַמָּ֔יו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠אלמ⁠ו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠אלמ⁠ו|lemma="אֵילָם" strong="c:H0361" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w וְ⁠חַלּוֹנ֥וֹת|lemma="חַלּוֹן" strong="c:H2474" x-morph="He,C:Ncbpa"\w* \w ל֖⁠וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* \w סָבִ֣יב|lemma="סָבִיב" strong="H5439" x-morph="He,Ncbsa"\w* ׀ @@ -15686,18 +15686,18 @@ \v 37 \w וְאֵילָ֗יו|lemma="אַיִל" strong="c:H0352b" x-morph="He,C:Ncmpc:Sp3ms"\w* -\f + \ft K \w ו⁠איל⁠ו|lemma="אַיִל" strong="c:H0352b" x-morph="He,C:Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠איל⁠ו|lemma="אַיִל" strong="c:H0352b" x-morph="He,C:Ncmsc:Sp3ms"\+w*\f* \w לֶֽ⁠חָצֵר֙|lemma="חָצֵר" strong="l:H2691a" x-morph="He,Rd:Ncbsa" x-tw="rc://*/tw/dict/bible/other/courtyard"\w* \w הַ⁠חִ֣יצוֹנָ֔ה|lemma="חִיצוֹן" strong="d:H2435" x-morph="He,Td:Aafsa"\w* \w וְ⁠תִמֹרִ֥ים|lemma="תִּמֹּר" strong="c:H8561" x-morph="He,C:Ncfpa"\w* \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w אֵילָ֖יו|lemma="אַיִל" strong="H0352b" x-morph="He,Ncmpc:Sp3ms"\w* -\f + \ft K \w איל⁠ו|lemma="אַיִל" strong="H0352b" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w איל⁠ו|lemma="אַיִל" strong="H0352b" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w מִ⁠פּ֣וֹ|lemma="פֹּה" strong="m:H6311" x-morph="He,R:D"\w* \w וּ⁠מִ⁠פּ֑וֹ|lemma="פֹּה" strong="c:m:H6311" x-morph="He,C:R:D"\w* \w וּ⁠שְׁמֹנֶ֥ה|lemma="שְׁמֹנֶה" strong="c:H8083" x-morph="He,C:Acfsa"\w* \w מַעֲל֖וֹת|lemma="מַעֲלָה" strong="H4609b" x-morph="He,Ncfpa"\w* \w מַעֲלָֽיו|lemma="מַעֲלֶה" strong="H4608" x-morph="He,Ncmpc:Sp3ms"\w*׃ -\f + \ft K \w מעל⁠ו|lemma="מַעֲלֶה" strong="H4608" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w מעל⁠ו|lemma="מַעֲלֶה" strong="H4608" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \v 38 \w וְ⁠לִשְׁכָּ֣ה|lemma="לִשְׁכָּה" strong="c:H3957" x-morph="He,C:Ncfsa"\w* @@ -16032,7 +16032,7 @@ \w סָבִ֣יב|lemma="סָבִיב" strong="H5439" x-morph="He,Ncbsa"\w* ׀ \w סָבִ֑יב|lemma="סָבִיב" strong="H5439" x-morph="He,Ncbsa"\w* \w מיסדות|lemma="מְיֻסָּדָה" strong="H3245" x-morph="He,VPsfpc"\w* -\f + \ft Q \w מוּסְד֤וֹת|lemma="מוּסָד" strong="H4143" x-morph="He,Ncbpc"\w*\f* +\f + \ft Q \+w מוּסְד֤וֹת|lemma="מוּסָד" strong="H4143" x-morph="He,Ncbpc"\+w*\f* \w הַ⁠צְּלָעוֹת֙|lemma="צֵלָע" strong="d:H6763" x-morph="He,Td:Ncbpa"\w* \w מְל֣וֹ|lemma="מְלֹא" strong="H4393" x-morph="He,Ncmsc"\w* \w הַ⁠קָּנֶ֔ה|lemma="קָנֶה" strong="d:H7070" x-morph="He,Td:Ncmsa"\w* @@ -16134,7 +16134,7 @@ \w אֲשֶׁ֨ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w אַחֲרֶ֧י⁠הָ|lemma="אַחַר" strong="H0310a" x-morph="He,R:Sp3fs"\w* \w ו⁠אתוקי⁠הא|lemma="אַתּוּק" strong="c:H0862a" x-morph="He,C:Ncmpc:Sp3fs"\w* -\f + \ft Q \w וְאַתִּיקֶ֛יהָא|lemma="אַתּוּק" strong="c:H0862b" x-morph="He,C:Ncmpc:Sp3fs"\w*\f* +\f + \ft Q \+w וְאַתִּיקֶ֛יהָא|lemma="אַתּוּק" strong="c:H0862b" x-morph="He,C:Ncmpc:Sp3fs"\+w*\f* \w מִ⁠פּ֥וֹ|lemma="פֹּה" strong="m:H6311" x-morph="He,R:D"\w* \w וּ⁠מִ⁠פּ֖וֹ|lemma="פֹּה" strong="c:m:H6311" x-morph="He,C:R:D"\w* \w מֵאָ֣ה|lemma="מֵאָה" strong="H3967" x-morph="He,Acbsa"\w* @@ -16401,12 +16401,12 @@ \v 9 \w וּמִתַּ֖חַת|lemma="תַּחַת" strong="c:m:H8478" x-morph="He,C:R:R"\w* -\f + \ft K \w ו⁠מ⁠תחת⁠ה|lemma="תַּחַת" strong="c:m:H8478" x-morph="He,C:R:R:Sd"\w*\f* +\f + \ft K \+w ו⁠מ⁠תחת⁠ה|lemma="תַּחַת" strong="c:m:H8478" x-morph="He,C:R:R:Sd"\+w*\f* \w הַלְּשָׁכ֣וֹת|lemma="לִשְׁכָּה" strong="d:H3957" x-morph="He,Td:Ncfpa"\w* -\f + \ft K \w לשכות|lemma="לִשְׁכָּה" strong="H3957" x-morph="He,Ncfpa"\w*\f* +\f + \ft K \+w לשכות|lemma="לִשְׁכָּה" strong="H3957" x-morph="He,Ncfpa"\+w*\f* \w הָ⁠אֵ֑לֶּה|lemma="אֵלֶּה" strong="d:H0428" x-morph="He,Td:Pdxcp"\w* \w ה⁠מבוא|lemma="מָבוֹא" strong="d:H3996" x-morph="He,Td:Ncmsa"\w* -\f + \ft Q \w הַמֵּבִיא֙|lemma="בּוֹא" strong="d:H0935" x-morph="He,Td:Vhrmsa"\w*\f* +\f + \ft Q \+w הַמֵּבִיא֙|lemma="בּוֹא" strong="d:H0935" x-morph="He,Td:Vhrmsa"\+w*\f* \w מֵֽ⁠הַ⁠קָּדִ֔ים|lemma="קָדִים" strong="m:d:H6921" x-morph="He,R:Td:Ncmsa"\w* \w בְּ⁠בֹא֣⁠וֹ|lemma="בּוֹא" strong="b:H0935" x-morph="He,R:Vqc:Sp3ms"\w* \w לָ⁠הֵ֔נָּה|lemma="הֵנָּה" strong="l:H2007" x-morph="He,R:Pp3fp"\w* @@ -16504,7 +16504,7 @@ \w כִּֽי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w קֹ֣דֶשׁ|lemma="קֹדֶשׁ" strong="H6944" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/kt/holy"\w* \w הֵ֑נָּה|lemma="הֵנָּה" strong="H2007" x-morph="He,Pp3fp"\w* \w ילבשו|lemma="לָבַשׁ" strong="H3847" x-morph="He,Vqi3cp"\w* -\f + \ft Q \w וְלָבְשׁוּ֙|lemma="לָבַשׁ" strong="H3847" x-morph="He,Vqq3mp"\w*\f* +\f + \ft Q \+w וְלָבְשׁוּ֙|lemma="לָבַשׁ" strong="H3847" x-morph="He,Vqq3mp"\+w*\f* \w בְּגָדִ֣ים|lemma="בֶּגֶד" strong="H0899b" x-morph="He,Ncmpa"\w* \w אֲחֵרִ֔ים|lemma="אַחֵר" strong="H0312" x-morph="He,Aampa"\w* \w וְ⁠קָרְב֖וּ|lemma="קָרַב" strong="c:H7126" x-morph="He,C:Vqq3cp"\w* @@ -16534,7 +16534,7 @@ \w בִּ⁠קְנֵ֣ה|lemma="קָנֶה" strong="b:H7070" x-morph="He,R:Ncmsc"\w* \w הַ⁠מִּדָּ֑ה|lemma="מִדָּה" strong="d:H4060a" x-morph="He,Td:Ncfsa"\w* \w חֲמֵשׁ|lemma="חָמֵשׁ" strong="H2568" x-morph="He,Acfsa"\w*־\w מֵא֥וֹת|lemma="מֵאָה" strong="H3967" x-morph="He,Acbpc"\w* -\f + \ft K \w אמות|lemma="אַמָּה" strong="H0520a" x-morph="He,Ncfpc"\w*\f* +\f + \ft K \+w אמות|lemma="אַמָּה" strong="H0520a" x-morph="He,Ncfpc"\+w*\f* \w קָנִ֛ים|lemma="קָנֶה" strong="H7070" x-morph="He,Ncmpa"\w* \w בִּ⁠קְנֵ֥ה|lemma="קָנֶה" strong="b:H7070" x-morph="He,R:Ncmsc"\w* \w הַ⁠מִּדָּ֖ה|lemma="מִדָּה" strong="d:H4060a" x-morph="He,Td:Ncfsa"\w* @@ -16750,9 +16750,9 @@ \w וְ⁠אֵ֣ת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w* \w כָּל|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc"\w*־\w חֻקֹּתָי⁠ו֩|lemma="חֻקָּה" strong="H2708" x-morph="He,Ncbpc:Sp3ms"\w* \w וְ⁠כָל|lemma="כֹּל" strong="c:H3605" x-morph="He,C:Ncmsc"\w*־\w צ֨וּרֹתָ֤יו|lemma="צוּרָה" strong="H6699" x-morph="He,Ncfpc:Sp1cs"\w* -\f + \ft K \w צורת⁠י|lemma="צוּרָה" strong="H6699" x-morph="He,Ncfsc:Sp1cs"\w*\f* +\f + \ft K \+w צורת⁠י|lemma="צוּרָה" strong="H6699" x-morph="He,Ncfsc:Sp1cs"\+w*\f* \w וְ⁠כָל|lemma="כֹּל" strong="c:H3605" x-morph="He,C:Ncmsc"\w*־\w תּוֹרֹתָיו֙|lemma="תּוֹרָה" strong="H8451" x-morph="He,Ncfpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/lawofmoses"\w* -\f + \ft K \w תורת⁠ו|lemma="תּוֹרָה" strong="H8451" x-morph="He,Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w תורת⁠ו|lemma="תּוֹרָה" strong="H8451" x-morph="He,Ncfsc:Sp3ms"\+w*\f* \w הוֹדַ֣ע|lemma="יָדַע" strong="H3045" x-morph="He,Vhv2ms" x-tw="rc://*/tw/dict/bible/other/know"\w* \w אוֹתָ֔⁠ם|lemma="אֵת" strong="H0853" x-morph="He,To:Sp3mp"\w* \w וּ⁠כְתֹ֖ב|lemma="כָּתַב" strong="c:H3789" x-morph="He,C:Vqv2ms"\w* @@ -16822,14 +16822,14 @@ \w אַרְבַּ֣ע|lemma="אַרְבַּע" strong="H0702" x-morph="He,Acfsa"\w* \w אַמּ֑וֹת|lemma="אַמָּה" strong="H0520a" x-morph="He,Ncfpa"\w* \w וּמֵהָאֲרִיאֵ֣ל|lemma="אֲרִיאֵל" strong="c:m:d:H0741" x-morph="He,C:R:Td:Ncmsa"\w* -\f + \ft K \w וּ⁠מֵ⁠הָ⁠אֲרִאֵ֣יל|lemma="אֲרִיאֵל" strong="c:m:d:H0741" x-morph="He,C:R:Td:Ncmsa"\w*\f* +\f + \ft K \+w וּ⁠מֵ⁠הָ⁠אֲרִאֵ֣יל|lemma="אֲרִיאֵל" strong="c:m:d:H0741" x-morph="He,C:R:Td:Ncmsa"\+w*\f* \w וּ⁠לְ⁠מַ֔עְלָ⁠ה|lemma="מַעַל" strong="c:l:H4605" x-morph="He,C:R:D:Sd"\w* \w הַ⁠קְּרָנ֖וֹת|lemma="קֶרֶן" strong="d:H7161a" x-morph="He,Td:Ncbpa"\w* \w אַרְבַּֽע|lemma="אַרְבַּע" strong="H0702" x-morph="He,Acfsa"\w*׃ \v 16 \w וְהָאֲרִיאֵ֗ל|lemma="אֲרִיאֵל" strong="c:d:H0741" x-morph="He,C:Td:Ncmsa"\w* -\f + \ft K \w ו⁠ה⁠אראיל|lemma="אֲרִיאֵל" strong="c:d:H0741" x-morph="He,C:Td:Ncmsa"\w*\f* +\f + \ft K \+w ו⁠ה⁠אראיל|lemma="אֲרִיאֵל" strong="c:d:H0741" x-morph="He,C:Td:Ncmsa"\+w*\f* \w שְׁתֵּ֤ים|lemma="שְׁנַיִם" strong="H8147" x-morph="He,Acfda"\w* \w עֶשְׂרֵה֙|lemma="עָשָׂר" strong="H6240" x-morph="He,Acfsa"\w* \w אֹ֔רֶךְ|lemma="אֹרֶךְ" strong="H0753" x-morph="He,Ncmsa"\w* @@ -16987,7 +16987,7 @@ \w אֹת֑⁠וֹ|lemma="אֵת" strong="H0853" x-morph="He,To:Sp3ms"\w* \w וּ⁠מִלְא֖וּ|lemma="מָלֵא" strong="c:H4390" x-morph="He,C:Vpq3cp"\w* \w יָדָֽיו|lemma="יָד" strong="H3027" x-morph="He,Ncbpc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/hand"\w*׃ -\f + \ft K \w יד⁠ו|lemma="יָד" strong="H3027" x-morph="He,Ncbsc:Sp3ms"\w*\f* +\f + \ft K \+w יד⁠ו|lemma="יָד" strong="H3027" x-morph="He,Ncbsc:Sp3ms"\+w*\f* \v 27 \w וִֽ⁠יכַלּ֖וּ|lemma="כָּלָה" strong="c:H3615" x-morph="He,C:Vpi3mp"\w* @@ -17049,7 +17049,7 @@ \w ה֛וּא|lemma="הוּא" strong="H1931" x-morph="He,Pp3ms"\w* \w יֵֽשֶׁב|lemma="יָשַׁב" strong="H3427" x-morph="He,Vqi3ms"\w*־\w בּ֥⁠וֹ|lemma="" strong="b" x-morph="He,R:Sp3ms"\w* \w לאכול|lemma="אָכַל" strong="l:H0398" x-morph="He,R:Vqc"\w*־\w לֶ֖חֶם|lemma="לֶחֶם" strong="H3899" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/other/bread"\w* -\f + \ft Q \w לֶאֱכָל|lemma="אָכַל" strong="l:H0398" x-morph="He,R:Vqc"\w*\f* +\f + \ft Q \+w לֶאֱכָל|lemma="אָכַל" strong="l:H0398" x-morph="He,R:Vqc"\+w*\f* \w לִ⁠פְנֵ֣י|lemma="פָּנִים" strong="l:H6440" x-morph="He,R:Ncbpc"\w* \w יְהוָ֑ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w מִ⁠דֶּ֨רֶךְ|lemma="דֶּרֶךְ" strong="m:H1870" x-morph="He,R:Ncbsc"\w* @@ -17093,7 +17093,7 @@ \w לְ⁠כָל|lemma="כֹּל" strong="l:H3605" x-morph="He,R:Ncmsc"\w*־\w חֻקּ֥וֹת|lemma="חֻקָּה" strong="H2708" x-morph="He,Ncbpc"\w* \w בֵּית|lemma="בַּיִת" strong="H1004b" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/house"\w*־\w יְהוָ֖ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w וּ⁠לְ⁠כָל|lemma="כֹּל" strong="c:l:H3605" x-morph="He,C:R:Ncmsc"\w*־\w תּֽוֹרֹתָ֑יו|lemma="תּוֹרָה" strong="H8451" x-morph="He,Ncfpc:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/lawofmoses"\w* -\f + \ft K \w תורת⁠ו|lemma="תּוֹרָה" strong="H8451" x-morph="He,Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w תורת⁠ו|lemma="תּוֹרָה" strong="H8451" x-morph="He,Ncfsc:Sp3ms"\+w*\f* \w וְ⁠שַׂמְתָּ֤|lemma="שׂוּם" strong="c:H7760a" x-morph="He,C:Vqq2ms" x-tw="rc://*/tw/dict/bible/kt/appoint"\w* \w לִבְּ⁠ךָ֙|lemma="לֵב" strong="H3820a" x-morph="He,Ncmsc:Sp2ms" x-tw="rc://*/tw/dict/bible/kt/heart"\w* \w לִ⁠מְב֣וֹא|lemma="מָבוֹא" strong="l:H3996" x-morph="He,R:Ncmsc"\w* @@ -17391,10 +17391,10 @@ \w הֵ֚מָּה|lemma="הֵם" strong="H1992" x-morph="He,Pp3mp"\w* \w יַעַמְד֣וּ|lemma="עָמַד" strong="H5975" x-morph="He,Vqi3mp" x-tw="rc://*/tw/dict/bible/kt/appoint"\w* \w ל⁠שפט|lemma="שָׁפַט" strong="l:H8199" x-morph="He,R:Vqc" x-tw="rc://*/tw/dict/bible/kt/judge"\w* -\f + \ft Q \w לְמִשְׁפָּ֔ט|lemma="מִשְׁפָּט" strong="l:H4941" x-morph="He,R:Ncmsa"\w*\f* +\f + \ft Q \+w לְמִשְׁפָּ֔ט|lemma="מִשְׁפָּט" strong="l:H4941" x-morph="He,R:Ncmsa"\+w*\f* \w בְּ⁠מִשְׁפָּטַ֖⁠י|lemma="מִשְׁפָּט" strong="b:H4941" x-morph="He,R:Ncmpc:Sp1cs"\w* \w יִשְׁפְּט֑וּהוּ|lemma="שָׁפַט" strong="c:H8199" x-morph="He,C:Vqi3cp:Sp3ms" x-tw="rc://*/tw/dict/bible/kt/judge"\w* -\f + \ft K \w ו⁠שפט⁠הו|lemma="שָׁפַט" strong="c:H8199" x-morph="He,C:Vqq3cp:Sp3ms"\w*\f* +\f + \ft K \+w ו⁠שפט⁠הו|lemma="שָׁפַט" strong="c:H8199" x-morph="He,C:Vqq3cp:Sp3ms"\+w*\f* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w תּוֹרֹתַ֤⁠י|lemma="תּוֹרָה" strong="H8451" x-morph="He,Ncfpc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/lawofmoses"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w חֻקֹּתַ⁠י֙|lemma="חֻקָּה" strong="H2708" x-morph="He,Ncbpc:Sp1cs"\w* \w בְּ⁠כָל|lemma="כֹּל" strong="b:H3605" x-morph="He,R:Ncmsc"\w*־\w מוֹעֲדַ֣⁠י|lemma="מוֹעֵד" strong="H4150" x-morph="He,Ncmpc:Sp1cs" x-tw="rc://*/tw/dict/bible/other/feast"\w* @@ -17537,7 +17537,7 @@ \w תָּמ֔וֹד|lemma="מָדַד" strong="H4058" x-morph="He,Vqi2ms"\w* \w אֹ֗רֶךְ|lemma="אֹרֶךְ" strong="H0753" x-morph="He,Ncmsc"\w* \w חֲמִשָּׁ֤ה|lemma="חָמֵשׁ" strong="H2568" x-morph="He,Acbsa"\w* -\f + \ft K \w חמש|lemma="חָמֵשׁ" strong="H2568" x-morph="He,Acbsa"\w*\f* +\f + \ft K \+w חמש|lemma="חָמֵשׁ" strong="H2568" x-morph="He,Acbsa"\+w*\f* \w וְ⁠עֶשְׂרִים֙|lemma="עֶשְׂרִים" strong="c:H6242" x-morph="He,C:Acbpa"\w* \w אֶ֔לֶף|lemma="אֶלֶף" strong="H0505" x-morph="He,Acbsa"\w* \w וְ⁠רֹ֖חַב|lemma="רֹחַב" strong="c:H7341" x-morph="He,C:Ncmsc"\w* @@ -17575,7 +17575,7 @@ \w אֲלָפִ֖ים|lemma="אֶלֶף" strong="H0505" x-morph="He,Acbpa"\w* \w רֹ֑חַב|lemma="רֹחַב" strong="H7341" x-morph="He,Ncmsa"\w* \w יהיה|lemma="הָיָה" strong="H1961" x-morph="He,Vqi3ms"\w* -\f + \ft Q \w וְֽהָיָ֡ה|lemma="הָיָה" strong="H1961" x-morph="He,Vqq3ms"\w*\f* +\f + \ft Q \+w וְֽהָיָ֡ה|lemma="הָיָה" strong="H1961" x-morph="He,Vqq3ms"\+w*\f* \w לַ⁠לְוִיִּם֩|lemma="לֵוִיִּי" strong="l:H3881" x-morph="He,Rd:Ngmpa" x-tw="rc://*/tw/dict/bible/names/levite"\w* \w מְשָׁרְתֵ֨י|lemma="שָׁרַת" strong="H8334" x-morph="He,Vprmpc" x-tw="rc://*/tw/dict/bible/other/servant"\w* \w הַ⁠בַּ֧יִת|lemma="בַּיִת" strong="d:H1004b" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/house"\w* @@ -18039,7 +18039,7 @@ \w כִּ֥י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* \w נִכְח֖⁠וֹ|lemma="נֵכַח" strong="H5226" x-morph="He,R:Sp3ms"\w* \w יֵצֵֽא|lemma="יָצָא" strong="H3318" x-morph="He,Vqi3ms" x-tw="rc://*/tw/dict/bible/other/know"\w*׃ -\f + \ft K \w יצאו|lemma="יָצָא" strong="H3318" x-morph="He,Vqi3mp"\w*\f* +\f + \ft K \+w יצאו|lemma="יָצָא" strong="H3318" x-morph="He,Vqi3mp"\+w*\f* \v 10 \w וְֽ⁠הַ⁠נָּשִׂ֑יא|lemma="נָשִׂיא" strong="c:d:H5387a" x-morph="He,C:Td:Ncmsa"\w* @@ -18126,7 +18126,7 @@ \v 15 \w ו⁠עשו|lemma="עָשָׂה" strong="c:H6213a" x-morph="He,C:Vqq3cp"\w* -\f + \ft Q \w יַעֲשׂ֨וּ|lemma="עָשָׂה" strong="c:H6213a" x-morph="He,C:Vqi3cp"\w*\f* +\f + \ft Q \+w יַעֲשׂ֨וּ|lemma="עָשָׂה" strong="c:H6213a" x-morph="He,C:Vqi3cp"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w הַ⁠כֶּ֧בֶשׂ|lemma="כֶּבֶשׂ" strong="d:H3532" x-morph="He,Td:Ncmsa"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w הַ⁠מִּנְחָ֛ה|lemma="מִנְחָה" strong="d:H4503" x-morph="He,Td:Ncfsa" x-tw="rc://*/tw/dict/bible/other/grainoffering"\w* \w וְ⁠אֶת|lemma="אֵת" strong="c:H0853" x-morph="He,C:To"\w*־\w הַ⁠שֶּׁ֖מֶן|lemma="שֶׁמֶן" strong="d:H8081" x-morph="He,Td:Ncmsa"\w* @@ -18201,7 +18201,7 @@ \w וְ⁠הִנֵּה|lemma="הִנֵּה" strong="c:H2009" x-morph="He,C:Tm"\w*־\w שָׁ֣ם|lemma="שָׁם" strong="H8033" x-morph="He,D"\w* \w מָק֔וֹם|lemma="מָקוֹם" strong="H4725" x-morph="He,Ncmsa"\w* \w בירכתם|lemma="יְרֵכָה" strong="b:H3411" x-morph="He,R:Ncfsc:Sp3mp"\w* -\f + \ft Q \w בַּיַּרְכָתַ֖יִם|lemma="יְרֵכָה" strong="b:H3411" x-morph="He,R:Ncfdc"\w*\f* +\f + \ft Q \+w בַּיַּרְכָתַ֖יִם|lemma="יְרֵכָה" strong="b:H3411" x-morph="He,R:Ncfdc"\+w*\f* \w יָֽמָּ⁠ה|lemma="יָם" strong="H3220" x-morph="He,Ncmsa:Sd"\w*׃ס \v 20 @@ -18399,7 +18399,7 @@ \w אֶל|lemma="אֵל" strong="H0413" x-morph="He,R"\w*־\w הַ⁠יָּ֥מָּ⁠ה|lemma="יָם" strong="d:H3220" x-morph="He,Td:Ncmsa:Sd"\w* \w הַ⁠מּֽוּצָאִ֖ים|lemma="יָצָא" strong="d:H3318" x-morph="He,Td:VHsmpa"\w* \w ו⁠נרפאו|lemma="רָפָא" strong="c:H7495" x-morph="He,C:VNq3cp"\w* -\f + \ft Q \w וְנִרְפּ֥וּ|lemma="רָפָא" strong="c:H7495" x-morph="He,C:VNq3cp"\w*\f* +\f + \ft Q \+w וְנִרְפּ֥וּ|lemma="רָפָא" strong="c:H7495" x-morph="He,C:VNq3cp"\+w*\f* \w הַ⁠מָּֽיִם|lemma="מַיִם" strong="d:H4325" x-morph="He,Td:Ncmpa"\w*׃ \v 9 @@ -18432,7 +18432,7 @@ \v 10 \w וְ⁠הָיָה֩|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3ms"\w* \w יעמדו|lemma="עָמַד" strong="H5975" x-morph="He,Vqi3mp" x-tw="rc://*/tw/dict/bible/kt/appoint"\w* -\f + \ft Q \w עָמְד֨וּ|lemma="עָמַד" strong="H5975" x-morph="He,Vqp3cp"\w*\f* +\f + \ft Q \+w עָמְד֨וּ|lemma="עָמַד" strong="H5975" x-morph="He,Vqp3cp"\+w*\f* \w עָלָ֜י⁠ו|lemma="עַל" strong="H5921a" x-morph="He,R:Sp3ms"\w* \w דַּוָּגִ֗ים|lemma="דַּוָּג" strong="H1728" x-morph="He,Ncmpa"\w* \w מֵ⁠עֵ֥ין|lemma="עֵין גֶּדִי" strong="m:H5872" x-morph="He,R:Np"\w* @@ -18453,7 +18453,7 @@ \v 11 \w בִּצֹּאתָ֧יו|lemma="בִּצָּה" strong="H1207" x-morph="He,Ncfpc:Sp3ms"\w* -\f + \ft K \w בצאת⁠ו|lemma="בִּצָּה" strong="H1207" x-morph="He,Ncfsc:Sp3ms"\w*\f* +\f + \ft K \+w בצאת⁠ו|lemma="בִּצָּה" strong="H1207" x-morph="He,Ncfsc:Sp3ms"\+w*\f* \w וּ⁠גְבָאָ֛י⁠ו|lemma="גֶּבֶא" strong="c:H1360" x-morph="He,C:Ncmpc:Sp3ms"\w* \w וְ⁠לֹ֥א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w* \w יֵרָפְא֖וּ|lemma="רָפָא" strong="H7495" x-morph="He,VNi3mp"\w* @@ -18479,7 +18479,7 @@ \w הֵ֣מָּה|lemma="הֵם" strong="H1992" x-morph="He,Pp3mp"\w* \w יֽוֹצְאִ֑ים|lemma="יָצָא" strong="H3318" x-morph="He,Vqrmpa" x-tw="rc://*/tw/dict/bible/other/know"\w* \w וְהָיָ֤ה|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3ms"\w* -\f + \ft K \w ו⁠היו|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3cp"\w*\f* +\f + \ft K \+w ו⁠היו|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3cp"\+w*\f* \w פִרְי⁠וֹ֙|lemma="פְּרִי" strong="H6529" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/fruit"\w* \w לְ⁠מַֽאֲכָ֔ל|lemma="מַאֲכָל" strong="l:H3978" x-morph="He,R:Ncmsa"\w* \w וְ⁠עָלֵ֖⁠הוּ|lemma="עָלֶה" strong="c:H5929" x-morph="He,C:Ncmsc:Sp3ms"\w* @@ -18857,8 +18857,8 @@ \w יָמֵ֛ר|lemma="מוּר" strong="H4171" x-morph="He,Vhj3ms"\w* \w וְ⁠לֹ֥א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w* \w יַעֲבִ֖יר|lemma="עָבַר" strong="H5674a" x-morph="He,Vhi3ms"\w* -\f + \ft K \w יעבור|lemma="עָבַר" strong="H5674a" x-morph="He,Vqi3ms"\w*\f* -\f + \ft Or perhaps \w וְ⁠לֹ֥א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w* \w יָמִרוּ|lemma="מוּר" strong="H4171" x-morph="He,Vhi3mp"\w* \w וְ⁠לֹ֥א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w* \w יעבִירוּ|lemma="עָבַר" strong="H5674a" x-morph="He,Vhi3mp"\w*\f* +\f + \ft K \+w יעבור|lemma="עָבַר" strong="H5674a" x-morph="He,Vqi3ms"\+w*\f* +\f + \ft Or perhaps \+w וְ⁠לֹ֥א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w* \w יָמִרוּ|lemma="מוּר" strong="H4171" x-morph="He,Vhi3mp"\w* \w וְ⁠לֹ֥א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w* \w יעבִירוּ|lemma="עָבַר" strong="H5674a" x-morph="He,Vhi3mp"\+w*\f* \w רֵאשִׁ֣ית|lemma="רֵאשִׁית" strong="H7225" x-morph="He,Ncfsc" x-tw="rc://*/tw/dict/bible/other/firstfruit"\w* \w הָ⁠אָ֑רֶץ|lemma="אֶרֶץ" strong="d:H0776" x-morph="He,Td:Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w* \w כִּי|lemma="כִּי" strong="H3588a" x-morph="He,C"\w*־\w קֹ֖דֶשׁ|lemma="קֹדֶשׁ" strong="H6944" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/kt/holy"\w* @@ -18880,7 +18880,7 @@ \w וְ⁠הָיְתָ֥ה|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3fs"\w* \w הָ⁠עִ֖יר|lemma="עִיר" strong="d:H5892b" x-morph="He,Td:Ncfsa"\w* \w בְּתוֹכֽוֹ|lemma="תָּוֶךְ" strong="b:H8432" x-morph="He,R:Ncmsc:Sp3ms"\w*׃ -\f + \ft K \w ב⁠תוכ⁠ה|lemma="תָּוֶךְ" strong="b:H8432" x-morph="He,R:Ncmsc:Sp3fs"\w*\f* +\f + \ft K \+w ב⁠תוכ⁠ה|lemma="תָּוֶךְ" strong="b:H8432" x-morph="He,R:Ncmsc:Sp3fs"\+w*\f* \v 16 \w וְ⁠אֵלֶּה֮|lemma="אֵלֶּה" strong="c:H0428" x-morph="He,C:Pdxcp"\w* @@ -18944,7 +18944,7 @@ \w הַ⁠קֹּ֑דֶשׁ|lemma="קֹדֶשׁ" strong="d:H6944" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/kt/holy"\w* \w וְ⁠הָיְתָ֤ה|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3fs"\w* \w תְבֽוּאָתוֹ֙|lemma="תְּבוּאָה" strong="H8393" x-morph="He,Ncfsc:Sp3ms"\w* -\f + \ft K \w תבואת⁠ה|lemma="תְּבוּאָה" strong="H8393" x-morph="He,Ncfsc:Sp3fs"\w*\f* +\f + \ft K \+w תבואת⁠ה|lemma="תְּבוּאָה" strong="H8393" x-morph="He,Ncfsc:Sp3fs"\+w*\f* \w לְ⁠לֶ֔חֶם|lemma="לֶחֶם" strong="l:H3899" x-morph="He,R:Ncbsa"\w* \w לְ⁠עֹבְדֵ֖י|lemma="עָבַד" strong="l:H5647" x-morph="He,R:Vqrmpc"\w* \w הָ⁠עִֽיר|lemma="עִיר" strong="d:H5892b" x-morph="He,Td:Ncfsa"\w*׃ @@ -19003,7 +19003,7 @@ \w וּ⁠מִקְדַּ֥שׁ|lemma="מִקְדָּשׁ" strong="c:H4720" x-morph="He,C:Ncmsc"\w* \w הַ⁠בַּ֖יִת|lemma="בַּיִת" strong="d:H1004b" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/house"\w* \w בְּתוֹכֽוֹ|lemma="תָּוֶךְ" strong="b:H8432" x-morph="He,R:Ncmsc:Sp3ms"\w*׃ -\f + \ft K \w ב⁠תוכ⁠ה|lemma="תָּוֶךְ" strong="b:H8432" x-morph="He,R:Ncmsc:Sp3fs"\w*\f* +\f + \ft K \+w ב⁠תוכ⁠ה|lemma="תָּוֶךְ" strong="b:H8432" x-morph="He,R:Ncmsc:Sp3fs"\+w*\f* \v 22 \w וּ⁠מֵ⁠אֲחֻזַּ֤ת|lemma="אֲחֻזָּה" strong="c:m:H0272" x-morph="He,C:R:Ncfsc"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/28-HOS.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/28-HOS.usfm index fba3876d..f409bede 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/28-HOS.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/28-HOS.usfm @@ -1128,7 +1128,7 @@ \w יִשְׂרָאֵ֔ל|lemma="יִשְׂרָאֵל" strong="H3478" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/israel"\w* \w רָאִ֖יתִי|lemma="רָאָה" strong="H7200" x-morph="He,Vqp1cs"\w* \w שַׁעֲרֽוּרִיָּ֑ה|lemma="שַׁעֲרוּרָה" strong="H8186b" x-morph="He,Aafsa"\w* -\f + \ft K \w שעריריה|lemma="שַׁעֲרוּרָה" strong="H8186b" x-morph="He,Aafsa"\w*\f* +\f + \ft K \+w שעריריה|lemma="שַׁעֲרוּרָה" strong="H8186b" x-morph="He,Aafsa"\+w*\f* \w שָׁ֚ם|lemma="שָׁם" strong="H8033" x-morph="He,D"\w* \w זְנ֣וּת|lemma="זְנוּת" strong="H2184" x-morph="He,Ncfsa"\w* \w לְ⁠אֶפְרַ֔יִם|lemma="אֶפְרַיִם" strong="l:H0669" x-morph="He,R:Np"\w* @@ -1478,9 +1478,9 @@ \v 12 \w אֶ֨כְתָּב|lemma="כָּתַב" strong="H3789" x-morph="He,Vqi1cs"\w*־\w ל֔⁠וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms"\w* -\f + \ft K \w אכתוב|lemma="כָּתַב" strong="H3789" x-morph="He,Vqi1cs"\w*\f* +\f + \ft K \+w אכתוב|lemma="כָּתַב" strong="H3789" x-morph="He,Vqi1cs"\+w*\f* \w רבו|lemma="רִבּוֹ" strong="H7239" x-morph="He,Ncbsc"\w* -\f + \ft Q \w רֻבֵּ֖י|lemma="רִבּוֹ" strong="H7239" x-morph="He,Ncbsc"\w*\f* +\f + \ft Q \+w רֻבֵּ֖י|lemma="רִבּוֹ" strong="H7239" x-morph="He,Ncbsc"\+w*\f* \w תּֽוֹרָתִ֑⁠י|lemma="תּוֹרָה" strong="H8451" x-morph="He,Ncfsc:Sp1cs" x-tw="rc://*/tw/dict/bible/kt/lawofmoses"\w* \w כְּמוֹ|lemma="כְּמוֹ" strong="H3644" x-morph="He,R"\w*־\w זָ֖ר|lemma="זוּר" strong="H2114a" x-morph="He,Aamsa"\w* \w נֶחְשָֽׁבוּ|lemma="חָשַׁב" strong="H2803" x-morph="He,VNp3cp"\w*׃ @@ -1722,7 +1722,7 @@ \w יָבֵ֖שׁ|lemma="יָבֵשׁ" strong="H3001" x-morph="He,Vqp3ms"\w* \w פְּרִ֣י|lemma="פְּרִי" strong="H6529" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/fruit"\w* \w בַֽל|lemma="בְּלִי" strong="H1077" x-morph="He,Tn"\w*־\w יַעֲשׂ֑וּ⁠ן|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqi3mp:Sn"\w* -\f + \ft K \w בלי|lemma="בְּלִי" strong="H1097" x-morph="He,Tn"\w*\f* +\f + \ft K \+w בלי|lemma="בְּלִי" strong="H1097" x-morph="He,Tn"\+w*\f* \w גַּ֚ם|lemma="גַּם" strong="H1571" x-morph="He,Ta"\w* \w כִּ֣י|lemma="כִּי" strong="H3588a" x-morph="He,C"\w* \w יֵֽלֵד֔וּ⁠ן|lemma="יָלַד" strong="H3205" x-morph="He,Vqi3mp:Sn"\w* @@ -1875,7 +1875,7 @@ \w בְּ⁠אָסְרָ֖⁠ם|lemma="אָסַר" strong="b:H0631" x-morph="He,R:Vqc:Sp3mp"\w* \w לִ⁠שְׁתֵּ֥י|lemma="שְׁנַיִם" strong="l:H8147" x-morph="He,R:Acfdc"\w* \w עוֹנֹתָֽם|lemma="עַיִן" strong="H5771" x-morph="He,Ncbpc:Sp3mp"\w*׃ -\f + \ft K \w עינת⁠ם|lemma="עַיִן" strong="H5869b" x-morph="He,Ncbpc:Sp3mp"\w*\f* +\f + \ft K \+w עינת⁠ם|lemma="עַיִן" strong="H5869b" x-morph="He,Ncbpc:Sp3mp"\+w*\f* \v 11 \w וְ⁠אֶפְרַ֜יִם|lemma="אֶפְרַיִם" strong="c:H0669" x-morph="He,C:Np"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/29-JOL.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/29-JOL.usfm index 474fabff..55e8f7b8 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/29-JOL.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/29-JOL.usfm @@ -755,7 +755,7 @@ \w הַ⁠הִ֑יא|lemma="הוּא" strong="d:H1931" x-morph="He,Td:Pp3fs"\w* \w אֲשֶׁ֥ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr"\w* \w אָשִׁ֛יב|lemma="שׁוּב" strong="H7725" x-morph="He,Vhi1cs" x-tw="rc://*/tw/dict/bible/other/return"\w* -\f + \ft K \w אשוב|lemma="שׁוּב" strong="H7725" x-morph="He,Vqi1cs"\w*\f* +\f + \ft K \+w אשוב|lemma="שׁוּב" strong="H7725" x-morph="He,Vqi1cs"\+w*\f* \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To"\w*־\w שְׁב֥וּת|lemma="שְׁבוּת" strong="H7622" x-morph="He,Ncfsc" x-tw="rc://*/tw/dict/bible/other/captive"\w* \w יְהוּדָ֖ה|lemma="יְהוּדָה" strong="H3063" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/judah"\w* \w וִ⁠ירוּשָׁלִָֽם|lemma="יְרוּשָׁלִַ͏ם" strong="c:H3389" x-morph="He,C:Np" x-tw="rc://*/tw/dict/bible/names/jerusalem"\w*׃ diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/30-AMO.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/30-AMO.usfm index b5c2588b..70d21805 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/30-AMO.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/30-AMO.usfm @@ -1703,7 +1703,7 @@ \w אֶבְי֑וֹן|lemma="אֶבְיוֹן" strong="H0034" x-morph="He,Aamsa"\w* \w וְ⁠לַ⁠שְׁבִּ֖ית|lemma="שָׁבַת" strong="c:l:H7673a" x-morph="He,C:R:Vhc"\w* \w ענוי|lemma="עָנָו" strong="H6035" x-morph="He,Aampc"\w*־\w אָֽרֶץ|lemma="אֶרֶץ" strong="H0776" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w*׃ -\f + \ft Q \w עֲנִיֵּי|lemma="עָנִי" strong="H6041" x-morph="He,Aampc"\w*\f* +\f + \ft Q \+w עֲנִיֵּי|lemma="עָנִי" strong="H6041" x-morph="He,Aampc"\+w*\f* \v 5 \w לֵ⁠אמֹ֗ר|lemma="אָמַר" strong="l:H0559" x-morph="He,R:Vqc"\w* @@ -1756,7 +1756,7 @@ \w כֻּלָּ֔⁠הּ|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc:Sp3fs"\w* \w וְ⁠נִגְרְשָׁ֥ה|lemma="גָּרַשׁ" strong="c:H1644" x-morph="He,C:VNq3fs"\w* \w וְנִשְׁקְעָ֖ה|lemma="שָׁקָע" strong="c:H8257" x-morph="He,C:VNq3fs"\w* -\f + \ft K \w ו⁠נשקה|lemma="שָׁקָה" strong="c:H8248" x-morph="He,C:VNq3ms"\w*\f* +\f + \ft K \+w ו⁠נשקה|lemma="שָׁקָה" strong="c:H8248" x-morph="He,C:VNq3ms"\+w*\f* \w כִּ⁠יא֥וֹר|lemma="יְאֹר" strong="k:H2975" x-morph="He,R:Np"\w* \w מִצְרָֽיִם|lemma="מִצְרַיִם" strong="H4714" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/egypt"\w*׃ס @@ -1940,7 +1940,7 @@ \w הַ⁠בּוֹנֶ֤ה|lemma="בָּנָה" strong="d:H1129" x-morph="He,Td:Vqrmsa"\w* \w בַ⁠שָּׁמַ֨יִם֙|lemma="שָׁמַיִם" strong="b:H8064" x-morph="He,Rd:Ncmda" x-tw="rc://*/tw/dict/bible/kt/heaven"\w* \w מַעֲלוֹתָ֔יו|lemma="מַעֲלָה" strong="H4609b" x-morph="He,Ncfpc:Sp3mp"\w* -\f + \ft K \w מעלות⁠ו|lemma="מַעֲלָה" strong="H4609b" x-morph="He,Ncfpc:Sp3ms"\w*\f* +\f + \ft K \+w מעלות⁠ו|lemma="מַעֲלָה" strong="H4609b" x-morph="He,Ncfpc:Sp3ms"\+w*\f* \w וַ⁠אֲגֻדָּת֖⁠וֹ|lemma="אֲגֻדָּה" strong="c:H0092" x-morph="He,C:Ncfsc:Sp3ms"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w אֶ֣רֶץ|lemma="אֶרֶץ" strong="H0776" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w* \w יְסָדָ֑⁠הּ|lemma="יָסַד" strong="H3245" x-morph="He,Vqp3ms:Sp3fs" x-tw="rc://*/tw/dict/bible/other/foundation"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/31-OBA.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/31-OBA.usfm index 224c6f16..4c891d31 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/31-OBA.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/31-OBA.usfm @@ -148,7 +148,7 @@ \w וְ⁠נָכְרִ֞ים|lemma="נׇכְרִי" strong="c:H5237" x-morph="He,C:Aampa" x-tw="rc://*/tw/dict/bible/other/foreigner"\w* \w בָּ֣אוּ|lemma="בּוֹא" strong="H0935" x-morph="He,Vqp3cp"\w* \w שְׁעָרָ֗יו|lemma="שַׁעַר" strong="H8179" x-morph="He,Ncmpc:Sp3mp" x-tw="rc://*/tw/dict/bible/other/gate"\w* -\f + \ft K \ft* \w שער⁠ו|lemma="שַׁעַר" strong="H8179" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \ft* \w שער⁠ו|lemma="שַׁעַר" strong="H8179" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w וְ⁠עַל|lemma="עַל" strong="c:H5921a" x-morph="He,C:R"\w*־\w יְרוּשָׁלִַ֨ם֙|lemma="יְרוּשָׁלִַ͏ם" strong="H3389" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jerusalem"\w* \k-s | x-tw="rc://*/tw/dict/bible/other/lots"\*\w יַדּ֣וּ|lemma="יָדַד" strong="H3032" x-morph="He,Vqp3cp"\w* \w גוֹרָ֔ל|lemma="גּוֹרָל" strong="H1486" x-morph="He,Ncmsa"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/33-MIC.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/33-MIC.usfm index 219be3dc..49803ea1 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/33-MIC.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/33-MIC.usfm @@ -50,7 +50,7 @@ \w וְ⁠יָרַ֥ד|lemma="יָרַד" strong="c:H3381" x-morph="He,C:Vqp3ms"\w* \w וְ⁠דָרַ֖ךְ|lemma="דָּרַךְ" strong="c:H1869" x-morph="He,C:Vqp3ms"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w במותי|lemma="בָּמָה" strong="H1116" x-morph="He,Ncfpc"\w* -\f + \ft Q \w בָּ֥מֳתֵי|lemma="בָּמָה" strong="H1116" x-morph="He,Ncfpc"\w*\f* +\f + \ft Q \+w בָּ֥מֳתֵי|lemma="בָּמָה" strong="H1116" x-morph="He,Ncfpc"\+w*\f* \w אָֽרֶץ|lemma="אֶרֶץ" strong="H0776" x-morph="He,Ncbsa" x-tw="rc://*/tw/dict/bible/other/earth"\w*׃ \v 4 @@ -119,7 +119,7 @@ \w וְ⁠אֵילִ֔ילָה|lemma="יָלַל" strong="c:H3213" x-morph="He,C:Vhh1cs"\w* \w אֵילְכָ֥ה|lemma="יָלַךְ" strong="H3212" x-morph="He,Vqi1cs" x-tw="rc://*/tw/dict/bible/other/walk"\w* \w שׁוֹלָ֖ל|lemma="שׁוֹלָל" strong="H7758" x-morph="He,Aamsa"\w* -\f + \ft K \w שילל|lemma="שׁוֹלָל" strong="H7758" x-morph="He,Aamsa"\w*\f* +\f + \ft K \+w שילל|lemma="שׁוֹלָל" strong="H7758" x-morph="He,Aamsa"\+w*\f* \w וְ⁠עָר֑וֹם|lemma="עָרוֹם" strong="c:H6174" x-morph="He,C:Aamsa"\w* \w אֶעֱשֶׂ֤ה|lemma="עָשָׂה" strong="H6213a" x-morph="He,Vqh1cs"\w* \w מִסְפֵּד֙|lemma="מִסְפֵּד" strong="H4553" x-morph="He,Ncmsa"\w* @@ -148,7 +148,7 @@ \w לְעַפְרָ֔ה|lemma="בֵּית לְעַפְרָה" strong="H1036" x-morph="He,Np"\w* \w עָפָ֖ר|lemma="עָפָר" strong="H6083" x-morph="He,Ncmsa"\w* \w הִתְפַּלָּֽשִׁי|lemma="פָּלַשׁ" strong="H6428" x-morph="He,Vtv2ms"\w*׃ -\f + \ft K \w התפלשתי|lemma="פָּלַשׁ" strong="H6428" x-morph="He,Vtp1cs"\w*\f* +\f + \ft K \+w התפלשתי|lemma="פָּלַשׁ" strong="H6428" x-morph="He,Vtp1cs"\+w*\f* \v 11 \w עִבְרִ֥י|lemma="עָבַר" strong="H5674a" x-morph="He,Vqv2fs"\w* @@ -445,7 +445,7 @@ \w ט֖וֹב|lemma="טוֹב" strong="H2896b" x-morph="He,Aamsa" x-tw="rc://*/tw/dict/bible/kt/good"\w* \w וְ⁠אֹ֣הֲבֵי|lemma="אָהַב" strong="c:H0157" x-morph="He,C:Vqrmpc" x-tw="rc://*/tw/dict/bible/kt/love"\w* \w רָ֑ע|lemma="רַע" strong="H7451b" x-morph="He,Aamsa" x-tw="rc://*/tw/dict/bible/kt/evil"\w* -\f + \ft K \w רעה|lemma="רַע" strong="H7451b" x-morph="He,Aafsa"\w*\f* +\f + \ft K \+w רעה|lemma="רַע" strong="H7451b" x-morph="He,Aafsa"\+w*\f* \w גֹּזְלֵ֤י|lemma="גָּזַל" strong="H1497" x-morph="He,Vqrmpc"\w* \w עוֹרָ⁠ם֙|lemma="עוֹר" strong="H5785" x-morph="He,Ncmsc:Sp3mp"\w* \w מֵֽ⁠עֲלֵי⁠הֶ֔ם|lemma="עַל" strong="m:H5921a" x-morph="He,R:R:Sp3mp"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/34-NAM.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/34-NAM.usfm index d0def1df..218c1f7b 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/34-NAM.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/34-NAM.usfm @@ -39,7 +39,7 @@ \w אֶ֤רֶךְ|lemma="אָרֵךְ" strong="H0750" x-morph="He,Aamsc"\w* \w אַפַּ֨יִם֙|lemma="אַף" strong="H0639" x-morph="He,Ncmda"\w* \w ו⁠גדול|lemma="גָּדוֹל" strong="c:H1419a" x-morph="He,C:Aamsc"\w*־\w כֹּ֔חַ|lemma="כֹּחַ" strong="H3581b" x-morph="He,Ncmsa" x-tw="rc://*/tw/dict/bible/other/strength"\w* -\f + \ft Q \w וּגְדָל|lemma="גָּדַל" strong="c:H1419a" x-morph="He,C:Vqq3ms"\w*\f* +\f + \ft Q \+w וּגְדָל|lemma="גָּדַל" strong="c:H1419a" x-morph="He,C:Vqq3ms"\+w*\f* \w וְ⁠נַקֵּ֖ה|lemma="נָקָה" strong="c:H5352" x-morph="He,C:Vpa"\w* \w לֹ֣א|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w* \w יְנַקֶּ֑ה|lemma="נָקָה" strong="H5352" x-morph="He,Vpi3ms"\w* @@ -202,7 +202,7 @@ \w יוֹסִ֥יף|lemma="יָסַף" strong="H3254" x-morph="He,Vhi3ms"\w* \w ע֛וֹד|lemma="עוֹד" strong="H5750" x-morph="He,D"\w* \w לַֽעֲבָר|lemma="עָבַר" strong="l:H5674a" x-morph="He,R:Vqc"\w*־\w בָּ֥⁠ךְ|lemma="" strong="b" x-morph="He,R:Sp2fs"\w* -\f + \ft K \w ל⁠עבור|lemma="עָבַר" strong="l:H5674a" x-morph="He,R:Vqa"\w*\f* +\f + \ft K \+w ל⁠עבור|lemma="עָבַר" strong="l:H5674a" x-morph="He,R:Vqa"\+w*\f* \w בְּלִיַּ֖עַל|lemma="בְּלִיַּעַל" strong="H1100" x-morph="He,Ncmsa"\w* \w כֻּלֹּ֥⁠ה|lemma="כֹּל" strong="H3605" x-morph="He,Ncmsc:Sp3fs"\w* \w נִכְרָֽת|lemma="כָּרַת" strong="H3772" x-morph="He,VNp3ms" x-tw="rc://*/tw/dict/bible/other/cutoff"\w*׃ @@ -271,7 +271,7 @@ \w אַדִּירָ֔י⁠ו|lemma="אַדִּיר" strong="H0117" x-morph="He,Aampc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/noble"\w* \w יִכָּשְׁל֖וּ|lemma="כָּשַׁל" strong="H3782" x-morph="He,VNi3mp"\w* \w ב⁠הלכות⁠ם|lemma="הֲלִיכָה" strong="b:H1979" x-morph="He,R:Ncfpc:Sp3mp"\w* -\f + \ft Q \w בַּהֲלִֽיכָתָ֑ם|lemma="הֲלִיכָה" strong="b:H1979" x-morph="He,R:Vqrfpc:Sp3mp"\w*\f* +\f + \ft Q \+w בַּהֲלִֽיכָתָ֑ם|lemma="הֲלִיכָה" strong="b:H1979" x-morph="He,R:Vqrfpc:Sp3mp"\+w*\f* \w יְמַֽהֲרוּ֙|lemma="מָהַר" strong="H4116a" x-morph="He,Vpi3mp"\w* \w חֽוֹמָתָ֔⁠הּ|lemma="חוֹמָה" strong="H2346" x-morph="He,Ncfsc:Sp3fs"\w* \w וְ⁠הֻכַ֖ן|lemma="כּוּן" strong="c:H3559a" x-morph="He,C:VHp3ms"\w* @@ -433,7 +433,7 @@ \w קֵ֨צֶה֙|lemma="קָצֶה" strong="H7097b" x-morph="He,Ncbsa"\w* \w לַ⁠גְּוִיָּ֔ה|lemma="גְּוִיָּה" strong="l:H1472" x-morph="He,Rd:Ncfsa"\w* \w וְכָשְׁל֖וּ|lemma="כָּשַׁל" strong="H3782" x-morph="He,Vqq3cp"\w* -\f + \ft K \w יכשלו|lemma="כָּשַׁל" strong="H3782" x-morph="He,Vqi3mp"\w*\f* +\f + \ft K \+w יכשלו|lemma="כָּשַׁל" strong="H3782" x-morph="He,Vqi3mp"\+w*\f* \w בִּ⁠גְוִיָּתָֽ⁠ם|lemma="גְּוִיָּה" strong="b:H1472" x-morph="He,R:Ncfsc:Sp3mp"\w*׃ \v 4 diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/35-HAB.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/35-HAB.usfm index ac97103d..2a830251 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/35-HAB.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/35-HAB.usfm @@ -662,7 +662,7 @@ \w בְ⁠מַטָּי⁠ו֙|lemma="מַטֶּה" strong="b:H4294" x-morph="He,R:Ncmpc:Sp3ms"\w* \w רֹ֣אשׁ|lemma="רֹאשׁ" strong="H7218a" x-morph="He,Ncmsc" x-tw="rc://*/tw/dict/bible/other/head"\w* \w פְּרָזָ֔יו|lemma="פָּרָז" strong="H6518" x-morph="He,Ncmpc:Sp3ms"\w* -\f + \ft K \w פרז⁠ו|lemma="פָּרָז" strong="H6518" x-morph="He,Ncmsc:Sp3ms"\w*\f* +\f + \ft K \+w פרז⁠ו|lemma="פָּרָז" strong="H6518" x-morph="He,Ncmsc:Sp3ms"\+w*\f* \w יִסְעֲר֖וּ|lemma="סָעַר" strong="H5590" x-morph="He,Vqi3mp"\w* \w לַ⁠הֲפִיצֵ֑⁠נִי|lemma="פּוּץ" strong="l:H6327a" x-morph="He,R:Vhc:Sp1cs"\w* \w עֲלִ֣יצֻתָ֔⁠ם|lemma="עֲלִיצוּת" strong="H5951" x-morph="He,Ncfsc:Sp3mp"\w* diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/36-ZEP.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/36-ZEP.usfm index 32d63277..4be00859 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/36-ZEP.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/36-ZEP.usfm @@ -369,7 +369,7 @@ \w אֱלֹהֵי⁠הֶ֖ם|lemma="אֱלֹהִים" strong="H0430" x-morph="He,Ncmpc:Sp3mp" x-tw="rc://*/tw/dict/bible/kt/god"\w* \w וְ⁠שָׁ֥ב|lemma="שׁוּב" strong="c:H7725" x-morph="He,C:Vqq3ms" x-tw="rc://*/tw/dict/bible/other/return"\w* \w שבות⁠ם|lemma="שְׁבוּת" strong="H7622" x-morph="He,Ncfsc:Sp3mp" x-tw="rc://*/tw/dict/bible/other/captive"\w*׃ -\f + \ft Q \w שְׁבִיתָֽם|lemma="שְׁבוּת" strong="H7622" x-morph="He,Ncfsc:Sp3mp"\w*\f* +\f + \ft Q \+w שְׁבִיתָֽם|lemma="שְׁבוּת" strong="H7622" x-morph="He,Ncfsc:Sp3mp"\+w*\f* \v 8 \w שָׁמַ֨עְתִּי֙|lemma="שָׁמַע" strong="H8085" x-morph="He,Vqp1cs"\w* @@ -408,7 +408,7 @@ \w יְבָזּ֔וּ⁠ם|lemma="בָּזַז" strong="H0962" x-morph="He,Vqi3mp:Sp3mp"\w* \w וְ⁠יֶ֥תֶר|lemma="יֶתֶר" strong="c:H3499a" x-morph="He,C:Ncmsc"\w* \w גּוֹיִ֖י|lemma="גּוֹי" strong="H1471a" x-morph="He,Ncmsa:Sp1cs" x-tw="rc://*/tw/dict/bible/other/nation"\w* -\f + \ft K \w גוי|lemma="גּוֹי" strong="H1471a" x-morph="He,Ncmsa"\w*\f* +\f + \ft K \+w גוי|lemma="גּוֹי" strong="H1471a" x-morph="He,Ncmsa"\+w*\f* \w יִנְחָלֽוּ⁠ם|lemma="נָחַל" strong="H5157" x-morph="He,Vqi3mp:Sp3mp"\w*׃ diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/37-HAG.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/37-HAG.usfm index 1b2a5670..070afb56 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/37-HAG.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/37-HAG.usfm @@ -112,7 +112,7 @@ \w הַ⁠בָּ֑יִת|lemma="בַּיִת" strong="d:H1004b" x-morph="He,Td:Ncmsa" x-tw="rc://*/tw/dict/bible/other/house"\w* \w וְ⁠אֶרְצֶה|lemma="רָצָה" strong="c:H7521" x-morph="He,C:Vqi1cs"\w*־\w בּ֥⁠וֹ|lemma="" strong="b" x-morph="He,R:Sp3ms"\w* \w ו⁠אכבד|lemma="כָּבַד" strong="c:H3513" x-morph="He,C:VNi1cs"\w* -\f + \ft Q \w וְאֶכָּבְדָ֖ה|lemma="כָּבַד" strong="c:H3513" x-morph="He,C:VNh1cs"\w*\f* +\f + \ft Q \+w וְאֶכָּבְדָ֖ה|lemma="כָּבַד" strong="c:H3513" x-morph="He,C:VNh1cs"\+w*\f* \w אָמַ֥ר|lemma="אָמַר" strong="H0559" x-morph="He,Vqp3ms"\w* \w יְהוָֽה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w*׃ diff --git a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/38-ZEC.usfm b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/38-ZEC.usfm index d23e4ef6..77b05eb0 100644 --- a/src/__tests__/fixtures/unfoldingWord/hbo_uhb/38-ZEC.usfm +++ b/src/__tests__/fixtures/unfoldingWord/hbo_uhb/38-ZEC.usfm @@ -65,7 +65,7 @@ \w מִ⁠דַּרְכֵי⁠כֶ֣ם|lemma="דֶּרֶךְ" strong="m:H1870" x-morph="He,R:Ncbpc:Sp2mp"\w* \w הָ⁠רָעִ֔ים|lemma="רַע" strong="d:H7451a" x-morph="He,Td:Aampa" x-tw="rc://*/tw/dict/bible/kt/evil"\w* \w וּמַֽעַלְלֵיכֶ֖ם|lemma="מַעֲלָל" strong="c:H4611" x-morph="He,C:Ncmpc:Sp2mp"\w* -\f + \ft K \w ו⁠מעלילי⁠כם|lemma="עָלַל" strong="c:H5953" x-morph="He,C:Vhrmpc:Sp2mp"\w*\f* +\f + \ft K \+w ו⁠מעלילי⁠כם|lemma="עָלַל" strong="c:H5953" x-morph="He,C:Vhrmpc:Sp2mp"\+w*\f* \w הָֽ⁠רָעִ֑ים|lemma="רַע" strong="d:H7451a" x-morph="He,Td:Aampa" x-tw="rc://*/tw/dict/bible/kt/evil"\w* \w וְ⁠לֹ֥א|lemma="לֹא" strong="c:H3808" x-morph="He,C:Tn"\w* \w שָׁמְע֛וּ|lemma="שָׁמַע" strong="H8085" x-morph="He,Vqp3cp"\w* @@ -262,7 +262,7 @@ \w יְהוָ֣ה|lemma="יְהֹוָה" strong="H3068" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/kt/yahweh"\w* \w צְבָא֑וֹת|lemma="צָבָא" strong="H6635b" x-morph="He,Ncbpa"\w* \w וְקָ֥ו|lemma="קָוֶה" strong="c:H6961" x-morph="He,C:Ncmsa"\w* -\f + \ft K \w ו⁠קוה|lemma="קָוֶה" strong="c:H6961" x-morph="He,C:Ncfsa"\w*\f* +\f + \ft K \+w ו⁠קוה|lemma="קָוֶה" strong="c:H6961" x-morph="He,C:Ncfsa"\+w*\f* \w יִנָּטֶ֖ה|lemma="נָטָה" strong="H5186" x-morph="He,VNi3ms"\w* \w עַל|lemma="עַל" strong="H5921a" x-morph="He,R"\w*־\w יְרוּשָׁלִָֽם|lemma="יְרוּשָׁלִַ͏ם" strong="H3389" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/jerusalem"\w*׃ @@ -718,7 +718,7 @@ \w אַתָּ֖ה|lemma="אַתָּה" strong="H0859a" x-morph="He,Pp2ms"\w* \w רֹאֶ֑ה|lemma="רָאָה" strong="H7200" x-morph="He,Vqrmsa"\w* \w וָאֹמַ֡ר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw1cs"\w* -\f + \ft K \w ו⁠יאמר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\w*\f* +\f + \ft K \+w ו⁠יאמר|lemma="אָמַר" strong="c:H0559" x-morph="He,C:Vqw3ms"\+w*\f* \w רָאִ֣יתִי|lemma="רָאָה" strong="H7200" x-morph="He,Vqp1cs"\w* ׀ \w וְ⁠הִנֵּ֣ה|lemma="הִנֵּה" strong="c:H2009" x-morph="He,C:Tm"\w* \w מְנוֹרַת֩|lemma="מְנוֹרָה" strong="H4501" x-morph="He,Ncfsc"\w* @@ -2260,7 +2260,7 @@ \w יָרַ֖ד|lemma="יָרַד" strong="H3381" x-morph="He,Vqp3ms"\w* \w יַ֥עַר|lemma="יַעַר" strong="H3293a" x-morph="He,Ncmsc"\w* \w ה⁠בצור|lemma="בָּצוֹר" strong="d:H1208" x-morph="He,Td:Vqsmsa"\w*׃ -\f + \ft Q \w הַבָּצִֽיר|lemma="בָּצוֹר" strong="d:H1208" x-morph="He,Td:Ncmsa"\w*\f* +\f + \ft Q \+w הַבָּצִֽיר|lemma="בָּצוֹר" strong="d:H1208" x-morph="He,Td:Ncmsa"\+w*\f* \v 3 \w ק֚וֹל|lemma="קוֹל" strong="H6963a" x-morph="He,Ncmsc"\w* @@ -2893,7 +2893,7 @@ \w הַ⁠בָּ֣תִּ֔ים|lemma="בַּיִת" strong="d:H1004b" x-morph="He,Td:Ncmpa" x-tw="rc://*/tw/dict/bible/other/house"\w* \w וְ⁠הַ⁠נָּשִׁ֖ים|lemma="אִשָּׁה" strong="c:d:H0802" x-morph="He,C:Td:Ncfpa"\w* \w תשגלנה|lemma="שָׁגַל" strong="H7693" x-morph="He,VNi3fp"\w* -\f + \ft Q \w תִּשָּׁכַ֑בְנָה|lemma="שָׁכַב" strong="H7901" x-morph="He,VNi3fp"\w*\f* +\f + \ft Q \+w תִּשָּׁכַ֑בְנָה|lemma="שָׁכַב" strong="H7901" x-morph="He,VNi3fp"\+w*\f* \w וְ⁠יָצָ֞א|lemma="יָצָא" strong="c:H3318" x-morph="He,C:Vqq3ms" x-tw="rc://*/tw/dict/bible/kt/command"\w* \w חֲצִ֤י|lemma="חֵצִי" strong="H2677" x-morph="He,Ncmsc"\w* \w הָ⁠עִיר֙|lemma="עִיר" strong="d:H5892b" x-morph="He,Td:Ncfsa"\w* @@ -2967,9 +2967,9 @@ \w לֹֽא|lemma="לֹא" strong="H3808" x-morph="He,Tn"\w*־\w יִהְיֶ֣ה|lemma="הָיָה" strong="H1961" x-morph="He,Vqi3ms"\w* \w א֔וֹר|lemma="אוֹר" strong="H0216" x-morph="He,Ncbsa"\w* \w יְקָר֖וֹת|lemma="יָקָר" strong="H3368" x-morph="He,Aafpa"\w* -\f + \ft Or perhaps \w וְקָרוֹת|lemma="" strong="7135" x-morph="He,Ncfpa"\w*\f* +\f + \ft Or perhaps \+w וְקָרוֹת|lemma="" strong="7135" x-morph="He,Ncfpa"\+w*\f* \w יקפאו⁠ן|lemma="קָפָא" strong="H7087b" x-morph="He,Vqi3mp:Sn"\w*׃ -\f + \ft Q \w וְקִפָּאֽוֹן|lemma="קָפָא" strong="H7087b" x-morph="He,Td:Ncmsa"\w*\f* +\f + \ft Q \+w וְקִפָּאֽוֹן|lemma="קָפָא" strong="H7087b" x-morph="He,Td:Ncmsa"\+w*\f* \v 7 \w וְ⁠הָיָ֣ה|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqq3ms"\w* From 60cb077a2e719867f04b706ea20e3bad75d0716f Mon Sep 17 00:00:00 2001 From: Robert Hunt Date: Fri, 21 May 2021 20:44:08 +1200 Subject: [PATCH 11/15] Upgrade packages and get tests working --- noticeList.txt | 344 +++++------ package.json | 2 +- .../book-package-check.test.js.snap | 528 +++++++++++++++++ .../tn-table-row-check.test.js.snap | 12 +- src/core/BCS-usfm-grammar-check.js | 2 +- yarn.lock | 539 +++++++++--------- 6 files changed, 991 insertions(+), 436 deletions(-) diff --git a/noticeList.txt b/noticeList.txt index 1ce4d9e4..59d6985b 100644 --- a/noticeList.txt +++ b/noticeList.txt @@ -1,14 +1,14 @@ -Last updated 2021-05-04 11:41:19.924359 by makeNoticeList.py +Last updated 2021-05-21 20:42:33.603995 by makeNoticeList.py Got 490 notices: checkRepoResult.noticeList.push( 997, "Repository doesn’t exist", details, username, repoCode, repoName, location: givenLocation, extra: repoCode from checkRepo.js line 267 - languageCode === 'en' || languageCode === 'fr' ? 490 : 190, "Expected header field to contain a mixed-case string", fieldName: `\\$marker`, excerpt: rest, C, V, location: lineLocation from usfm-text-check.js line 947 - marker === 's5' ? 111 : 809, `$marker === 's5' ? 'Deprecated' : 'Unexpected' '\\$marker' marker at start of line`, C, V, lineNumber, characterIndex: 1, location: lineLocation from usfm-text-check.js line 975 - `"`.indexOf(line[0]) < 0 ? 880 : 180, C, V, "Expected line to start with backslash", lineNumber: n, characterIndex: 0, excerpt: line[0], location: ourLocation from usfm-text-check.js line 1,099 - C === '1' ? 657 : 457, C, V, "Paragraph marker expected before first verse", lineNumber: n, characterIndex: 1, details: `'\\$marker' after '\\$lastMarker'`, location: ourLocation from usfm-text-check.js line 1,192 + languageCode === 'en' || languageCode === 'fr' ? 490 : 190, "Expected header field to contain a mixed-case string", fieldName: `\\$marker`, excerpt: rest, C, V, location: lineLocation from usfm-text-check.js line 971 + marker === 's5' ? 111 : 809, `$marker === 's5' ? 'Deprecated' : 'Unexpected' '\\$marker' marker at start of line`, C, V, lineNumber, characterIndex: 1, location: lineLocation from usfm-text-check.js line 999 + `"`.indexOf(line[0]) < 0 ? 880 : 180, C, V, "Expected line to start with backslash", lineNumber: n, characterIndex: 0, excerpt: line[0], location: ourLocation from usfm-text-check.js line 1,126 + C === '1' ? 657 : 457, C, V, "Paragraph marker expected before first verse", lineNumber: n, characterIndex: 1, details: `'\\$marker' after '\\$lastMarker'`, location: ourLocation from usfm-text-check.js line 1,219 thisPriority, `Mismatched $leftChar$rightChar characters`, details: `left=$leftCount.toLocaleString(), right=$rightCount.toLocaleString()`, location: ourLocation from field-text-check.js line 404 thisPriority, thisMessage, excerpt: regexResultArray[0], location: ourLocation from field-text-check.js line 419 leftChar === '“' ? 162 : 462, `Mismatched $leftChar$rightChar characters`, details: `left=$leftCount.toLocaleString(), right=$rightCount.toLocaleString()`, location: ourLocation from plain-text-check.js line 245 - 999, "checkRepo function FAILED", repoName, excerpt: checkRepoError, location: repoName from RepoCheck.js line 107 + 999, "checkRepo function FAILED", repoName, excerpt: checkRepoError, location: repoName from RepoCheck.js line 114 997, "Repository doesn’t exist", details, username, repoCode, repoName, location: manifestLocation, extra: repoCode from checkBookPackage.js line 187 997, "Repository doesn’t exist", details, username, repoCode, repoName, location: markdownLocation, extra: repoCode from checkBookPackage.js line 252 997, "Repository doesn’t exist", details, username, repoCode, repoName, location: repoLocation, extra: repoCode from checkBookPackage.js line 411 @@ -33,7 +33,7 @@ Got 490 notices: 988, "Bad TSV header", details: `expected '$EXPECTED_TWL_HEADING_LINE'`, excerpt: lines[0], lineNumber: 1, location: ourLocation from twl-tsv6-table-check.js line 117 988, "Bad TSV header", details: `expected '$EXPECTED_NOTES_HEADING_LINE'`, excerpt: lines[0], lineNumber: 1, location: ourLocation from notes-tsv7-table-check.js line 117 988, "Bad TSV header", details: `expected '$EXPECTED_QUESTIONS_HEADING_LINE'`, excerpt: lines[0], lineNumber: 1, location: ourLocation from questions-tsv7-table-check.js line 117 - 987, C, V, "Expected \\id line to start with book identifier", lineNumber: n, characterIndex: 4, excerpt, location: ourLocation from usfm-text-check.js line 1,176 + 987, C, V, "Expected \\id line to start with book identifier", lineNumber: n, characterIndex: 4, excerpt, location: ourLocation from usfm-text-check.js line 1,203 986, "Repository doesn’t seem to exist", details: `username=$username`, location: givenLocation, extra: repoName from checkRepo.js line 176 985, `Field does not match schema $errorObject.keyword`, details: errorObject.message, fieldName: errorObject.dataPath, location: ourLocation from manifest-text-check.js line 709 984, `Found wrong number of TSV fields (expected $NUM_EXPECTED_TWL_TSV_FIELDS)`, details: `Found $fields.length field$fields.length === 1 ? '' : 's'`, rowID, location: ourRowLocation from twl-tsv6-row-check.js line 429 @@ -60,13 +60,13 @@ Got 490 notices: 975, "Wrong verse number", details: `expected '$givenV'`, rowID, fieldName: 'Reference', excerpt: V, location: ourRowLocation from notes-tsv7-row-check.js line 399 956, "Got empty manifest file", repoName, filename: STANDARD_MANIFEST_FILENAME, location: manifestLocation, extra: `$repoCode MANIFEST` from checkBookPackage.js line 212 956, "Got empty markdown file", repoName, filename, location: markdownLocation, extra: repoCode from checkBookPackage.js line 286 - 950, "tC cannot yet process '*' language code", characterIndex, excerpt, location: ourLocation from notes-links-check.js line 343 - 950, "tC cannot yet process '*' language code", characterIndex, excerpt, location: ourLocation from notes-links-check.js line 512 + 950, "tC cannot yet process '*' language code", characterIndex, excerpt, location: ourLocation from notes-links-check.js line 352 + 950, "tC cannot yet process '*' language code", characterIndex, excerpt, location: ourLocation from notes-links-check.js line 521 947, "Missing manifest.yaml", location: ourLocation, extra: `$repoName MANIFEST` from checkRepo.js line 296 946, "Missing LICENSE.md", location: ourLocation, extra: `$repoName LICENSE` from checkRepo.js line 294 - 944, `USFM3 Grammar Check ($strictnessString mode) doesn’t pass`, filename, location: ourLocation from BCS-usfm-grammar-check.js line 176 + 944, `USFM3 Grammar Check ($strictnessString mode) doesn’t pass`, filename, location: ourLocation from BCS-usfm-grammar-check.js line 195 943, `USFM3 toJSON Check doesn’t pass`, location: ourLocation from usfm-js-check.js line 91 - 942, "USFM Grammar check fails", location from usfm-text-check.js line 1,226 + 942, "USFM Grammar check fails", location from usfm-text-check.js line 1,253 939, "Key is missing for project", details: keyName, excerpt: JSON.stringify(projectEntry), location: ourLocation from manifest-text-check.js line 721 938, `Unable to find project file mentioned in manifest`, excerpt: projectFilepath, location: ourLocation from manifest-text-check.js line 738 937, `Linked project file seems empty`, excerpt: projectFilepath, location: ourLocation from manifest-text-check.js line 740 @@ -75,80 +75,80 @@ Got 490 notices: 928, "'dublin_core' key is missing", location: ourLocation from manifest-text-check.js line 672 920, yamlError.message, location: ourLocation ) from yaml-text-check.js line 175 919, "Missing Quote field", fieldName: 'Quote', rowID, location: ourRowLocation from twl-tsv6-row-check.js line 368 - 919, "Missing Quote field", fieldName: 'OrigQuote', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 424 + 919, "Missing OrigQuote field", fieldName: 'OrigQuote', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 424 919, "Missing Quote field", fieldName: 'Quote', rowID, location: ourRowLocation from questions-tsv7-row-check.js line 424 919, "Missing Quote field", fieldName: 'Quote', rowID, location: ourRowLocation from notes-tsv7-row-check.js line 485 - 917, "Unable to find duplicate original language quote in verse text", details: `occurrence=$occurrenceString but $actualOccurrencesText occurrence$actualNumOccurrences === 1 ? '' : 's' found, passage ►$verseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 345 - 916, "Unable to find original language quote in verse text", details: "quote which starts with a space" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 386 - 916, "Unable to find original language quote in verse text", details: "quote which ends with a space" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 389 - 916, "Unable to find original language quote in verse text", details: "quote which starts with 'word joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 392 - 916, "Unable to find original language quote in verse text", details: "quote which ends with 'word joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 395 - 916, "Unable to find original language quote in verse text", details: "quote which starts with 'zero-width space'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 398 - 916, "Unable to find original language quote in verse text", details: "quote which ends with 'zero-width space'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 401 - 916, "Unable to find original language quote in verse text", details: "quote which starts with 'zero-width joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 404 - 916, "Unable to find original language quote in verse text", details: "quote which ends with 'zero-width joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 407 - 916, "Unable to find original language quote in verse text", details: noBreakSpaceText ? noBreakSpaceText : `passage ►$verseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 410 - 915, "Unable to find original language quote portion in verse text", details: `passage ►$verseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 329 - 914, "Unable to find original language quote portion in the right place in the verse text", details: `passage ►$verseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 326 + 917, "Unable to find duplicate original language quote in verse text", details: `occurrence=$occurrenceString but $actualOccurrencesText occurrence$actualNumOccurrences === 1 ? '' : 's' found, passage ►$verseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 474 + 916, "Unable to find original language quote in verse text", details: "quote which starts with a space" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 324 + 916, "Unable to find original language quote in verse text", details: "quote which ends with a space" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 327 + 916, "Unable to find original language quote in verse text", details: "quote which starts with 'word joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 330 + 916, "Unable to find original language quote in verse text", details: "quote which ends with 'word joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 333 + 916, "Unable to find original language quote in verse text", details: "quote which starts with 'zero-width space'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 336 + 916, "Unable to find original language quote in verse text", details: "quote which ends with 'zero-width space'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 339 + 916, "Unable to find original language quote in verse text", details: "quote which starts with 'zero-width joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 342 + 916, "Unable to find original language quote in verse text", details: "quote which ends with 'zero-width joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 345 + 916, "Unable to find original language quote in verse text", details: noBreakSpaceText ? noBreakSpaceText : `passage ►$fullVerseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 348 + 914, "Unable to find original language quote portion in the right place in the verse text", details: `passage ►$verseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 451 912, 'Missing | character in \\w line', lineNumber, C, V, characterIndex, excerpt, location: lineLocation from usfm-text-check.js line 678 911, 'Missing | character in \\w field', details, lineNumber, C, V, characterIndex, excerpt, location: lineLocation from usfm-text-check.js line 734 - 909, "Seems original language quote might not start at the beginning of a word", details: `passage ►$verseText◄`, characterIndex: 0, excerpt, location: ourLocation from orig-quote-check.js line 366 - 908, "Seems original language quote might not finish at the end of a word", details: `passage ►$verseText◄`, characterIndex: fieldText.length, excerpt, location: ourLocation from orig-quote-check.js line 375 - 903, "Bad function call: should be given a valid book abbreviation", excerpt: bookID, location: ourLocation from usfm-text-check.js line 1,041 + 911, 'Missing | character in \\+w field', details, lineNumber, C, V, characterIndex, excerpt, location: lineLocation from usfm-text-check.js line 755 + 909, "Seems original language quote might not start at the beginning of a word", details, characterIndex: 0, excerpt, location from orig-quote-check.js line 280 + 908, "Seems original language quote might not finish at the end of a word", details, characterIndex: foundQuoteSegment.length, excerpt, location from orig-quote-check.js line 291 + 903, "Bad function call: should be given a valid book abbreviation", excerpt: bookID, location: ourLocation from usfm-text-check.js line 1,068 902, "Bad function call: should be given a valid book abbreviation", excerpt: bookID, location: ` (not '$bookID')$generalLocation` ); return checkBookPackageResult; from checkBookPackage.js line 317 900, "Bad parameter: should be given a valid book abbreviation", excerpt: bookIDList, location: ` (not '$bookIDList')` from checkBookPackages.js line 76 895, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1 ? '' : 's' found`, characterIndex, excerpt, location: ourLocation from field-text-check.js line 107 889, `Unable to find/load TA article`, details: `linked from TN $fieldName`, excerpt: fieldText, location: `$ourLocation $filepath` from ta-reference-check.js line 109 888, `Error loading TA article`, details: `linked from TN $fieldName`, excerpt: fieldText, location: `$ourLocation $filepath: $trcGCerror` from ta-reference-check.js line 114 887, `TA article seems empty`, details: `linked from TN $fieldName`, excerpt: fieldText, location: `$ourLocation $filepath` from ta-reference-check.js line 111 - 886, `Unable to find/load TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 365 - 886, `Unable to find/load TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 421 - 886, `Unable to find/load TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 471 - 886, `Unable to find/load TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 534 - 885, `Error loading TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 360 - 885, `Error loading TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 416 - 885, `Error loading TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 466 - 885, `Error loading TA article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 529 - 884, `TA article seems empty`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 367 - 884, `TA article seems empty`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 423 - 884, `TA article seems empty`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 473 - 884, `TA article seems empty`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 536 - 883, `Unable to find/load TW article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 300 - 883, `Unable to find/load TW article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 585 - 882, `Error loading TW article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 297 - 882, `Error loading TW article`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 582 - 881, `TW article seems empty`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 303 - 881, `TW article seems empty`, details: `linked from $fieldName`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 588 + 886, `Unable to find/load TA article`, details: `$taRepoUsername $taRepoName $taRepoBranch $filepath`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 374 + 886, `Unable to find/load TA article`, details: `$taRepoUsername $taRepoName $taRepoBranch $filepath`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 430 + 886, `Unable to find/load TA article`, details: `$taRepoUsername $taRepoName $taRepoBranch $filepath`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 480 + 886, `Unable to find/load TA article`, details: `$taRepoUsername $taRepoName $taRepoBranch $filepath`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 543 + 885, `Error loading TA article`, details: `$taRepoUsername $taRepoName $taRepoBranch $filepath`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 369 + 885, `Error loading TA article`, details: `$taRepoUsername $taRepoName $taRepoBranch $filepath`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 425 + 885, `Error loading TA article`, details: `$taRepoUsername $taRepoName $taRepoBranch $filepath`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 475 + 885, `Error loading TA article`, details: `$taRepoUsername $taRepoName $taRepoBranch $filepath`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 538 + 884, `TA article seems empty`, details: `$taRepoUsername $taRepoName $taRepoBranch $filepath`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 376 + 884, `TA article seems empty`, details: `$taRepoUsername $taRepoName $taRepoBranch $filepath`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 432 + 884, `TA article seems empty`, details: `$taRepoUsername $taRepoName $taRepoBranch $filepath`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 482 + 884, `TA article seems empty`, details: `$taRepoUsername $taRepoName $taRepoBranch $filepath`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 545 + 883, `Unable to find/load TW article`, details: `$twRepoUsername $twRepoName $twRepoBranch $filepath`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 309 + 883, `Unable to find/load TW article`, details: `$twRepoUsername $twRepoName $twRepoBranch $filepath`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 594 + 882, `Error loading TW article`, details: `$twRepoUsername $twRepoName $twRepoBranch $filepath`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 306 + 882, `Error loading TW article`, details: `$twRepoUsername $twRepoName $twRepoBranch $filepath`, excerpt: totalLink, location: `$ourLocation $filepath: $trcGCerror` from notes-links-check.js line 591 + 881, `TW article seems empty`, details: `$twRepoUsername $twRepoName $twRepoBranch $filepath`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 312 + 881, `TW article seems empty`, details: `$twRepoUsername $twRepoName $twRepoBranch $filepath`, excerpt: totalLink, location: `$ourLocation $filepath` from notes-links-check.js line 597 879, `Badly formatted Resource Container link`, excerpt: fieldText, location: `$ourLocation $filepath` from ta-reference-check.js line 96 - 875, "Unexpected USFM field", details, lineNumber, C, V, excerpt, location: lineLocation from usfm-text-check.js line 781 + 875, "Unexpected USFM field", details, lineNumber, C, V, excerpt, location: lineLocation from usfm-text-check.js line 802 873, `Mismatched $opener$closer fields`, excerpt: `(left=$lCount.toLocaleString(), right=$rCount.toLocaleString())`, location: fileLocation from usfm-text-check.js line 572 869, "Chapter number out of range", C: chapterNumberString, excerpt: `$bookID $chapterNumberString`, location: CVlocation from usfm-text-check.js line 422 868, "Verse number out of range", C: chapterNumberString, V: verseNumberString, excerpt: `$bookID $chapterNumberString:$verseNumberString`, location: CVlocation from usfm-text-check.js line 461 867, C: chapterNumberString, V: `$v`, "Verse appears to be missing", location: CVlocation from usfm-text-check.js line 475 866, C: chapterNumberString, V: `$v`, "Verse seems to have no text", location: CVlocation from usfm-text-check.js line 480 - 857, "Unexpected first original \\w attribute", details: "expected 'lemma'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 826 - 856, "Unexpected second original \\w attribute", details: "expected 'strong'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 829 - 855, "Unexpected third original \\w attribute", details: "expected 'x-morph'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 832 - 854, "Unexpected fourth original \\w attribute", details: "expected 'x-tw'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 835 - 854, "Unexpected fifth original \\w attribute", details: "expected second 'x-tw'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 838 - 854, "Unexpected sixth original \\w attribute", details: "expected third 'x-tw'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 841 - 853, "Unexpected extra original \\w attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 843 - 852, "Unexpected original \\w x-morph language prefix", details: "Expected 'He,' 'Ar,' or 'Gr,'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 847 - 851, bookID === 'OBS' ? "Unable to load OBS story text" : "Unable to load original language verse text", location: ourLocation from orig-quote-check.js line 298 + 857, "Unexpected first original \\w attribute", details: "expected 'lemma'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 850 + 856, "Unexpected second original \\w attribute", details: "expected 'strong'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 853 + 855, "Unexpected third original \\w attribute", details: "expected 'x-morph'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 856 + 854, "Unexpected fourth original \\w attribute", details: "expected 'x-tw'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 859 + 854, "Unexpected fifth original \\w attribute", details: "expected second 'x-tw'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 862 + 854, "Unexpected sixth original \\w attribute", details: "expected third 'x-tw'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 865 + 853, "Unexpected extra original \\w attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 867 + 852, "Unexpected original \\w x-morph language prefix", details: "Expected 'He,' 'Ar,' or 'Gr,'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 871 + 851, bookID === 'OBS' ? "Unable to load OBS story text" : "Unable to load original language verse text", location: ourLocation from orig-quote-check.js line 422 849, `Unexpected '$badCharCombination' character combination`, characterIndex, excerpt, location: ourLocation from field-text-check.js line 373 - 848, "Unexpected first translation \\w attribute", details: "expected 'x-occurrence'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 853 - 847, "Unexpected second translation \\w attribute", details: "expected 'x-occurrences'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 856 - 846, "Unexpected extra translation \\w attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 858 - 845, `Mismatched [[ ]] link characters`, details: `left=$leftCount.toLocaleString(), right=$rightCount.toLocaleString()`, location: ourLocation from notes-links-check.js line 1,208 - 844, `Mismatched [[rc:// ]] link characters`, details: `left=$leftCount.toLocaleString(), right=$rightCount.toLocaleString()`, location: ourLocation from notes-links-check.js line 1,212 - 843, `Mismatched [ ]( ) link characters`, details: `left=$leftCount.toLocaleString(), middle=$middleCount.toLocaleString(), right=$rightCount.toLocaleString()`, location: ourLocation from notes-links-check.js line 1,219 - 839, "Unexpected first \\k-s attribute", details: "expected 'x-tw'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 877 - 838, "Unexpected extra \\k-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 879 - 837, "Seems too few original \\w attributes", details: `Expected 3-4 attributes but only found $attributeCounter`, lineNumber, C, V, excerpt: regexResultArray1[0], location: lineLocation from usfm-text-check.js line 863 - 836, "Seems too few translation \\w attributes", details: `Expected two attributes but only found $attributeCounter`, lineNumber, C, V, excerpt: regexResultArray1[0], location: lineLocation from usfm-text-check.js line 865 - 835, "Seems too few original \\k-s attributes", details: `Expected one attribute but only found $attributeCounter`, lineNumber, C, V, excerpt: regexResultArray1[0], location: lineLocation from usfm-text-check.js line 882 - 834, "Seems too few translation \\zaln-s attributes", details: `Expected six attributes but only found $attributeCounter`, lineNumber, C, V, excerpt: regexResultArray1[0], location: lineLocation from usfm-text-check.js line 914 - 833, "Unexpected extra \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 911 + 848, "Unexpected first translation \\w attribute", details: "expected 'x-occurrence'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 877 + 847, "Unexpected second translation \\w attribute", details: "expected 'x-occurrences'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 880 + 846, "Unexpected extra translation \\w attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 882 + 845, `Mismatched [[ ]] link characters`, details: `left=$leftCount.toLocaleString(), right=$rightCount.toLocaleString()`, location: ourLocation from notes-links-check.js line 1,217 + 844, `Mismatched [[rc:// ]] link characters`, details: `left=$leftCount.toLocaleString(), right=$rightCount.toLocaleString()`, location: ourLocation from notes-links-check.js line 1,221 + 843, `Mismatched [ ]( ) link characters`, details: `left=$leftCount.toLocaleString(), middle=$middleCount.toLocaleString(), right=$rightCount.toLocaleString()`, location: ourLocation from notes-links-check.js line 1,228 + 839, "Unexpected first \\k-s attribute", details: "expected 'x-tw'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 901 + 838, "Unexpected extra \\k-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 903 + 837, "Seems too few original \\w attributes", details: `Expected 3-4 attributes but only found $attributeCounter`, lineNumber, C, V, excerpt: regexResultArray1[0], location: lineLocation from usfm-text-check.js line 887 + 836, "Seems too few translation \\w attributes", details: `Expected two attributes but only found $attributeCounter`, lineNumber, C, V, excerpt: regexResultArray1[0], location: lineLocation from usfm-text-check.js line 889 + 835, "Seems too few original \\k-s attributes", details: `Expected one attribute but only found $attributeCounter`, lineNumber, C, V, excerpt: regexResultArray1[0], location: lineLocation from usfm-text-check.js line 906 + 834, "Seems too few translation \\zaln-s attributes", details: `Expected six attributes but only found $attributeCounter`, lineNumber, C, V, excerpt: regexResultArray1[0], location: lineLocation from usfm-text-check.js line 938 + 833, "Unexpected extra \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 935 832, C, V, "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from tn-tsv9-table-check.js line 237 832, C, V, "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from twl-tsv6-table-check.js line 226 832, C, V, "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from notes-tsv7-table-check.js line 226 @@ -157,12 +157,12 @@ Got 490 notices: 831, C, V, `Duplicate '$rowID' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation from twl-tsv6-table-check.js line 223 831, C, V, `Duplicate '$rowID' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation from notes-tsv7-table-check.js line 223 831, C, V, `Duplicate '$rowID' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation from questions-tsv7-table-check.js line 223 - 830, "Unexpected first \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 894 - 829, "Unexpected second \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 897 - 828, "Unexpected third \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 900 - 827, "Unexpected fourth \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 903 - 826, "Unexpected fifth \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 906 - 825, "Unexpected sixth \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 909 + 830, "Unexpected first \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 918 + 829, "Unexpected second \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 921 + 828, "Unexpected third \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 924 + 827, "Unexpected fourth \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 927 + 826, "Unexpected fifth \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 930 + 825, "Unexpected sixth \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 933 824, `Invalid zero chapter number`, excerpt: C, rowID, fieldName: 'Reference', location: ourRowLocation from twl-tsv6-row-check.js line 280 824, `Invalid zero chapter number`, excerpt: C, rowID, fieldName: 'Chapter', location: ourRowLocation from tn-tsv9-row-check.js line 323 824, `Invalid zero chapter number`, excerpt: C, rowID, fieldName: 'Reference', location: ourRowLocation from questions-tsv7-row-check.js line 335 @@ -172,8 +172,8 @@ Got 490 notices: 823, `Invalid large chapter number`, excerpt: C, rowID, fieldName: 'Reference', location: ourRowLocation from questions-tsv7-row-check.js line 340 823, `Invalid large chapter number`, excerpt: C, rowID, fieldName: 'Reference', location: ourRowLocation from notes-tsv7-row-check.js line 373 822, "Unable to check chapter number", excerpt: C, rowID, fieldName: 'Reference', location: ourRowLocation from twl-tsv6-row-check.js line 298 - 822, "Expected field to contain an integer", lineNumber, characterIndex: 3, excerpt: `\\c $rest`, C, V, location: lineLocation from usfm-text-check.js line 939 - 822, "Expected field to contain an integer", characterIndex: 3, excerpt: `\\v $rest`, C, V, location: lineLocation from usfm-text-check.js line 943 + 822, "Expected field to contain an integer", lineNumber, characterIndex: 3, excerpt: `\\c $rest`, C, V, location: lineLocation from usfm-text-check.js line 963 + 822, "Expected field to contain an integer", characterIndex: 3, excerpt: `\\v $rest`, C, V, location: lineLocation from usfm-text-check.js line 967 822, "Unable to check chapter number", excerpt: C, rowID, fieldName: 'Chapter', location: ourRowLocation from tn-tsv9-row-check.js line 338 822, "Unable to check chapter number", excerpt: C, rowID, fieldName: 'Reference', location: ourRowLocation from questions-tsv7-row-check.js line 353 822, "Unable to check chapter number", excerpt: C, rowID, fieldName: 'Reference', location: ourRowLocation from notes-tsv7-row-check.js line 386 @@ -186,6 +186,7 @@ Got 490 notices: 820, "Missing chapter number", rowID, fieldName: 'Reference', location: ` ?:$V$ourRowLocation` from questions-tsv7-row-check.js line 362 820, "Missing chapter number", rowID, fieldName: 'Reference', location: ` ?:$V$ourRowLocation` from notes-tsv7-row-check.js line 395 819, "Missing compulsory USFM line", excerpt: `missing \\$compulsoryMarker`, location: fileLocation from usfm-text-check.js line 602 + 815, "Divider without surrounding snippet", location: ourLocation from orig-quote-check.js line 464 814, "Invalid zero verse number", rowID, fieldName: 'Reference', excerpt: V, location: ourRowLocation from twl-tsv6-row-check.js line 316 814, "Invalid zero verse number", rowID, fieldName: 'Verse', excerpt: V, location: ourRowLocation from tn-tsv9-row-check.js line 355 814, "Invalid zero verse number", rowID, fieldName: 'Reference', excerpt: V, location: ourRowLocation from questions-tsv7-row-check.js line 371 @@ -234,30 +235,30 @@ Got 490 notices: 787, "Link to TA should also be in Note", fieldName: 'SupportReference', excerpt: supportReference, rowID, location: ourRowLocation from notes-tsv7-row-check.js line 464 786, "Shouldn’t have multiple TA links in OccurrenceNote", details, rowID, fieldName: 'OccurrenceNote', excerpt, location: ourRowLocation from tn-tsv9-row-check.js line 485 786, "Shouldn’t have multiple TA links in Note", details, rowID, fieldName: 'OccurrenceNote', excerpt, location: ourRowLocation from notes-tsv7-row-check.js line 532 - 783, `Unable to find/load general link`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,170 - 781, `Linked general article seems empty`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,173 + 783, `Unable to find/load general link`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,179 + 781, `Linked general article seems empty`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,182 778, "Row ID should be exactly 4 characters", details: `not $rowID.length`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from twl-tsv6-row-check.js line 335 778, "Row ID should be exactly 4 characters", details: `not $rowID.length`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from tn-tsv9-row-check.js line 374 778, "Row ID should be exactly 4 characters", details: `not $rowID.length`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from questions-tsv7-row-check.js line 390 778, "Row ID should be exactly 4 characters", details: `not $rowID.length`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation from notes-tsv7-row-check.js line 423 777, `Bad punctuation nesting: $char closing character doesn’t match`, details, lineNumber: n, characterIndex, excerpt, location: ourLocation from plain-text-check.js line 205 - 776, 'Unexpected " straight quote character', details, lineNumber, C, V, excerpt, location: lineLocation from usfm-text-check.js line 768 - 775, "Unexpected ' straight quote character", details, lineNumber, C, V, excerpt, location: lineLocation from usfm-text-check.js line 773 + 776, 'Unexpected " straight quote character', details, lineNumber, C, V, excerpt, location: lineLocation from usfm-text-check.js line 789 + 775, "Unexpected ' straight quote character", details, lineNumber, C, V, excerpt, location: lineLocation from usfm-text-check.js line 794 774, `Unexpected $char closing character (no matching opener)`, lineNumber: n, characterIndex, excerpt, location: ourLocation from plain-text-check.js line 212 773, `Unexpected trailing zero-width joiner`, characterIndex: 0, excerpt, location: ourLocation from field-text-check.js line 173 772, `Unexpected trailing word-joiner`, characterIndex: 0, excerpt, location: ourLocation from field-text-check.js line 168 771, `Unexpected leading zero-width joiner`, characterIndex: 0, excerpt, location: ourLocation from field-text-check.js line 151 770, `Unexpected leading word-joiner`, characterIndex: 0, excerpt, location: ourLocation from field-text-check.js line 147 - 769, C, V, "Verse bridge numbers not in ascending order", lineNumber: n, characterIndex: 3, excerpt: `$rest.substring(0, Math.max(9, excerptLength))$rest.length > excerptLength ? '…' : '' ($firstV → $secondV)`, location: ourLocation from usfm-text-check.js line 1,152 + 769, C, V, "Verse bridge numbers not in ascending order", lineNumber: n, characterIndex: 3, excerpt: `$rest.substring(0, Math.max(9, excerptLength))$rest.length > excerptLength ? '…' : '' ($firstV → $secondV)`, location: ourLocation from usfm-text-check.js line 1,179 768, `At end of text with unclosed $char opening character`, details, lineNumber: n, characterIndex: x, excerpt, location: ourLocation from plain-text-check.js line 230 - 766, C, V, "Bridged verse numbers didn’t increment correctly", lineNumber: n, characterIndex: 3, excerpt: `$rest.substring(0, Math.max(9, excerptLength))$rest.length > excerptLength ? '…' : '' ($lastV → $firstV)`, location: ourLocation from usfm-text-check.js line 1,154 + 766, C, V, "Bridged verse numbers didn’t increment correctly", lineNumber: n, characterIndex: 3, excerpt: `$rest.substring(0, Math.max(9, excerptLength))$rest.length > excerptLength ? '…' : '' ($lastV → $firstV)`, location: ourLocation from usfm-text-check.js line 1,181 765, "Unexpected link", characterIndex, excerpt, location: ourLocation from field-text-check.js line 446 - 764, C, V, "Chapter number didn’t increment correctly", lineNumber: n, characterIndex: 3, excerpt: `$rest.substring(0, excerptHalfLength)$rest.length > excerptHalfLength ? '…' : '' ($lastC ? lastC : '0' → $C)`, location: ourLocation from usfm-text-check.js line 1,125 - 763, C, V, "Verse number didn’t increment correctly", lineNumber: n, characterIndex: 3, excerpt: `$rest.substring(0, excerptHalfLength)$rest.length > excerptHalfLength ? '…' : '' ($lastV ? lastV : '0' → $V)`, location: ourLocation from usfm-text-check.js line 1,138 + 764, C, V, "Chapter number didn’t increment correctly", lineNumber: n, characterIndex: 3, excerpt: `$rest.substring(0, excerptHalfLength)$rest.length > excerptHalfLength ? '…' : '' ($lastC ? lastC : '0' → $C)`, location: ourLocation from usfm-text-check.js line 1,152 + 763, C, V, "Verse number didn’t increment correctly", lineNumber: n, characterIndex: 3, excerpt: `$rest.substring(0, excerptHalfLength)$rest.length > excerptHalfLength ? '…' : '' ($lastV ? lastV : '0' → $V)`, location: ourLocation from usfm-text-check.js line 1,165 762, "Unable to convert verse bridge numbers to integers", C: chapterNumberString, V: verseNumberString, characterIndex: 3, excerpt: verseNumberString, location: `$CVlocation with $usfmVIerror` from usfm-text-check.js line 449 - 762, C, V, "Unable to convert verse bridge numbers to integers", lineNumber: n, characterIndex: 3, excerpt: `$rest.substring(0, Math.max(9, excerptLength))$rest.length > excerptLength ? '…' : ''`, location: ourLocation from usfm-text-check.js line 1,148 - 761, C, V, "Verse number didn’t increment correctly", lineNumber: n, characterIndex: 3, excerpt: `$restRest.substring(0, excerptHalfLength)$restRest.length > excerptHalfLength ? '…' : '' ($lastV ? lastV : '0' → $V)`, location: ourLocation from usfm-text-check.js line 1,169 - 752, "Verse numbers of markdown TN link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,105 + 762, C, V, "Unable to convert verse bridge numbers to integers", lineNumber: n, characterIndex: 3, excerpt: `$rest.substring(0, Math.max(9, excerptLength))$rest.length > excerptLength ? '…' : ''`, location: ourLocation from usfm-text-check.js line 1,175 + 761, C, V, "Verse number didn’t increment correctly", lineNumber: n, characterIndex: 3, excerpt: `$restRest.substring(0, excerptHalfLength)$restRest.length > excerptHalfLength ? '…' : '' ($lastV ? lastV : '0' → $V)`, location: ourLocation from usfm-text-check.js line 1,196 + 752, "Verse numbers of markdown TN link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,114 751, "Invalid zero occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, excerpt: occurrence, location: ourRowLocation from twl-tsv6-row-check.js line 373 751, "Invalid zero occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, excerpt: occurrence, location: ourRowLocation from tn-tsv9-row-check.js line 429 751, "Invalid zero occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, excerpt: occurrence, location: ourRowLocation from questions-tsv7-row-check.js line 429 @@ -266,10 +267,10 @@ Got 490 notices: 750, "Missing occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 420 750, "Missing occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, location: ourRowLocation from questions-tsv7-row-check.js line 420 750, "Missing occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, location: ourRowLocation from notes-tsv7-row-check.js line 481 - 749, "Markdown image link seems faulty", excerpt: fetchLink, location: ourLocation from notes-links-check.js line 227 - 749, "Markdown image link seems faulty", excerpt: fetchLink, location: ourLocation from notes-links-check.js line 248 - 748, "Error fetching markdown image link", excerpt: fetchLink, location: ourLocation from notes-links-check.js line 236 - 748, "Error fetching markdown image link", excerpt: fetchLink, location: ourLocation from notes-links-check.js line 257 + 749, "Markdown image link seems faulty", excerpt: fetchLink, location: ourLocation from notes-links-check.js line 236 + 749, "Markdown image link seems faulty", excerpt: fetchLink, location: ourLocation from notes-links-check.js line 257 + 748, "Error fetching markdown image link", excerpt: fetchLink, location: ourLocation from notes-links-check.js line 245 + 748, "Error fetching markdown image link", excerpt: fetchLink, location: ourLocation from notes-links-check.js line 266 747, "Bad function call: should be given a valid book abbreviation", excerpt: bookID, location: ` (not '$bookID')$ourLocation` from tn-tsv9-table-check.js line 110 747, "Bad function call: should be given a valid book abbreviation", excerpt: bookID, location: ` (not '$bookID')$ourLocation` from twl-tsv6-table-check.js line 101 747, "Bad function call: should be given a valid book abbreviation", excerpt: bookID, location: ` (not '$bookID')$ourLocation` from notes-tsv7-table-check.js line 101 @@ -278,25 +279,25 @@ Got 490 notices: 746, "Unexpected tag", details: thisTag, excerpt: tags, fieldName: 'Tags', rowID, location: ourRowLocation from notes-tsv7-row-check.js line 444 745, C, V, `Wrong '$B' book identifier (expected '$bookID')`, rowID, lineNumber: n + 1, location: ourLocation from tn-tsv9-table-check.js line 180 744, C, V, "Missing book identifier", rowID, lineNumber: n + 1, location: ourLocation from tn-tsv9-table-check.js line 183 - 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 639 - 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $givenCint`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 705 - 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 834 - 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 886 - 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 994 - 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,046 - 743, "Chapter numbers of markdown TN link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,099 - 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 645 - 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 711 - 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $V2`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 748 - 742, "Verse numbers of markdown Bible link don’t match", details: `$V1a vs $V2`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 787 - 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 840 - 742, "Verse numbers of markdown Bible link don’t match", details: `$V1a vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 892 - 742, "Verse numbers of markdown Bible link don’t match", details: `$V1a vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 944 - 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,000 - 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,052 - 741, "Verse numbers of markdown Bible link range out of order", details: `$V1a to $V1b`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 792 - 741, "Verse numbers of markdown Bible link range out of order", details: `$V1a to $V1b`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 898 - 741, "Verse numbers of markdown Bible link range out of order", details: `$V1a to $V1b`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 950 + 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 648 + 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $givenCint`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 714 + 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 843 + 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 895 + 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,003 + 743, "Chapter numbers of markdown Bible link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,055 + 743, "Chapter numbers of markdown TN link don’t match", details: `$C1 vs $linkChapterInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,108 + 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 654 + 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 720 + 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $V2`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 757 + 742, "Verse numbers of markdown Bible link don’t match", details: `$V1a vs $V2`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 796 + 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 849 + 742, "Verse numbers of markdown Bible link don’t match", details: `$V1a vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 901 + 742, "Verse numbers of markdown Bible link don’t match", details: `$V1a vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 953 + 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,009 + 742, "Verse numbers of markdown Bible link don’t match", details: `$V1 vs $linkVerseInt`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,061 + 741, "Verse numbers of markdown Bible link range out of order", details: `$V1a to $V1b`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 801 + 741, "Verse numbers of markdown Bible link range out of order", details: `$V1a to $V1b`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 907 + 741, "Verse numbers of markdown Bible link range out of order", details: `$V1a to $V1b`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 959 740, "Unrecognized tag", details: `found '$thisTag' but expected 'keyterm' or 'name'`, excerpt: tags, fieldName: 'Tags', rowID, location: ourRowLocation from twl-tsv6-row-check.js line 355 739, C, V, "Missing chapter number", rowID, lineNumber: n + 1, location: ` after $lastC:$V$ourLocation` from tn-tsv9-table-check.js line 207 739, C, V, "Missing chapter number", rowID, lineNumber: n + 1, location: ` after $lastC:$V$ourLocation` from twl-tsv6-table-check.js line 196 @@ -330,49 +331,49 @@ Got 490 notices: 733, C, V, "Receding verse number", details: `'$V' after '$lastV for chapter $C`, rowID, lineNumber: n + 1, excerpt: V, location: ourLocation from twl-tsv6-table-check.js line 209 733, C, V, "Receding verse number", details: `'$V' after '$lastV for chapter $C`, rowID, lineNumber: n + 1, excerpt: V, location: ourLocation from notes-tsv7-table-check.js line 209 733, C, V, "Receding verse number", details: `'$V' after '$lastV for chapter $C`, rowID, lineNumber: n + 1, excerpt: V, location: ourLocation from questions-tsv7-table-check.js line 209 - 724, C, V, "Unable to convert chapter number to integer", lineNumber: n, characterIndex: 3, excerpt: `$rest.substring(0, excerptHalfLength)$rest.length > excerptHalfLength ? '…' : ''`, location: ourLocation from usfm-text-check.js line 1,121 - 723, C, V, "Unable to convert verse number to integer", lineNumber: n, characterIndex: 3, excerpt: `$rest.substring(0, excerptHalfLength)$rest.length > excerptHalfLength ? '…' : ''`, location: ourLocation from usfm-text-check.js line 1,134 - 720, C, V, "Unable to convert internal verse number to integer", lineNumber: n, characterIndex: 3, excerpt: `$restRest.substring(0, excerptHalfLength)$restRest.length > excerptHalfLength ? '…' : ''`, location: ourLocation from usfm-text-check.js line 1,165 + 724, C, V, "Unable to convert chapter number to integer", lineNumber: n, characterIndex: 3, excerpt: `$rest.substring(0, excerptHalfLength)$rest.length > excerptHalfLength ? '…' : ''`, location: ourLocation from usfm-text-check.js line 1,148 + 723, C, V, "Unable to convert verse number to integer", lineNumber: n, characterIndex: 3, excerpt: `$rest.substring(0, excerptHalfLength)$rest.length > excerptHalfLength ? '…' : ''`, location: ourLocation from usfm-text-check.js line 1,161 + 720, C, V, "Unable to convert internal verse number to integer", lineNumber: n, characterIndex: 3, excerpt: `$restRest.substring(0, excerptHalfLength)$restRest.length > excerptHalfLength ? '…' : ''`, location: ourLocation from usfm-text-check.js line 1,192 716, `Misplaced $rightChar character`, excerpt: regexResultArray[0], location: ourLocation from field-text-check.js line 427 - 711, "Expected compulsory content", C, V, lineNumber, characterIndex: marker.length, location: ` after \\$marker marker$lineLocation` from usfm-text-check.js line 972 - 703, C, V, "Unexpected CarriageReturn character", lineNumber: n, characterIndex, excerpt, location: ourLocation from usfm-text-check.js line 1,085 - 669, "Unexpected language code in link", details: `resource language code is '$languageCode'`, excerpt: Lg, location: ourLocation from notes-links-check.js line 621 - 656, "Bad chapter number in markdown TN link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,121 - 655, "Bad story number in markdown OBS help link", details: `$linkBookCode $linkChapterInt vs $numStories chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 653 - 655, "Bad chapter number in markdown Bible help link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 667 - 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $givenCint vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 727 - 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 764 - 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 805 - 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 856 - 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 914 - 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,016 - 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,068 - 654, "Bad verse number in markdown TN link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,123 - 653, "Bad frame number in markdown OBS help link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numFramesThisStory verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 655 - 653, "Bad verse number in markdown Bible help link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 669 - 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $givenCint:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 729 - 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 766 - 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 807 - 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 858 - 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 916 - 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $givenC:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 966 - 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,018 - 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,070 - 649, "Unusual [[ ]] link(s)—not a recognized TA or TW link", details: `need to carefully check $leftoverLinksList2.length === 1 ? '"' + leftoverLinksList2[0] + '"' : JSON.stringify(leftoverLinksList2)`, location: ourLocation from notes-links-check.js line 1,200 - 648, "Unusual [ ]( ) link(s)—not a recognized Bible or TA, TN, or TW link", details: `need to carefully check $leftoverLinksList1.length === 1 ? '"' + leftoverLinksList1[0] + '"' : JSON.stringify(leftoverLinksList1)`, location: ourLocation from notes-links-check.js line 1,192 + 711, "Expected compulsory content", C, V, lineNumber, characterIndex: marker.length, location: ` after \\$marker marker$lineLocation` from usfm-text-check.js line 996 + 703, C, V, "Unexpected CarriageReturn character", lineNumber: n, characterIndex, excerpt, location: ourLocation from usfm-text-check.js line 1,112 + 669, "Unexpected language code in link", details: `resource language code is '$languageCode'`, excerpt: Lg, location: ourLocation from notes-links-check.js line 630 + 656, "Bad chapter number in markdown TN link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,130 + 655, "Bad story number in markdown OBS help link", details: `$linkBookCode $linkChapterInt vs $numStories chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 662 + 655, "Bad chapter number in markdown Bible help link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 676 + 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $givenCint vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 736 + 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 773 + 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 814 + 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 865 + 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 923 + 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,025 + 655, "Bad chapter number in markdown Bible link", details: `$linkBookCode $linkChapterInt vs $numChaptersThisBook chapters`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,077 + 654, "Bad verse number in markdown TN link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,132 + 653, "Bad frame number in markdown OBS help link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numFramesThisStory verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 664 + 653, "Bad verse number in markdown Bible help link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 678 + 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $givenCint:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 738 + 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 775 + 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 816 + 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 867 + 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 925 + 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $givenC:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 975 + 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,027 + 653, "Bad verse number in markdown Bible link", details: `$linkBookCode $linkChapterInt:$linkVerseInt vs $numVersesThisChapter verses`, excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,079 + 649, "Unusual [[ ]] link(s)—not a recognized TA or TW link", details: `need to carefully check $leftoverLinksList2.length === 1 ? '"' + leftoverLinksList2[0] + '"' : JSON.stringify(leftoverLinksList2)`, location: ourLocation from notes-links-check.js line 1,209 + 648, "Unusual [ ]( ) link(s)—not a recognized Bible or TA, TN, or TW link", details: `need to carefully check $leftoverLinksList1.length === 1 ? '"' + leftoverLinksList1[0] + '"' : JSON.stringify(leftoverLinksList1)`, location: ourLocation from notes-links-check.js line 1,201 644, "USFM3 Grammar Check (relaxed mode) doesn’t pass either", location: fileLocation from usfm-text-check.js line 259 638, "Only found whitespace", location: ourLocation from field-text-check.js line 113 638, "Only found whitespace", location: ourLocation from plain-text-check.js line 133 - 603, "USFM marker doesn’t end with space", C, V, lineNumber, characterIndex, excerpt, location: ourLocation from usfm-text-check.js line 1,055 - 601, "Unable to load", details: `username=$username error=$gcUHBerror`, OBSPathname, location: ourLocation, extra: OBSRepoName from orig-quote-check.js line 120 - 601, "Unable to load", details: `username=$username error=$gcUHBerror`, filename, location: ourLocation, extra: originalLanguageRepoName from orig-quote-check.js line 153 - 601, "Unable to load", details: `username=$username error=$gcUGNTerror`, filename, location: ourLocation, extra: originalLanguageRepoName from orig-quote-check.js line 161 + 603, "USFM marker doesn’t end with space", C, V, lineNumber, characterIndex, excerpt, location: ourLocation from usfm-text-check.js line 1,082 + 601, "Unable to load", details: `username=$username error=$gcUHBerror`, OBSPathname, location: ourLocation, extra: OBSRepoName from orig-quote-check.js line 121 + 601, "Unable to load", details: `username=$username error=$gcUHBerror`, filename, location: ourLocation, extra: originalLanguageRepoName from orig-quote-check.js line 154 + 601, "Unable to load", details: `username=$username error=$gcUGNTerror`, filename, location: ourLocation, extra: originalLanguageRepoName from orig-quote-check.js line 162 600, `$regexResultsArray.length link target$regexResultsArray.length === 1 ? ' is' : 's are' still being checked…`, location: ourLocation from field-link-check.js line 171 583, "Unexpected newLine character", characterIndex, excerpt, location: ourLocation from field-text-check.js line 241 582, "Unexpected carriageReturn character", characterIndex, excerpt, location: ourLocation from field-text-check.js line 247 581, "Unexpected non-break space (uA0) character", characterIndex, excerpt, location: ourLocation from field-text-check.js line 253 580, "Unexpected narrow non-break space (u202F) character", excerpt, location: ourLocation ; from field-text-check.js line 259 - 555, "Possible missing chapter number in markdown Bible link", excerpt: totalLink, location: ourLocation from notes-links-check.js line 699 + 555, "Possible missing chapter number in markdown Bible link", excerpt: totalLink, location: ourLocation from notes-links-check.js line 708 552, C, V, "Invalid zero verse number", details: `for chapter $C`, rowID, lineNumber: n + 1, excerpt: V, location: ourLocation from tn-tsv9-table-check.js line 214 552, C, V, "Invalid zero verse number", details: `for chapter $C`, rowID, lineNumber: n + 1, excerpt: V, location: ourLocation from twl-tsv6-table-check.js line 203 552, C, V, "Invalid zero verse number", details: `for chapter $C`, rowID, lineNumber: n + 1, excerpt: V, location: ourLocation from notes-tsv7-table-check.js line 203 @@ -386,16 +387,15 @@ Got 490 notices: 519, "Missing expected USFM line", excerpt: `missing \\$expectedMarker`, location: fileLocation from usfm-text-check.js line 606 518, "Missing expected USFM line", excerpt: `missing \\$expectedMarker`, location: fileLocation from usfm-text-check.js line 614 517, "Missing expected USFM line", excerpt: `missing \\$expectedMarker`, location: fileLocation from usfm-text-check.js line 610 - 450, "Resource container link should have '*' language code", details: `not '$foundLanguageCode'`, characterIndex, excerpt, location: ourLocation from notes-links-check.js line 338 - 450, "Resource container link should have '*' language code", details: `not '$foundLanguageCode'`, characterIndex, excerpt, location: ourLocation from notes-links-check.js line 507 + 450, "Resource container link should have '*' language code", details: `not '$foundLanguageCode'`, characterIndex, excerpt, location: ourLocation from notes-links-check.js line 347 + 450, "Resource container link should have '*' language code", details: `not '$foundLanguageCode'`, characterIndex, excerpt, location: ourLocation from notes-links-check.js line 516 444, "Shouldn’t have consecutive word fields without a space", details: badCount > 1 ? details + `$badCount occurrences found in line` : details, lineNumber, C, V, characterIndex, excerpt, location: lineLocation from usfm-text-check.js line 648 441, `Unknown linkType parameter`, excerpt: linkType from field-link-check.js line 153 439, "Error fetching link", location: ` $fetchLink` from field-link-check.js line 45 438, `Blank field / missing link (expected $linkOptions.expectedCount link$linkOptions.expectedCount === 1 ? "" : "s")`, location: ourLocation from field-link-check.js line 125 - 401, `Unexpected content after \\$marker marker`, C, V, lineNumber, characterIndex: marker.length, excerpt: rest, location: lineLocation from usfm-text-check.js line 970 - 399, C, V, "Useless paragraph marker", lineNumber: n, characterIndex: 1, details: `'\\$lastMarker' before '\\$marker'`, location: ourLocation from usfm-text-check.js line 1,189 + 401, `Unexpected content after \\$marker marker`, C, V, lineNumber, characterIndex: marker.length, excerpt: rest, location: lineLocation from usfm-text-check.js line 994 + 399, C, V, "Useless paragraph marker", lineNumber: n, characterIndex: 1, details: `'\\$lastMarker' before '\\$marker'`, location: ourLocation from usfm-text-check.js line 1,216 378, `Possible mismatched '$thisField' markdown formatting pairs`, details: `$count.toLocaleString() total occurrence$count === 1 ? '' : 's'`, characterIndex, excerpt, location: ourLocation from markdown-text-check.js line 380 - 375, "Divider without surrounding snippet", location: ourLocation from orig-quote-check.js line 335 374, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1 ? '' : 's' found`, fieldName: 'TWLink', rowID, location: ourRowLocation from twl-tsv6-row-check.js line 395 374, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1 ? '' : 's' found`, fieldName: 'SupportReference', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 408 374, "Field contains zero-width space(s)", details: `$charCount occurrence$charCount === 1 ? '' : 's' found`, fieldName: 'GLQuote', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 450 @@ -411,9 +411,9 @@ Got 490 notices: 373, "Field is only whitespace", fieldName: 'Response', rowID, location: ourRowLocation from questions-tsv7-row-check.js line 478 373, "Field is only whitespace", fieldName: 'SupportReference', rowID, location: ourRowLocation from notes-tsv7-row-check.js line 450 373, "Field is only whitespace", fieldName: 'Note', rowID, location: ourRowLocation from notes-tsv7-row-check.js line 514 - 348, "Markdown image link has no title text", excerpt: totalLink, location: ourLocation from notes-links-check.js line 246 + 348, "Markdown image link has no title text", excerpt: totalLink, location: ourLocation from notes-links-check.js line 255 312, 'Possible unclosed footnote', details, lineNumber, C, V, location: lineLocation from usfm-text-check.js line 702 - 301, `Unexpected whitespace after \\$marker marker`, C, V, lineNumber, characterIndex: marker.length, excerpt: rest, location: lineLocation from usfm-text-check.js line 968 + 301, `Unexpected whitespace after \\$marker marker`, C, V, lineNumber, characterIndex: marker.length, excerpt: rest, location: lineLocation from usfm-text-check.js line 992 287, `Not enough links (expected $linkOptions.expectedCount link$linkOptions.expectedCount === 1 ? "" : "s")`, location: ` (only found $regexResultsArray.length)$ourLocation` from field-link-check.js line 167 282, "Nesting of header levels seems confused", details: `recent indent levels=$JSON.stringify(indentLevels) but now $numLeadingSpaces`, lineNumber: n, characterIndex: 0, location: ourLocation ; from markdown-text-check.js line 332 274, "Missing OccurrenceNote field", fieldName: 'OccurrenceNote', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 492 @@ -426,8 +426,8 @@ Got 490 notices: 250, "Multiple blank lines are not expected in markdown", lineNumber: n, location: ourLocation ; from markdown-text-check.js line 349 224, "Multiple unexpected double spaces", details: `$doubleCount occurrences—only first is displayed`, excerpt, location: ourLocation ; from field-text-check.js line 231 218, "Using deprecated USFM marker", excerpt: `\\$deprecatedMarker`, location: fileLocation from usfm-text-check.js line 617 - 199, "Markdown image link has no alternative text", excerpt: totalLink, location: ourLocation from notes-links-check.js line 225 - 199, "Markdown image link has no alternative text", excerpt: totalLink, location: ourLocation from notes-links-check.js line 244 + 199, "Markdown image link has no alternative text", excerpt: totalLink, location: ourLocation from notes-links-check.js line 234 + 199, "Markdown image link has no alternative text", excerpt: totalLink, location: ourLocation from notes-links-check.js line 253 195, `Unexpected $punctChar character at start of line`, characterIndex, excerpt, location: ourLocation from field-text-check.js line 324 193, `Unexpected $punctChar character at end of line`, excerpt, location: ourLocation ; from field-text-check.js line 360 192, `Unexpected space after $punctChar character`, excerpt, location: ourLocation ; from field-text-check.js line 342 @@ -452,19 +452,19 @@ Got 490 notices: 173, "Row ID characters should only be lowercase letters, digits, or hypen", fieldName: 'ID', characterIndex: 2, rowID, excerpt: rowID, location: ourRowLocation from questions-tsv7-row-check.js line 403 173, "Row ID characters should only be lowercase letters, digits, or hypen", fieldName: 'ID', characterIndex: 2, rowID, excerpt: rowID, location: ourRowLocation from notes-tsv7-row-check.js line 436 172, "Header levels should only increment by one", lineNumber: n, characterIndex: 0, location: ourLocation ; from markdown-text-check.js line 301 - 159, "Should use proper ellipse character (not periods)", characterIndex, excerpt, location: ourLocation from orig-quote-check.js line 259 - 158, `Unexpected space(s) beside divider $discontiguousDivider`, characterIndex, excerpt, location: ourLocation from orig-quote-check.js line 268 - 156, "Unexpected space(s) beside ellipse characters", characterIndex, excerpt, location: ourLocation from orig-quote-check.js line 282 - 152, "Should http link be https", excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,181 + 159, "Should use proper ellipse character (not periods)", characterIndex, excerpt, location: ourLocation from orig-quote-check.js line 383 + 158, `Unexpected space(s) beside divider $discontiguousDivider`, characterIndex, excerpt, location: ourLocation from orig-quote-check.js line 392 + 156, "Unexpected space(s) beside ellipse characters", characterIndex, excerpt, location: ourLocation from orig-quote-check.js line 406 + 152, "Should http link be https", excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,190 148, "'checking' key is missing", location: ourLocation from manifest-text-check.js line 676 - 144, "Unknown Bible book name in TN link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 1,090 - 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 630 - 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 689 - 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 826 - 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 877 - 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 935 - 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 985 - 143, "Unknown Bible book name in link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 1,037 + 144, "Unknown Bible book name in TN link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 1,099 + 143, "Unknown Bible book name in TN RC link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 639 + 143, "Unknown Bible book name in Bible link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 698 + 143, "Unknown Bible book name in relative Bible link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 835 + 143, "Unknown Bible book name in Bible link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 886 + 143, "Unknown Bible book name in Bible link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 944 + 143, "Unknown Bible book name in Bible link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 994 + 143, "Unknown Bible book name in Bible link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 1,046 138, "File ends with additional blank line(s)", characterIndex, excerpt, location: ourLocation from plain-text-check.js line 165 124, "Unexpected double spaces", excerpt, location: ourLocation ; from field-text-check.js line 229 111, `Bad options for checkFieldLinks: expectedCount=$linkOptions.expectedCount but allowedCount=$linkOptions.allowedCount` from field-link-check.js line 135 @@ -472,20 +472,20 @@ Got 490 notices: 109, `Unexpected leading space`, characterIndex: 0, excerpt, location: ourLocation from field-text-check.js line 144 107, "Unexpected leading line break", characterIndex: 0, excerpt, location: ourLocation from field-text-check.js line 183 104, "Unexpected trailing line break", characterIndex: fieldText.length - 1, excerpt, location: ourLocation from field-text-check.js line 216 - 103, `USFMGrammar: $warningString.trim()`, location from usfm-text-check.js line 1,230 + 103, `USFMGrammar: $warningString.trim()`, location from usfm-text-check.js line 1,257 102, `USFMGrammar: $warningString`, location: fileLocation from usfm-text-check.js line 253 - 101, `USFMGrammar: $warningString`, filename, location: ourLocation from BCS-usfm-grammar-check.js line 184 + 101, `USFMGrammar: $warningString`, filename, location: ourLocation from BCS-usfm-grammar-check.js line 203 95, "Unexpected trailing space(s)", excerpt, location: ourLocation ; from field-text-check.js line 195 94, "Unexpected trailing space(s) before break", characterIndex, excerpt, location: ourLocation from field-text-check.js line 203 93, "Unexpected trailing space(s) before line break", characterIndex, excerpt, location: ourLocation from field-text-check.js line 208 - 87, C, V, "Expected \\toc2 line to follow \\toc1", lineNumber: n, characterIndex: 1, details: `not '\\$lastMarker'`, location: ourLocation from usfm-text-check.js line 1,182 - 87, C, V, "Expected \\toc3 line to follow \\toc2", lineNumber: n, characterIndex: 1, details: `not '\\$lastMarker'`, location: ourLocation from usfm-text-check.js line 1,184 - 82, `Error loading general link`, details: "please double-check link—there may be no problem", excerpt: totalLink, location: `$ourLocation: $trcGCerror` from notes-links-check.js line 1,166 + 87, C, V, "Expected \\toc2 line to follow \\toc1", lineNumber: n, characterIndex: 1, details: `not '\\$lastMarker'`, location: ourLocation from usfm-text-check.js line 1,209 + 87, C, V, "Expected \\toc3 line to follow \\toc2", lineNumber: n, characterIndex: 1, details: `not '\\$lastMarker'`, location: ourLocation from usfm-text-check.js line 1,211 + 82, `Error loading general link`, details: "please double-check link—there may be no problem", excerpt: totalLink, location: `$ourLocation: $trcGCerror` from notes-links-check.js line 1,175 67, C: chapterNumberString, V: `$v`, "Verse appears to be left out", location: CVlocation from usfm-text-check.js line 473 64, "Unexpected leading space(s) after break", characterIndex, excerpt, location: ourLocation from field-text-check.js line 157 63, "Unexpected leading space(s) after line break", characterIndex, excerpt, location: ourLocation from field-text-check.js line 162 - 50, "Is this quote/occurrence correct???", details: `Occurrence=$occurrence`, excerpt: fieldText, location: ourLocation from orig-quote-check.js line 308 - 32, `Untested general/outside link`, details: "please manually double-check link—probably no problem", excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,147 + 50, "Is this quote/occurrence correct???", details: `Occurrence=$occurrence`, excerpt: fieldText, location: ourLocation from orig-quote-check.js line 432 + 32, `Untested general/outside link`, details: "please manually double-check link—probably no problem", excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,156 20, "Note that 'disableAllLinkFetchingFlag' was set so link targets were not checked", location: ourLocation from tn-tsv9-table-check.js line 264 20, "Note that 'disableAllLinkFetchingFlag' was set so link targets were not checked", location: ourLocation from twl-tsv6-table-check.js line 253 20, "Note that 'disableAllLinkFetchingFlag' was set so link targets were not checked", location: ourLocation from notes-tsv7-table-check.js line 253 diff --git a/package.json b/package.json index a9330f62..c50ea1e7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "uw-content-validation", "description": "Functions for Checking Door43.org Scriptural Content/Resources.", - "version": "2.1.3_alpha3", + "version": "2.1.3_alpha4", "private": false, "homepage": "https://unfoldingword.github.io/uw-content-validation/", "repository": { diff --git a/src/__tests__/__snapshots__/book-package-check.test.js.snap b/src/__tests__/__snapshots__/book-package-check.test.js.snap index 0721a45d..2fed162c 100644 --- a/src/__tests__/__snapshots__/book-package-check.test.js.snap +++ b/src/__tests__/__snapshots__/book-package-check.test.js.snap @@ -122,6 +122,40 @@ Object { "repoName": "hbo_uhb", "username": "unfoldingWord", }, + Object { + "C": "1", + "V": "8", + "bookID": "RUT", + "branch": "master", + "excerpt": "Q␣␣יַ֣עַשׂ*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 136, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected double spaces", + "priority": 124, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "1", + "V": "8", + "bookID": "RUT", + "branch": "master", + "excerpt": "Q יַ֣עַשׂ*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 136, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected * character at end of line", + "priority": 193, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, Object { "C": "1", "V": "19", @@ -176,6 +210,40 @@ Object { "repoName": "hbo_uhb", "username": "unfoldingWord", }, + Object { + "C": "2", + "V": "1", + "bookID": "RUT", + "branch": "master", + "excerpt": "K␣␣מידע*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 367, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected double spaces", + "priority": 124, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "2", + "V": "1", + "bookID": "RUT", + "branch": "master", + "excerpt": "K מידע*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 367, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected * character at end of line", + "priority": 193, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, Object { "C": "2", "V": "4", @@ -194,6 +262,398 @@ Object { "repoName": "hbo_uhb", "username": "unfoldingWord", }, + Object { + "C": "3", + "V": "3", + "bookID": "RUT", + "branch": "master", + "excerpt": "Q␣␣שִׂמְלֹת…", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 773, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected double spaces", + "priority": 124, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "3", + "V": "3", + "bookID": "RUT", + "branch": "master", + "excerpt": "…ְלֹתַ֛יִךְ*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 773, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected * character at end of line", + "priority": 193, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "3", + "V": "3", + "bookID": "RUT", + "branch": "master", + "excerpt": "K␣␣ו⁠ירדתי*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 776, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected double spaces", + "priority": 124, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "3", + "V": "3", + "bookID": "RUT", + "branch": "master", + "excerpt": "K ו⁠ירדתי*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 776, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected * character at end of line", + "priority": 193, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "3", + "V": "4", + "bookID": "RUT", + "branch": "master", + "excerpt": "K␣␣ו⁠שכבתי*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 796, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected double spaces", + "priority": 124, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "3", + "V": "4", + "bookID": "RUT", + "branch": "master", + "excerpt": "K ו⁠שכבתי*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 796, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected * character at end of line", + "priority": 193, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "3", + "V": "12", + "bookID": "RUT", + "branch": "master", + "details": "2 occurrences—only first is displayed", + "excerpt": "K␣␣כי*␣␣אם*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 898, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Multiple unexpected double spaces", + "priority": 224, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "3", + "V": "12", + "bookID": "RUT", + "branch": "master", + "excerpt": "K כי* אם*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 898, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected space after * character", + "priority": 192, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "3", + "V": "12", + "bookID": "RUT", + "branch": "master", + "excerpt": "K כי* אם*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 898, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected * character at end of line", + "priority": 193, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "3", + "V": "14", + "bookID": "RUT", + "branch": "master", + "excerpt": "K␣␣מרגלת⁠ו*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 927, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected double spaces", + "priority": 124, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "3", + "V": "14", + "bookID": "RUT", + "branch": "master", + "excerpt": "K מרגלת⁠ו*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 927, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected * character at end of line", + "priority": 193, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "3", + "V": "14", + "bookID": "RUT", + "branch": "master", + "excerpt": "Q␣␣ב⁠טרום*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 931, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected double spaces", + "priority": 124, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "3", + "V": "14", + "bookID": "RUT", + "branch": "master", + "excerpt": "Q ב⁠טרום*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 931, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected * character at end of line", + "priority": 193, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "3", + "V": "15", + "bookID": "RUT", + "branch": "master", + "excerpt": "Or␣perhaps␣␣וַתָּבֹא…", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 954, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected double spaces", + "priority": 124, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "3", + "V": "15", + "bookID": "RUT", + "branch": "master", + "excerpt": "… וַתָּבֹא*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 954, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected * character at end of line", + "priority": 193, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "4", + "V": "4", + "bookID": "RUT", + "branch": "master", + "excerpt": "Or␣perhaps␣␣תִגְאַל*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 1061, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected double spaces", + "priority": 124, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "4", + "V": "4", + "bookID": "RUT", + "branch": "master", + "excerpt": "…s תִגְאַל*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 1061, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected * character at end of line", + "priority": 193, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "4", + "V": "4", + "bookID": "RUT", + "branch": "master", + "excerpt": "Q␣␣וְאֵֽדְע…", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 1065, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected double spaces", + "priority": 124, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "4", + "V": "4", + "bookID": "RUT", + "branch": "master", + "excerpt": "…ְאֵֽדְעָה֙*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 1065, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected * character at end of line", + "priority": 193, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "4", + "V": "5", + "bookID": "RUT", + "branch": "master", + "excerpt": "K␣␣קניתי*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 1088, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected double spaces", + "priority": 124, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "4", + "V": "5", + "bookID": "RUT", + "branch": "master", + "excerpt": "K קניתי*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 1088, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected * character at end of line", + "priority": 193, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "4", + "V": "6", + "bookID": "RUT", + "branch": "master", + "excerpt": "Q␣␣לִגְאָל*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 1099, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected double spaces", + "priority": 124, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, + Object { + "C": "4", + "V": "6", + "bookID": "RUT", + "branch": "master", + "excerpt": "Q לִגְאָל*", + "extra": "UHB", + "fieldName": "from \\\\f", + "filename": "08-RUT.usfm", + "lineNumber": 1099, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Unexpected * character at end of line", + "priority": 193, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, Object { "C": "4", "V": "11", @@ -229,6 +689,18 @@ Object { "repoName": "hbo_uhb", "username": "unfoldingWord", }, + Object { + "bookID": "RUT", + "branch": "master", + "extra": "UHB", + "filename": "08-RUT.usfm", + "location": " in en RUT book package from unfoldingWord master branch", + "message": "USFMGrammar: Attribute value empty for lemma", + "priority": 102, + "repoCode": "UHB", + "repoName": "hbo_uhb", + "username": "unfoldingWord", + }, Object { "details": "username=unfoldingWord", "extra": "TWL", @@ -434,6 +906,18 @@ Object { "repoName": "en_ult", "username": "unfoldingWord", }, + Object { + "bookID": "RUT", + "branch": "master", + "extra": "LT", + "filename": "08-RUT.usfm", + "location": " in en RUT book package from unfoldingWord master branch", + "message": "USFMGrammar: Attribute value empty for x-lemma", + "priority": 102, + "repoCode": "LT", + "repoName": "en_ult", + "username": "unfoldingWord", + }, Object { "C": "1", "V": "3", @@ -4324,6 +4808,50 @@ Object { "repoName": "en_ust", "username": "unfoldingWord", }, + Object { + "bookID": "RUT", + "branch": "master", + "extra": "ST", + "filename": "08-RUT.usfm", + "location": " in en RUT book package from unfoldingWord master branch", + "message": "USFMGrammar: Attribute value empty for x-lemma", + "priority": 102, + "repoCode": "ST", + "repoName": "en_ust", + "username": "unfoldingWord", + }, + Object { + "bookID": "RUT", + "branch": "master", + "extra": "ST", + "filename": "08-RUT.usfm", + "location": " in en RUT book package from unfoldingWord master branch", + "message": "USFMGrammar: Attribute value empty for x-morph", + "priority": 102, + "repoCode": "ST", + "repoName": "en_ust", + "username": "unfoldingWord", + }, + Object { + "C": "1", + "V": "4", + "bookID": "RUT", + "branch": "master", + "characterIndex": 20, + "details": "end part of quote = \\"וְ⁠שֵׁ֥ם הַ⁠שֵּׁנִ֖י\\" -- passage ►וַ⁠יִּשְׂא֣וּ לָ⁠הֶ֗ם נָשִׁים֙ מֹֽאֲבִיּ֔וֹת שֵׁ֤ם הָֽ⁠אַחַת֙ עָרְפָּ֔ה וְ⁠שֵׁ֥ם הַ⁠שֵּׁנִ֖ית ר֑וּת וַ⁠יֵּ֥שְׁבוּ שָׁ֖ם כְּ⁠עֶ֥שֶׂר שָׁנִֽים׃◄", + "excerpt": "…שֵׁ֥ם הַ⁠שֵּׁנִ֖י(ת=D1514/H5ea)", + "extra": "TN", + "fieldName": "OrigQuote", + "filename": "en_tn_08-RUT.tsv", + "lineNumber": 12, + "location": " in en RUT book package from unfoldingWord master branch", + "message": "Seems original language quote might not finish at the end of a word", + "priority": 908, + "repoCode": "TN", + "repoName": "en_tn", + "rowID": "aee6", + "username": "unfoldingWord", + }, Object { "C": "1", "V": "6", diff --git a/src/__tests__/__snapshots__/tn-table-row-check.test.js.snap b/src/__tests__/__snapshots__/tn-table-row-check.test.js.snap index d4d06557..dbe261fe 100644 --- a/src/__tests__/__snapshots__/tn-table-row-check.test.js.snap +++ b/src/__tests__/__snapshots__/tn-table-row-check.test.js.snap @@ -41,7 +41,7 @@ Object { "bookID": "GEN", "fieldName": "OrigQuote", "location": " that was supplied", - "message": "Missing Quote field", + "message": "Missing OrigQuote field", "priority": 919, "rowID": "w3r5", }, @@ -528,7 +528,7 @@ Object { "bookID": "GEN", "fieldName": "OrigQuote", "location": " that was supplied", - "message": "Missing Quote field", + "message": "Missing OrigQuote field", "priority": 919, "rowID": "a7qw", }, @@ -912,7 +912,7 @@ Object { "C": "1", "V": "9", "bookID": "GEN", - "details": "linked from OccurrenceNote", + "details": "unfoldingWord en_ta master translate/figs-activepassivez/01.md", "excerpt": "[[rc://*/ta/man/translate/figs-activepassivez]]", "fieldName": "OccurrenceNote", "lineNumber": 1, @@ -1002,7 +1002,7 @@ Object { "C": "1", "V": "9", "bookID": "GEN", - "details": "linked from OccurrenceNote", + "details": "unfoldingWord en_ta master translate/figs-imperativez/01.md", "excerpt": "[[rc://*/ta/man/translate/figs-imperativez]]", "fieldName": "OccurrenceNote", "lineNumber": 1, @@ -1208,7 +1208,7 @@ Object { "bookID": "GEN", "fieldName": "OrigQuote", "location": " that was supplied", - "message": "Missing Quote field", + "message": "Missing OrigQuote field", "priority": 919, "rowID": "W-3r5", }, @@ -1309,7 +1309,7 @@ Object { "bookID": "GEN", "fieldName": "OrigQuote", "location": " that was supplied", - "message": "Missing Quote field", + "message": "Missing OrigQuote field", "priority": 919, "rowID": "w3r5", }, diff --git a/src/core/BCS-usfm-grammar-check.js b/src/core/BCS-usfm-grammar-check.js index 86af58c5..3ad4e3c6 100644 --- a/src/core/BCS-usfm-grammar-check.js +++ b/src/core/BCS-usfm-grammar-check.js @@ -41,7 +41,7 @@ export function runBCSGrammarCheck(strictnessString, fileText, filename, givenLo // debugLog(`${new Date().getTime() / 1000} Got the USFMGrammar checker toJSON _messages: ${Object.keys(parserToJSONResultObject._messages)}`); // debugLog(`${new Date().getTime() / 1000} Got the USFMGrammar checker: ${Object.keys(ourUsfmParser)}`); parseWarnings = parserToJSONResultObject._warnings ? parserToJSONResultObject._warnings : ourUsfmParser.warnings; - debugLog(`${new Date().getTime() / 1000} Got the warnings from the USFMGrammar checker: (${parseWarnings.length}) ${parseWarnings}`); + debugLog(`${new Date().getTime() / 1000} Got warnings from the USFMGrammar checker: (${parseWarnings.length}) ${parseWarnings}`); } catch (parserError) { // This is how the Parser returns USFM errors, i.e., it stops after the first error debugLog(`${new Date().getTime() / 1000} Got an exception when using the USFMGrammar checker: ${parserError}`); const ourErrorObject = { diff --git a/yarn.lock b/yarn.lock index 5b11474e..165ab6aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3,9 +3,9 @@ "@babel/cli@^7.12.1": - version "7.13.16" - resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.13.16.tgz#9d372e943ced0cc291f068204a9b010fd9cfadbc" - integrity sha512-cL9tllhqvsQ6r1+d9Invf7nNXg/3BlfL1vvvL/AdH9fZ2l5j0CeBcoq6UjsqHpvyN1v5nXSZgqJZoGeK+ZOAbw== + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.14.3.tgz#9f6c8aee12e8660df879610f19a8010958b26a6f" + integrity sha512-zU4JLvwk32ay1lhhyGfqiRUSPoltVDjhYkA3aQq8+Yby9z30s/EsFw1EPOHxWG9YZo2pAGfgdRNeHZQAYU5m9A== dependencies: commander "^4.0.1" convert-source-map "^1.1.0" @@ -39,7 +39,7 @@ dependencies: "@babel/highlight" "^7.12.13" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.13.15", "@babel/compat-data@^7.13.8", "@babel/compat-data@^7.14.0", "@babel/compat-data@^7.9.0": +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.13.15", "@babel/compat-data@^7.14.0", "@babel/compat-data@^7.9.0": version "7.14.0" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz#a901128bce2ad02565df95e6ecbf195cf9465919" integrity sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q== @@ -67,19 +67,19 @@ source-map "^0.5.0" "@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.4.5", "@babel/core@^7.7.5": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.0.tgz#47299ff3ec8d111b493f1a9d04bf88c04e728d88" - integrity sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw== + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.3.tgz#5395e30405f0776067fbd9cf0884f15bfb770a38" + integrity sha512-jB5AmTKOCSJIZ72sd78ECEhuPiDMKlQdDI/4QRI6lzYATx5SSogS1oQA2AoPecRCknm30gHi2l+QVvNUu3wZAg== dependencies: "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.14.0" + "@babel/generator" "^7.14.3" "@babel/helper-compilation-targets" "^7.13.16" - "@babel/helper-module-transforms" "^7.14.0" + "@babel/helper-module-transforms" "^7.14.2" "@babel/helpers" "^7.14.0" - "@babel/parser" "^7.14.0" + "@babel/parser" "^7.14.3" "@babel/template" "^7.12.13" - "@babel/traverse" "^7.14.0" - "@babel/types" "^7.14.0" + "@babel/traverse" "^7.14.2" + "@babel/types" "^7.14.2" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -87,12 +87,12 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.14.0", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0": - version "7.14.1" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.1.tgz#1f99331babd65700183628da186f36f63d615c93" - integrity sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ== +"@babel/generator@^7.14.2", "@babel/generator@^7.14.3", "@babel/generator@^7.4.0", "@babel/generator@^7.9.0": + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.3.tgz#0c2652d91f7bddab7cccc6ba8157e4f40dcedb91" + integrity sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA== dependencies: - "@babel/types" "^7.14.1" + "@babel/types" "^7.14.2" jsesc "^2.5.1" source-map "^0.5.0" @@ -111,7 +111,7 @@ "@babel/helper-explode-assignable-expression" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.13.8", "@babel/helper-compilation-targets@^7.8.7": +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.8.7": version "7.13.16" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c" integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA== @@ -121,22 +121,22 @@ browserslist "^4.14.5" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.14.0", "@babel/helper-create-class-features-plugin@^7.8.3": - version "7.14.1" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.1.tgz#1fe11b376f3c41650ad9fedc665b0068722ea76c" - integrity sha512-r8rsUahG4ywm0QpGcCrLaUSOuNAISR3IZCg4Fx05Ozq31aCUrQsTLH6KPxy0N5ULoQ4Sn9qjNdGNtbPWAC6hYg== +"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.14.0", "@babel/helper-create-class-features-plugin@^7.14.3", "@babel/helper-create-class-features-plugin@^7.8.3": + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.3.tgz#832111bcf4f57ca57a4c5b1a000fc125abc6554a" + integrity sha512-BnEfi5+6J2Lte9LeiL6TxLWdIlEv9Woacc1qXzXBgbikcOzMRM2Oya5XGg/f/ngotv1ej2A/b+3iJH8wbS1+lQ== dependencies: "@babel/helper-annotate-as-pure" "^7.12.13" - "@babel/helper-function-name" "^7.12.13" + "@babel/helper-function-name" "^7.14.2" "@babel/helper-member-expression-to-functions" "^7.13.12" "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/helper-replace-supers" "^7.13.12" + "@babel/helper-replace-supers" "^7.14.3" "@babel/helper-split-export-declaration" "^7.12.13" "@babel/helper-create-regexp-features-plugin@^7.12.13": - version "7.12.17" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz#a2ac87e9e319269ac655b8d4415e94d38d663cb7" - integrity sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg== + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.3.tgz#149aa6d78c016e318c43e2409a0ae9c136a86688" + integrity sha512-JIB2+XJrb7v3zceV2XzDhGIB902CmKGSpSl4q2C6agU9SNLG/2V1RtFRGPG1Ajh9STj3+q6zJMOC+N/pp2P9DA== dependencies: "@babel/helper-annotate-as-pure" "^7.12.13" regexpu-core "^4.7.1" @@ -162,14 +162,14 @@ dependencies: "@babel/types" "^7.13.0" -"@babel/helper-function-name@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a" - integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA== +"@babel/helper-function-name@^7.12.13", "@babel/helper-function-name@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz#397688b590760b6ef7725b5f0860c82427ebaac2" + integrity sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ== dependencies: "@babel/helper-get-function-arity" "^7.12.13" "@babel/template" "^7.12.13" - "@babel/types" "^7.12.13" + "@babel/types" "^7.14.2" "@babel/helper-get-function-arity@^7.12.13": version "7.12.13" @@ -200,10 +200,10 @@ dependencies: "@babel/types" "^7.13.12" -"@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.14.0", "@babel/helper-module-transforms@^7.9.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz#8fcf78be220156f22633ee204ea81f73f826a8ad" - integrity sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw== +"@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.14.0", "@babel/helper-module-transforms@^7.14.2", "@babel/helper-module-transforms@^7.9.0": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz#ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5" + integrity sha512-OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA== dependencies: "@babel/helper-module-imports" "^7.13.12" "@babel/helper-replace-supers" "^7.13.12" @@ -211,8 +211,8 @@ "@babel/helper-split-export-declaration" "^7.12.13" "@babel/helper-validator-identifier" "^7.14.0" "@babel/template" "^7.12.13" - "@babel/traverse" "^7.14.0" - "@babel/types" "^7.14.0" + "@babel/traverse" "^7.14.2" + "@babel/types" "^7.14.2" "@babel/helper-optimise-call-expression@^7.12.13": version "7.12.13" @@ -235,15 +235,15 @@ "@babel/helper-wrap-function" "^7.13.0" "@babel/types" "^7.13.0" -"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0", "@babel/helper-replace-supers@^7.13.12": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804" - integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw== +"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.12", "@babel/helper-replace-supers@^7.14.3": + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz#ca17b318b859d107f0e9b722d58cf12d94436600" + integrity sha512-Rlh8qEWZSTfdz+tgNV/N4gz1a0TMNwCUcENhMjHTHKp3LseYH5Jha0NSlyTQWMnjbYcwFt+bqAMqSLHVXkQ6UA== dependencies: "@babel/helper-member-expression-to-functions" "^7.13.12" "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.12" + "@babel/traverse" "^7.14.2" + "@babel/types" "^7.14.2" "@babel/helper-simple-access@^7.13.12": version "7.13.12" @@ -304,10 +304,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0": - version "7.14.1" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.1.tgz#1bd644b5db3f5797c4479d89ec1817fe02b84c47" - integrity sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.2", "@babel/parser@^7.14.3", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0": + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.3.tgz#9b530eecb071fd0c93519df25c5ff9f14759f298" + integrity sha512-7MpZDIfI7sUC5zWo2+foJ50CSI5lcqDehZ0lVgIhSi4bFEk94fLAKlF3Q0nzSQQ+ca0lm+O6G9ztKVBeu8PMRQ== "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12": version "7.13.12" @@ -318,10 +318,10 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" "@babel/plugin-proposal-optional-chaining" "^7.13.12" -"@babel/plugin-proposal-async-generator-functions@^7.13.15", "@babel/plugin-proposal-async-generator-functions@^7.8.3": - version "7.13.15" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz#80e549df273a3b3050431b148c892491df1bcc5b" - integrity sha512-VapibkWzFeoa6ubXy/NgV5U2U4MVnUlvnx6wo1XhlsaTrLYWE0UFpDQsVrmn22q5CzeloqJ8gEMHSKxuee6ZdA== +"@babel/plugin-proposal-async-generator-functions@^7.14.2", "@babel/plugin-proposal-async-generator-functions@^7.8.3": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.2.tgz#3a2085abbf5d5f962d480dbc81347385ed62eb1e" + integrity sha512-b1AM4F6fwck4N8ItZ/AtC4FP/cqZqmKRQ4FaTDutwSYyjuhtvsGEMLK4N/ztV/ImP40BjIDyMgBQAeAMsQYVFQ== dependencies: "@babel/helper-plugin-utils" "^7.13.0" "@babel/helper-remap-async-to-generator" "^7.13.0" @@ -344,10 +344,11 @@ "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-proposal-class-static-block@^7.13.11": - version "7.13.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.13.11.tgz#6fcbba4a962702c17e5371a0c7b39afde186d703" - integrity sha512-fJTdFI4bfnMjvxJyNuaf8i9mVcZ0UhetaGEUHaHV9KEnibLugJkZAtXikR8KcYj+NYmI4DZMS8yQAyg+hvfSqg== + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.3.tgz#5a527e2cae4a4753119c3a3e7f64ecae8ccf1360" + integrity sha512-HEjzp5q+lWSjAgJtSluFDrGGosmwTgKwCXdDQZvhKsRlwv3YdkUEqxNrrjesJd+B9E9zvr1PVPVBvhYZ9msjvQ== dependencies: + "@babel/helper-create-class-features-plugin" "^7.14.3" "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-syntax-class-static-block" "^7.12.13" @@ -360,34 +361,34 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-decorators" "^7.8.3" -"@babel/plugin-proposal-dynamic-import@^7.13.8", "@babel/plugin-proposal-dynamic-import@^7.8.3": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz#876a1f6966e1dec332e8c9451afda3bebcdf2e1d" - integrity sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ== +"@babel/plugin-proposal-dynamic-import@^7.14.2", "@babel/plugin-proposal-dynamic-import@^7.8.3": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.2.tgz#01ebabd7c381cff231fa43e302939a9de5be9d9f" + integrity sha512-oxVQZIWFh91vuNEMKltqNsKLFWkOIyJc95k2Gv9lWVyDfPUQGSSlbDEgWuJUU1afGE9WwlzpucMZ3yDRHIItkA== dependencies: "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-proposal-export-namespace-from@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz#393be47a4acd03fa2af6e3cde9b06e33de1b446d" - integrity sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw== +"@babel/plugin-proposal-export-namespace-from@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.2.tgz#62542f94aa9ce8f6dba79eec698af22112253791" + integrity sha512-sRxW3z3Zp3pFfLAgVEvzTFutTXax837oOatUIvSG9o5gRj9mKwm3br1Se5f4QalTQs9x4AzlA/HrCWbQIHASUQ== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-proposal-json-strings@^7.13.8", "@babel/plugin-proposal-json-strings@^7.8.3": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz#bf1fb362547075afda3634ed31571c5901afef7b" - integrity sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q== +"@babel/plugin-proposal-json-strings@^7.14.2", "@babel/plugin-proposal-json-strings@^7.8.3": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.2.tgz#830b4e2426a782e8b2878fbfe2cba85b70cbf98c" + integrity sha512-w2DtsfXBBJddJacXMBhElGEYqCZQqN99Se1qeYn8DVLB33owlrlLftIbMzn5nz1OITfDVknXF433tBrLEAOEjA== dependencies: "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-proposal-logical-assignment-operators@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz#93fa78d63857c40ce3c8c3315220fd00bfbb4e1a" - integrity sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A== +"@babel/plugin-proposal-logical-assignment-operators@^7.14.2": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.2.tgz#222348c080a1678e0e74ea63fe76f275882d1fd7" + integrity sha512-1JAZtUrqYyGsS7IDmFeaem+/LJqujfLZ2weLR9ugB0ufUPjzf8cguyVT1g5im7f7RXxuLq1xUxEzvm68uYRtGg== dependencies: "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" @@ -400,10 +401,10 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" -"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz#3730a31dafd3c10d8ccd10648ed80a2ac5472ef3" - integrity sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A== +"@babel/plugin-proposal-nullish-coalescing-operator@^7.14.2", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.2.tgz#425b11dc62fc26939a2ab42cbba680bdf5734546" + integrity sha512-ebR0zU9OvI2N4qiAC38KIAK75KItpIPTpAtd2r4OZmMFeKbKJpUFLYP2EuDut82+BmYi8sz42B+TfTptJ9iG5Q== dependencies: "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" @@ -416,29 +417,29 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-numeric-separator" "^7.8.3" -"@babel/plugin-proposal-numeric-separator@^7.12.13", "@babel/plugin-proposal-numeric-separator@^7.8.3": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db" - integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w== +"@babel/plugin-proposal-numeric-separator@^7.14.2", "@babel/plugin-proposal-numeric-separator@^7.8.3": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.2.tgz#82b4cc06571143faf50626104b335dd71baa4f9e" + integrity sha512-DcTQY9syxu9BpU3Uo94fjCB3LN9/hgPS8oUL7KrSW3bA2ePrKZZPJcc5y0hoJAM9dft3pGfErtEUvxXQcfLxUg== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.13.8", "@babel/plugin-proposal-object-rest-spread@^7.9.0": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz#5d210a4d727d6ce3b18f9de82cc99a3964eed60a" - integrity sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g== +"@babel/plugin-proposal-object-rest-spread@^7.14.2", "@babel/plugin-proposal-object-rest-spread@^7.9.0": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.2.tgz#e17d418f81cc103fedd4ce037e181c8056225abc" + integrity sha512-hBIQFxwZi8GIp934+nj5uV31mqclC1aYDhctDu5khTi9PCCUOczyy0b34W0oE9U/eJXiqQaKyVsmjeagOaSlbw== dependencies: - "@babel/compat-data" "^7.13.8" - "@babel/helper-compilation-targets" "^7.13.8" + "@babel/compat-data" "^7.14.0" + "@babel/helper-compilation-targets" "^7.13.16" "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.13.0" + "@babel/plugin-transform-parameters" "^7.14.2" -"@babel/plugin-proposal-optional-catch-binding@^7.13.8", "@babel/plugin-proposal-optional-catch-binding@^7.8.3": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz#3ad6bd5901506ea996fc31bdcf3ccfa2bed71107" - integrity sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA== +"@babel/plugin-proposal-optional-catch-binding@^7.14.2", "@babel/plugin-proposal-optional-catch-binding@^7.8.3": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.2.tgz#150d4e58e525b16a9a1431bd5326c4eed870d717" + integrity sha512-XtkJsmJtBaUbOxZsNk0Fvrv8eiqgneug0A6aqLFZ4TSkar2L5dSXWcnUKHgmjJt49pyB/6ZHvkr3dPgl9MOWRQ== dependencies: "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" @@ -451,10 +452,10 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-optional-chaining" "^7.8.0" -"@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.9.0": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz#ba9feb601d422e0adea6760c2bd6bbb7bfec4866" - integrity sha512-fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ== +"@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.14.2", "@babel/plugin-proposal-optional-chaining@^7.9.0": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.2.tgz#df8171a8b9c43ebf4c1dabe6311b432d83e1b34e" + integrity sha512-qQByMRPwMZJainfig10BoaDldx/+VDtNcrA7qdNaEOAj6VXud+gfrkA8j4CRAU5HjnWREXqIpSpH30qZX1xivA== dependencies: "@babel/helper-plugin-utils" "^7.13.0" "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" @@ -649,23 +650,23 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-block-scoping@^7.14.1", "@babel/plugin-transform-block-scoping@^7.8.3": - version "7.14.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.1.tgz#ac1b3a8e3d8cbb31efc6b9be2f74eb9823b74ab2" - integrity sha512-2mQXd0zBrwfp0O1moWIhPpEeTKDvxyHcnma3JATVP1l+CctWBuot6OJG8LQ4DnBj4ZZPSmlb/fm4mu47EOAnVA== +"@babel/plugin-transform-block-scoping@^7.14.2", "@babel/plugin-transform-block-scoping@^7.8.3": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.2.tgz#761cb12ab5a88d640ad4af4aa81f820e6b5fdf5c" + integrity sha512-neZZcP19NugZZqNwMTH+KoBjx5WyvESPSIOQb4JHpfd+zPfqcH65RMu5xJju5+6q/Y2VzYrleQTr+b6METyyxg== dependencies: "@babel/helper-plugin-utils" "^7.13.0" -"@babel/plugin-transform-classes@^7.13.0", "@babel/plugin-transform-classes@^7.9.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz#0265155075c42918bf4d3a4053134176ad9b533b" - integrity sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g== +"@babel/plugin-transform-classes@^7.14.2", "@babel/plugin-transform-classes@^7.9.0": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.2.tgz#3f1196c5709f064c252ad056207d87b7aeb2d03d" + integrity sha512-7oafAVcucHquA/VZCsXv/gmuiHeYd64UJyyTYU+MPfNu0KeNlxw06IeENBO8bJjXVbolu+j1MM5aKQtH1OMCNg== dependencies: "@babel/helper-annotate-as-pure" "^7.12.13" - "@babel/helper-function-name" "^7.12.13" + "@babel/helper-function-name" "^7.14.2" "@babel/helper-optimise-call-expression" "^7.12.13" "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-replace-supers" "^7.13.0" + "@babel/helper-replace-supers" "^7.13.12" "@babel/helper-split-export-declaration" "^7.12.13" globals "^11.1.0" @@ -743,12 +744,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-modules-amd@^7.14.0", "@babel/plugin-transform-modules-amd@^7.9.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.0.tgz#589494b5b290ff76cf7f59c798011f6d77026553" - integrity sha512-CF4c5LX4LQ03LebQxJ5JZes2OYjzBuk1TdiF7cG7d5dK4lAdw9NZmaxq5K/mouUdNeqwz3TNjnW6v01UqUNgpQ== +"@babel/plugin-transform-modules-amd@^7.14.2", "@babel/plugin-transform-modules-amd@^7.9.0": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.2.tgz#6622806fe1a7c07a1388444222ef9535f2ca17b0" + integrity sha512-hPC6XBswt8P3G2D1tSV2HzdKvkqOpmbyoy+g73JG0qlF/qx2y3KaMmXb1fLrpmWGLZYA0ojCvaHdzFWjlmV+Pw== dependencies: - "@babel/helper-module-transforms" "^7.14.0" + "@babel/helper-module-transforms" "^7.14.2" "@babel/helper-plugin-utils" "^7.13.0" babel-plugin-dynamic-import-node "^2.3.3" @@ -803,10 +804,10 @@ "@babel/helper-plugin-utils" "^7.12.13" "@babel/helper-replace-supers" "^7.12.13" -"@babel/plugin-transform-parameters@^7.13.0", "@babel/plugin-transform-parameters@^7.8.7": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz#8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007" - integrity sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw== +"@babel/plugin-transform-parameters@^7.14.2", "@babel/plugin-transform-parameters@^7.8.7": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.2.tgz#e4290f72e0e9e831000d066427c4667098decc31" + integrity sha512-NxoVmA3APNCC1JdMXkdYXuQS+EMdqy0vIwyDHeKHiJKRxmp1qGSdb0JLEIoPRhkx6H/8Qi3RJ3uqOCYw8giy9A== dependencies: "@babel/helper-plugin-utils" "^7.13.0" @@ -832,11 +833,11 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-transform-react-display-name@^7.12.13", "@babel/plugin-transform-react-display-name@^7.8.3": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz#c28effd771b276f4647411c9733dbb2d2da954bd" - integrity sha512-MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA== + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.2.tgz#2e854544d42ab3bb9c21f84e153d62e800fbd593" + integrity sha512-zCubvP+jjahpnFJvPaHPiGVfuVUjXHhFvJKQdNnsmSsiU9kR/rCZ41jHc++tERD2zV+p7Hr6is+t5b6iWTCqSw== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-transform-react-jsx-development@^7.12.17", "@babel/plugin-transform-react-jsx-development@^7.9.0": version "7.12.17" @@ -853,22 +854,22 @@ "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-react-jsx-source@^7.9.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.13.tgz#051d76126bee5c9a6aa3ba37be2f6c1698856bcb" - integrity sha512-O5JJi6fyfih0WfDgIJXksSPhGP/G0fQpfxYy87sDc+1sFmsCS6wr3aAn+whbzkhbjtq4VMqLRaSzR6IsshIC0Q== + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.14.2.tgz#2620b57e7de775c0687f65d464026d15812941da" + integrity sha512-OMorspVyjxghAjzgeAWc6O7W7vHbJhV69NeTGdl9Mxgz6PaweAuo7ffB9T5A1OQ9dGcw0As4SYMUhyNC4u7mVg== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-transform-react-jsx@^7.12.17", "@babel/plugin-transform-react-jsx@^7.13.12", "@babel/plugin-transform-react-jsx@^7.9.1": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.13.12.tgz#1df5dfaf0f4b784b43e96da6f28d630e775f68b3" - integrity sha512-jcEI2UqIcpCqB5U5DRxIl0tQEProI2gcu+g8VTIqxLO5Iidojb4d77q+fwGseCvd8af/lJ9masp4QWzBXFE2xA== + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.3.tgz#0e26597805cf0862da735f264550933c38babb66" + integrity sha512-uuxuoUNVhdgYzERiHHFkE4dWoJx+UFVyuAl0aqN8P2/AKFHwqgUC5w2+4/PjpKXJsFgBlYAFXlUmDQ3k3DUkXw== dependencies: "@babel/helper-annotate-as-pure" "^7.12.13" "@babel/helper-module-imports" "^7.13.12" "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-syntax-jsx" "^7.12.13" - "@babel/types" "^7.13.12" + "@babel/types" "^7.14.2" "@babel/plugin-transform-react-pure-annotations@^7.12.1": version "7.12.1" @@ -903,9 +904,9 @@ semver "^5.5.1" "@babel/plugin-transform-runtime@^7.12.1": - version "7.13.15" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.15.tgz#2eddf585dd066b84102517e10a577f24f76a9cd7" - integrity sha512-d+ezl76gx6Jal08XngJUkXM4lFXK/5Ikl9Mh4HKDxSfGJXmZ9xG64XT2oivBzfxb/eQ62VfvoMkaCZUKJMVrBA== + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.3.tgz#1fd885a2d0de1d3c223795a4e9be72c2db4515cf" + integrity sha512-t960xbi8wpTFE623ef7sd+UpEC5T6EEguQlTBJDEO05+XwnIWVfuqLw/vdLWY6IdFmtZE+65CZAfByT39zRpkg== dependencies: "@babel/helper-module-imports" "^7.13.12" "@babel/helper-plugin-utils" "^7.13.0" @@ -951,11 +952,11 @@ "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-typescript@^7.9.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz#4a498e1f3600342d2a9e61f60131018f55774853" - integrity sha512-elQEwluzaU8R8dbVuW2Q2Y8Nznf7hnjM7+DSCd14Lo5fF63C9qNLbwZYbmZrtV9/ySpSUpkRpQXvJb6xyu4hCQ== + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.3.tgz#44f67f725a60cccee33d9d6fee5e4f338258f34f" + integrity sha512-G5Bb5pY6tJRTC4ag1visSgiDoGgJ1u1fMUgmc2ijLkcIdzP83Q1qyZX4ggFQ/SkR+PNOatkaYC+nKcTlpsX4ag== dependencies: - "@babel/helper-create-class-features-plugin" "^7.13.0" + "@babel/helper-create-class-features-plugin" "^7.14.3" "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-syntax-typescript" "^7.12.13" @@ -1041,27 +1042,27 @@ semver "^5.5.0" "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.4.5": - version "7.14.1" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.1.tgz#b55914e2e68885ea03f69600b2d3537e54574a93" - integrity sha512-0M4yL1l7V4l+j/UHvxcdvNfLB9pPtIooHTbEhgD/6UGyh8Hy3Bm1Mj0buzjDXATCSz3JFibVdnoJZCrlUCanrQ== + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.2.tgz#e80612965da73579c84ad2f963c2359c71524ed5" + integrity sha512-7dD7lVT8GMrE73v4lvDEb85cgcQhdES91BSD7jS/xjC6QY8PnRhux35ac+GCpbiRhp8crexBvZZqnaL6VrY8TQ== dependencies: "@babel/compat-data" "^7.14.0" "@babel/helper-compilation-targets" "^7.13.16" "@babel/helper-plugin-utils" "^7.13.0" "@babel/helper-validator-option" "^7.12.17" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.13.12" - "@babel/plugin-proposal-async-generator-functions" "^7.13.15" + "@babel/plugin-proposal-async-generator-functions" "^7.14.2" "@babel/plugin-proposal-class-properties" "^7.13.0" "@babel/plugin-proposal-class-static-block" "^7.13.11" - "@babel/plugin-proposal-dynamic-import" "^7.13.8" - "@babel/plugin-proposal-export-namespace-from" "^7.12.13" - "@babel/plugin-proposal-json-strings" "^7.13.8" - "@babel/plugin-proposal-logical-assignment-operators" "^7.13.8" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8" - "@babel/plugin-proposal-numeric-separator" "^7.12.13" - "@babel/plugin-proposal-object-rest-spread" "^7.13.8" - "@babel/plugin-proposal-optional-catch-binding" "^7.13.8" - "@babel/plugin-proposal-optional-chaining" "^7.13.12" + "@babel/plugin-proposal-dynamic-import" "^7.14.2" + "@babel/plugin-proposal-export-namespace-from" "^7.14.2" + "@babel/plugin-proposal-json-strings" "^7.14.2" + "@babel/plugin-proposal-logical-assignment-operators" "^7.14.2" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.2" + "@babel/plugin-proposal-numeric-separator" "^7.14.2" + "@babel/plugin-proposal-object-rest-spread" "^7.14.2" + "@babel/plugin-proposal-optional-catch-binding" "^7.14.2" + "@babel/plugin-proposal-optional-chaining" "^7.14.2" "@babel/plugin-proposal-private-methods" "^7.13.0" "@babel/plugin-proposal-private-property-in-object" "^7.14.0" "@babel/plugin-proposal-unicode-property-regex" "^7.12.13" @@ -1082,8 +1083,8 @@ "@babel/plugin-transform-arrow-functions" "^7.13.0" "@babel/plugin-transform-async-to-generator" "^7.13.0" "@babel/plugin-transform-block-scoped-functions" "^7.12.13" - "@babel/plugin-transform-block-scoping" "^7.14.1" - "@babel/plugin-transform-classes" "^7.13.0" + "@babel/plugin-transform-block-scoping" "^7.14.2" + "@babel/plugin-transform-classes" "^7.14.2" "@babel/plugin-transform-computed-properties" "^7.13.0" "@babel/plugin-transform-destructuring" "^7.13.17" "@babel/plugin-transform-dotall-regex" "^7.12.13" @@ -1093,14 +1094,14 @@ "@babel/plugin-transform-function-name" "^7.12.13" "@babel/plugin-transform-literals" "^7.12.13" "@babel/plugin-transform-member-expression-literals" "^7.12.13" - "@babel/plugin-transform-modules-amd" "^7.14.0" + "@babel/plugin-transform-modules-amd" "^7.14.2" "@babel/plugin-transform-modules-commonjs" "^7.14.0" "@babel/plugin-transform-modules-systemjs" "^7.13.8" "@babel/plugin-transform-modules-umd" "^7.14.0" "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13" "@babel/plugin-transform-new-target" "^7.12.13" "@babel/plugin-transform-object-super" "^7.12.13" - "@babel/plugin-transform-parameters" "^7.13.0" + "@babel/plugin-transform-parameters" "^7.14.2" "@babel/plugin-transform-property-literals" "^7.12.13" "@babel/plugin-transform-regenerator" "^7.13.15" "@babel/plugin-transform-reserved-words" "^7.12.13" @@ -1112,7 +1113,7 @@ "@babel/plugin-transform-unicode-escapes" "^7.12.13" "@babel/plugin-transform-unicode-regex" "^7.12.13" "@babel/preset-modules" "^0.1.4" - "@babel/types" "^7.14.1" + "@babel/types" "^7.14.2" babel-plugin-polyfill-corejs2 "^0.2.0" babel-plugin-polyfill-corejs3 "^0.2.0" babel-plugin-polyfill-regenerator "^0.2.0" @@ -1193,24 +1194,24 @@ "@babel/parser" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.15", "@babel/traverse@^7.14.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.0.tgz#cea0dc8ae7e2b1dec65f512f39f3483e8cc95aef" - integrity sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.15", "@babel/traverse@^7.14.0", "@babel/traverse@^7.14.2", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz#9201a8d912723a831c2679c7ebbf2fe1416d765b" + integrity sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA== dependencies: "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.14.0" - "@babel/helper-function-name" "^7.12.13" + "@babel/generator" "^7.14.2" + "@babel/helper-function-name" "^7.14.2" "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/parser" "^7.14.0" - "@babel/types" "^7.14.0" + "@babel/parser" "^7.14.2" + "@babel/types" "^7.14.2" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.14.1", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0": - version "7.14.1" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz#095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db" - integrity sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA== +"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.14.2", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.2.tgz#4208ae003107ef8a057ea8333e56eb64d2f6a2c3" + integrity sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw== dependencies: "@babel/helper-validator-identifier" "^7.14.0" to-fast-properties "^2.0.0" @@ -1740,10 +1741,10 @@ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== -"@npmcli/arborist@^2.0.0", "@npmcli/arborist@^2.3.0", "@npmcli/arborist@^2.4.2": - version "2.4.2" - resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-2.4.2.tgz#7c22eb0d7b66f31e250e1927047d0bd497dbdf8a" - integrity sha512-QrsMrRWzO1D2EmPQheyPz1yRnnmln6vPe4SujV4cRF0v9qIAQbD8M0dMH6K3y+w/2X3t7vg5lx20LHXsbcu7lw== +"@npmcli/arborist@^2.3.0", "@npmcli/arborist@^2.5.0", "@npmcli/arborist@^2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-2.6.0.tgz#8006d1a60435199db6ee72d4c0772869bb75557a" + integrity sha512-6njRVuPMgGRvQUmsXwGdp1ItZtJuSdt5ouoQe4AeFTTZoMufKWLeXFDOlWj7qbMAzqw+guNEAZwBiwm04J7T2g== dependencies: "@npmcli/installed-package-contents" "^1.0.7" "@npmcli/map-workspaces" "^1.0.2" @@ -1756,7 +1757,7 @@ cacache "^15.0.3" common-ancestor-path "^1.0.1" json-parse-even-better-errors "^2.3.1" - json-stringify-nice "^1.1.2" + json-stringify-nice "^1.1.4" mkdirp-infer-owner "^2.0.0" npm-install-checks "^4.0.0" npm-package-arg "^8.1.0" @@ -2106,9 +2107,9 @@ integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== "@types/node@*": - version "15.0.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67" - integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA== + version "15.3.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.3.1.tgz#23a06b87eedb524016616e886b116b8fdcb180af" + integrity sha512-weaeiP4UF4XgF++3rpQhpIJWsCTS4QJw5gvBhQu6cFIxTwyxWIe3xbnrY/o2lTCQ0lsdb8YIUDUvLR4Vuz5rbw== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -2158,9 +2159,9 @@ "@types/react" "*" "@types/react@*": - version "17.0.5" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.5.tgz#3d887570c4489011f75a3fc8f965bf87d09a1bea" - integrity sha512-bj4biDB9ZJmGAYTWSKJly6bMr4BLUiBrx9ujiJEoP9XIDY9CTaPGxE5QWN/1WjpPLzYF7/jRNnV2nNxNe970sw== + version "17.0.6" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.6.tgz#0ec564566302c562bf497d73219797a5e0297013" + integrity sha512-u/TtPoF/hrvb63LdukET6ncaplYsvCvmkceasx8oG84/ZCsoLxz9Z/raPBP4lTAiWW1Jb889Y9svHmv8R26dWw== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -2928,7 +2929,7 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= -array.prototype.flat@^1.2.1, array.prototype.flat@^1.2.3: +array.prototype.flat@^1.2.1, array.prototype.flat@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123" integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg== @@ -3068,9 +3069,9 @@ aws4@^1.8.0: integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== axe-core@^4.0.2: - version "4.2.0" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.2.0.tgz#6594db4ee62f78be79e32a7295d21b099b60668d" - integrity sha512-1uIESzroqpaTzt9uX48HO+6gfnKu3RwvWdCcWSrX4csMInJfCo1yvKPNXCwXFRpJqRW25tiASb6No0YH57PXqg== + version "4.2.1" + resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.2.1.tgz#2e50bcf10ee5b819014f6e342e41e45096239e34" + integrity sha512-evY7DN8qSIbsW2H/TWQ1bX3sXN1d4MNb5Vb4n7BzPuCwRHdkZ1H2eNLuSh73EoQqkGKUtju2G2HCcjCfhvZIAA== axios-cache-adapter@^2.5.0: version "2.7.3" @@ -3732,10 +3733,10 @@ cacache@^13.0.1: ssri "^7.0.0" unique-filename "^1.1.1" -cacache@^15.0.3, cacache@^15.0.5, cacache@^15.0.6: - version "15.0.6" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.6.tgz#65a8c580fda15b59150fb76bf3f3a8e45d583099" - integrity sha512-g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w== +cacache@^15.0.3, cacache@^15.0.5, cacache@^15.1.0: + version "15.1.0" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.1.0.tgz#164c2f857ee606e4cc793c63018fefd0ea5eba7b" + integrity sha512-mfx0C+mCfWjD1PnwQ9yaOrwG1ou9FkKnx0SvzUHWdFt7r7GaRtzT+9M8HAvLu62zIHtnpQ/1m93nWNDCckJGXQ== dependencies: "@npmcli/move-file" "^1.0.1" chownr "^2.0.0" @@ -3841,9 +3842,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219: - version "1.0.30001223" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz#39b49ff0bfb3ee3587000d2f66c47addc6e14443" - integrity sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA== + version "1.0.30001228" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa" + integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A== canvg@^3.0.6: version "3.0.7" @@ -4401,6 +4402,14 @@ contains-path@^0.1.0: resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= +contains-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-1.0.0.tgz#3458b332185603e8eed18f518d4a10888a3abc91" + integrity sha1-NFizMhhWA+ju0Y9RjUoQiIo6vJE= + dependencies: + normalize-path "^2.1.1" + path-starts-with "^1.0.0" + content-disposition@0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" @@ -4925,7 +4934,7 @@ debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: dependencies: ms "2.1.2" -debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: +debug@^3.1.1, debug@^3.2.5, debug@^3.2.6, debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== @@ -5075,9 +5084,9 @@ detect-newline@^3.0.0: integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== detect-node@^2.0.4: - version "2.0.5" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.5.tgz#9d270aa7eaa5af0b72c4c9d9b814e7f4ce738b79" - integrity sha512-qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw== + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== detect-port-alt@1.1.6: version "1.1.6" @@ -5200,12 +5209,12 @@ dom-serializer@0: entities "^2.0.0" dom-serializer@^1.0.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.1.tgz#d845a1565d7c041a95e5dab62184ab41e3a519be" - integrity sha512-Pv2ZluG5ife96udGgEDovOOOA5UELkltfJpnIExPrAk1LTvecolUGn6lIaoLh86d83GiB86CjzciMd9BuRB71Q== + version "1.3.2" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" + integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== dependencies: domelementtype "^2.0.1" - domhandler "^4.0.0" + domhandler "^4.2.0" entities "^2.0.0" domain-browser@^1.1.1: @@ -5251,7 +5260,7 @@ domhandler@^3.3.0: dependencies: domelementtype "^2.0.1" -domhandler@^4.0.0, domhandler@^4.2.0: +domhandler@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059" integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA== @@ -5334,9 +5343,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.723: - version "1.3.727" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf" - integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg== + version "1.3.735" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.735.tgz#fa1a8660f2790662291cb2136f0e446a444cdfdc" + integrity sha512-cp7MWzC3NseUJV2FJFgaiesdrS+A8ZUjX5fLAxdRlcaPDkaPGFplX930S5vf84yqDp4LjuLdKouWuVOTwUfqHQ== elliptic@^6.5.3: version "6.5.4" @@ -5595,12 +5604,12 @@ eslint-loader@3.0.3: object-hash "^2.0.1" schema-utils "^2.6.1" -eslint-module-utils@^2.4.1, eslint-module-utils@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6" - integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA== +eslint-module-utils@^2.4.1, eslint-module-utils@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz#b51be1e473dd0de1c5ea638e22429c2490ea8233" + integrity sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A== dependencies: - debug "^2.6.9" + debug "^3.2.7" pkg-dir "^2.0.0" eslint-plugin-flowtype@4.6.0: @@ -5637,22 +5646,25 @@ eslint-plugin-import@2.20.1: resolve "^1.12.0" eslint-plugin-import@^2.22.0: - version "2.22.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702" - integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw== + version "2.23.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.23.2.tgz#ee15dd68fc7a1a1ba4c653c734e0d01c100d3484" + integrity sha512-LmNoRptHBxOP+nb0PIKz1y6OSzCJlB+0g0IGS3XV4KaKk2q4szqQ6s6F1utVf5ZRkxk/QOTjdxe7v4VjS99Bsg== dependencies: - array-includes "^3.1.1" - array.prototype.flat "^1.2.3" - contains-path "^0.1.0" + array-includes "^3.1.3" + array.prototype.flat "^1.2.4" + contains-path "^1.0.0" debug "^2.6.9" - doctrine "1.5.0" + doctrine "^2.1.0" eslint-import-resolver-node "^0.3.4" - eslint-module-utils "^2.6.0" + eslint-module-utils "^2.6.1" + find-up "^2.0.0" has "^1.0.3" + is-core-module "^2.4.0" minimatch "^3.0.4" - object.values "^1.1.1" - read-pkg-up "^2.0.0" - resolve "^1.17.0" + object.values "^1.1.3" + pkg-up "^2.0.0" + read-pkg-up "^3.0.0" + resolve "^1.20.0" tsconfig-paths "^3.9.0" eslint-plugin-jest@^22.1.3: @@ -6624,7 +6636,7 @@ glob-to-regexp@^0.3.0: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= -glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7: version "7.1.7" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== @@ -7522,10 +7534,10 @@ is-color-stop@^1.0.0: rgb-regex "^1.0.1" rgba-regex "^1.0.0" -is-core-module@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887" - integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw== +is-core-module@^2.2.0, is-core-module@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1" + integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A== dependencies: has "^1.0.3" @@ -8836,7 +8848,7 @@ json-stable-stringify@^1.0.1: dependencies: jsonify "~0.0.0" -json-stringify-nice@^1.1.2: +json-stringify-nice@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz#2c937962b80181d3f317dd39aa323e14f5a60a67" integrity sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw== @@ -9199,10 +9211,10 @@ libnpmdiff@^2.0.4: pacote "^11.3.0" tar "^6.1.0" -libnpmexec@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-1.1.0.tgz#daa79d4545e21d0eb6887a33e0bbc8ab466099b2" - integrity sha512-OWpsPWtD6CAn66JouyjBfhQ9eS1mAtXgZXXd1SoAyUP3Mol+ao9IJ2THcJQcgX96keVmZkUA11uJS5ZNEd9DwA== +libnpmexec@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-1.1.1.tgz#aa510cc74612cac3945f7e2fd2ac4c650fa7ef66" + integrity sha512-uw6H2dzC6F6fdq7lAxfzXPimHCJ3/g6ycFKcv2Q2QXuNZ94EDmNPpMO6f4mwiC5F6Lyy/WK0IL7AZwRhmSvUdQ== dependencies: "@npmcli/arborist" "^2.3.0" "@npmcli/ci-detect" "^1.3.0" @@ -9216,12 +9228,12 @@ libnpmexec@^1.1.0: read-package-json-fast "^2.0.2" walk-up-path "^1.0.0" -libnpmfund@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-1.0.2.tgz#d9552d4b76dd7f0a1a61b7af6b8f27184e51b0f5" - integrity sha512-Scw2JiLxfT7wqW/VbxIXV8u3FaFT/ZlR8YLFgTdCPsL1Hhli0554ZXyP8JTu1sLeDpHsoqtgLb4mgYVQnqigjA== +libnpmfund@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-1.1.0.tgz#ee91313905b3194b900530efa339bc3f9fc4e5c4" + integrity sha512-Kfmh3pLS5/RGKG5WXEig8mjahPVOxkik6lsbH4iX0si1xxNi6eeUh/+nF1MD+2cgalsQif3O5qyr6mNz2ryJrQ== dependencies: - "@npmcli/arborist" "^2.0.0" + "@npmcli/arborist" "^2.5.0" libnpmhook@^6.0.2: version "6.0.2" @@ -10177,9 +10189,9 @@ node-notifier@^8.0.0: which "^2.0.2" node-releases@^1.1.29, node-releases@^1.1.52, node-releases@^1.1.71: - version "1.1.71" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb" - integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg== + version "1.1.72" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe" + integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw== nopt@^5.0.0: version "5.0.0" @@ -10302,10 +10314,10 @@ npm-profile@^5.0.3: dependencies: npm-registry-fetch "^10.0.0" -npm-registry-fetch@^10.0.0, npm-registry-fetch@^10.1.1: - version "10.1.1" - resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-10.1.1.tgz#97bc7a0fca5e8f76cc5162185b8de8caa8bea639" - integrity sha512-F6a3l+ffCQ7hvvN16YG5bpm1rPZntCg66PLHDQ1apWJPOCUVHoKnL2w5fqEaTVhp42dmossTyXeR7hTGirfXrg== +npm-registry-fetch@^10.0.0, npm-registry-fetch@^10.1.2: + version "10.1.2" + resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-10.1.2.tgz#11ffe03d813c653e768bdf762cfc5f1afe91b8bd" + integrity sha512-KsM/TdPmntqgBFlfsbkOLkkE9ovZo7VpVcd+/eTdYszCrgy5zFl5JzWm+OxavFaEWlbkirpkou+ZYI00RmOBFA== dependencies: lru-cache "^6.0.0" make-fetch-happen "^8.0.9" @@ -10335,11 +10347,11 @@ npm-user-validate@^1.0.1: integrity sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw== npm@^7.11.2: - version "7.12.0" - resolved "https://registry.yarnpkg.com/npm/-/npm-7.12.0.tgz#c2fb58bbb4f7bbef339a945a28b7c75117799bdd" - integrity sha512-8Zvas3+1zKtE4uXIxHWRpg1bqGNrOta9RTDZWJ2k+EfOfzOggPQh9N4jHtsrIuGLawXv9xCWyvauke1UWMOMoA== + version "7.14.0" + resolved "https://registry.yarnpkg.com/npm/-/npm-7.14.0.tgz#b2df90a98879c181cd866ce5176f5a123730fbf5" + integrity sha512-GSG9/rSau8vGfkOmrmseRVYXoEjo3NPNsoM4nwvI1uWlKdzmlZ8UCw7FqCUrlQ5u0C5dRR7MG9EJUCV8LZegLA== dependencies: - "@npmcli/arborist" "^2.4.2" + "@npmcli/arborist" "^2.6.0" "@npmcli/ci-detect" "^1.2.0" "@npmcli/config" "^2.2.0" "@npmcli/run-script" "^1.8.5" @@ -10348,13 +10360,13 @@ npm@^7.11.2: ansistyles "~0.1.3" archy "~1.0.0" byte-size "^7.0.1" - cacache "^15.0.6" + cacache "^15.1.0" chalk "^4.1.0" chownr "^2.0.0" cli-columns "^3.1.2" cli-table3 "^0.6.0" columnify "~1.5.4" - glob "^7.1.4" + glob "^7.1.7" graceful-fs "^4.2.6" hosted-git-info "^4.0.2" ini "^2.0.0" @@ -10364,8 +10376,8 @@ npm@^7.11.2: leven "^3.1.0" libnpmaccess "^4.0.2" libnpmdiff "^2.0.4" - libnpmexec "^1.1.0" - libnpmfund "^1.0.2" + libnpmexec "^1.1.1" + libnpmfund "^1.1.0" libnpmhook "^6.0.2" libnpmorg "^2.0.2" libnpmpack "^2.0.1" @@ -10385,7 +10397,7 @@ npm@^7.11.2: npm-package-arg "^8.1.2" npm-pick-manifest "^6.1.1" npm-profile "^5.0.3" - npm-registry-fetch "^10.1.1" + npm-registry-fetch "^10.1.2" npm-user-validate "^1.0.1" npmlog "~4.1.2" opener "^1.5.2" @@ -10960,6 +10972,13 @@ path-parse@^1.0.6: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== +path-starts-with@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/path-starts-with/-/path-starts-with-1.0.0.tgz#b28243015e8b138de572682ac52da42e646ad84e" + integrity sha1-soJDAV6LE43lcmgqxS2kLmRq2E4= + dependencies: + normalize-path "^2.1.1" + path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" @@ -11067,7 +11086,7 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -pkg-up@2.0.0: +pkg-up@2.0.0, pkg-up@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f" integrity sha1-yBmscoBZpGHKscOImivjxJoATX8= @@ -11708,9 +11727,9 @@ postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4: uniq "^1.0.1" postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: - version "6.0.5" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz#042d74e137db83e6f294712096cb413f5aa612c4" - integrity sha512-aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg== + version "6.0.6" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" + integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" @@ -12463,6 +12482,14 @@ read-pkg-up@^2.0.0: find-up "^2.0.0" read-pkg "^2.0.0" +read-pkg-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" + integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc= + dependencies: + find-up "^2.0.0" + read-pkg "^3.0.0" + read-pkg-up@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978" @@ -12904,7 +12931,7 @@ resolve@1.15.0: dependencies: path-parse "^1.0.6" -resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.8.1: +resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.8.1: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -13564,9 +13591,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.7" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65" - integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ== + version "3.0.8" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.8.tgz#eb1e97ad99b11bf3f82a3b71a0472dd9a00f2ecf" + integrity sha512-NDgA96EnaLSvtbM7trJj+t1LUR3pirkDCcz9nOUlPb5DMBGsH7oES6C3hs3j7R9oHEa1EMvReS/BUAIT5Tcr0g== spdy-transport@^3.0.0: version "3.0.0" @@ -13633,9 +13660,9 @@ ssri@^6.0.1: figgy-pudding "^3.5.1" ssri@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-7.1.0.tgz#92c241bf6de82365b5c7fb4bd76e975522e1294d" - integrity sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g== + version "7.1.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-7.1.1.tgz#33e44f896a967158e3c63468e47ec46613b95b5f" + integrity sha512-w+daCzXN89PseTL99MkA+fxJEcU3wfaE/ah0i0lnOlpG1CYLJ2ZjzEry68YBKfLs4JfoTShrTEsJkAZuNZ/stw== dependencies: figgy-pudding "^3.5.1" minipass "^3.1.1" From c25bd87815424077339242897ef9271c12cc5eda Mon Sep 17 00:00:00 2001 From: Robert Hunt Date: Mon, 24 May 2021 09:57:48 +1200 Subject: [PATCH 12/15] Increase priority of missing row ID error, and prevent duplicates --- noticeList.txt | 18 +-- package.json | 2 +- .../book-package-check.test.js.snap | 2 +- .../tn-table-row-check.test.js.snap | 4 +- src/core/notes-tsv7-row-check.js | 2 +- src/core/notes-tsv7-table-check.js | 6 +- src/core/orig-quote-check.js | 2 +- src/core/questions-tsv7-row-check.js | 2 +- src/core/questions-tsv7-table-check.js | 6 +- src/core/tn-tsv9-row-check.js | 2 +- src/core/tn-tsv9-table-check.js | 6 +- src/core/twl-tsv6-row-check.js | 2 +- src/core/twl-tsv6-table-check.js | 6 +- src/demos/book-package-check/README.md | 2 +- yarn.lock | 120 +++++++++--------- 15 files changed, 88 insertions(+), 94 deletions(-) diff --git a/noticeList.txt b/noticeList.txt index 59d6985b..8da304a2 100644 --- a/noticeList.txt +++ b/noticeList.txt @@ -1,4 +1,4 @@ -Last updated 2021-05-21 20:42:33.603995 by makeNoticeList.py +Last updated 2021-05-24 09:07:06.144138 by makeNoticeList.py Got 490 notices: checkRepoResult.noticeList.push( 997, "Repository doesn’t exist", details, username, repoCode, repoName, location: givenLocation, extra: repoCode from checkRepo.js line 267 languageCode === 'en' || languageCode === 'fr' ? 490 : 190, "Expected header field to contain a mixed-case string", fieldName: `\\$marker`, excerpt: rest, C, V, location: lineLocation from usfm-text-check.js line 971 @@ -71,6 +71,14 @@ Got 490 notices: 938, `Unable to find project file mentioned in manifest`, excerpt: projectFilepath, location: ourLocation from manifest-text-check.js line 738 937, `Linked project file seems empty`, excerpt: projectFilepath, location: ourLocation from manifest-text-check.js line 740 936, `Error loading manifest project link`, details: trcGCerror, excerpt: projectFilepath, location: ourLocation from manifest-text-check.js line 742 + 932, C, V, "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from tn-tsv9-table-check.js line 237 + 932, C, V, "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from twl-tsv6-table-check.js line 226 + 932, C, V, "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from notes-tsv7-table-check.js line 226 + 932, C, V, "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from questions-tsv7-table-check.js line 226 + 931, "Missing row ID field", fieldName: 'Reference', location: ourRowLocation from twl-tsv6-row-check.js line 332 + 931, "Missing row ID field", fieldName: 'Verse', location: ourRowLocation from tn-tsv9-row-check.js line 371 + 931, "Missing row ID field", fieldName: 'Reference', location: ourRowLocation from questions-tsv7-row-check.js line 387 + 931, "Missing row ID field", fieldName: 'Reference', location: ourRowLocation from notes-tsv7-row-check.js line 420 929, "'projects' key is missing", location: ourLocation from manifest-text-check.js line 674 928, "'dublin_core' key is missing", location: ourLocation from manifest-text-check.js line 672 920, yamlError.message, location: ourLocation ) from yaml-text-check.js line 175 @@ -149,10 +157,6 @@ Got 490 notices: 835, "Seems too few original \\k-s attributes", details: `Expected one attribute but only found $attributeCounter`, lineNumber, C, V, excerpt: regexResultArray1[0], location: lineLocation from usfm-text-check.js line 906 834, "Seems too few translation \\zaln-s attributes", details: `Expected six attributes but only found $attributeCounter`, lineNumber, C, V, excerpt: regexResultArray1[0], location: lineLocation from usfm-text-check.js line 938 833, "Unexpected extra \\zaln-s attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 935 - 832, C, V, "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from tn-tsv9-table-check.js line 237 - 832, C, V, "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from twl-tsv6-table-check.js line 226 - 832, C, V, "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from notes-tsv7-table-check.js line 226 - 832, C, V, "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation from questions-tsv7-table-check.js line 226 831, C, V, `Duplicate '$rowID' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation from tn-tsv9-table-check.js line 234 831, C, V, `Duplicate '$rowID' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation from twl-tsv6-table-check.js line 223 831, C, V, `Duplicate '$rowID' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation from notes-tsv7-table-check.js line 223 @@ -207,10 +211,6 @@ Got 490 notices: 810, "Missing verse number", rowID, fieldName: 'Verse', location: ` after $C:?$ourRowLocation` from tn-tsv9-row-check.js line 368 810, "Missing verse number", rowID, fieldName: 'Reference', location: ` after $C:?$ourRowLocation` from questions-tsv7-row-check.js line 384 810, "Missing verse number", rowID, fieldName: 'Reference', location: ` after $C:?$ourRowLocation` from notes-tsv7-row-check.js line 417 - 808, "Missing row ID field", fieldName: 'Reference', location: ourRowLocation from twl-tsv6-row-check.js line 332 - 808, "Missing row ID field", fieldName: 'Verse', location: ourRowLocation from tn-tsv9-row-check.js line 371 - 808, "Missing row ID field", fieldName: 'Reference', location: ourRowLocation from questions-tsv7-row-check.js line 387 - 808, "Missing row ID field", fieldName: 'Reference', location: ourRowLocation from notes-tsv7-row-check.js line 420 799, "Missing TWLink field", fieldName: 'TWLink', rowID, location: ourRowLocation from twl-tsv6-row-check.js line 417 798, "Field doesn’t contain expected TW link", details: `should start with 'rc://*/tw/dict/bible/'`, fieldName: 'TWLink', rowID, location: ourRowLocation from twl-tsv6-row-check.js line 401 797, "Field doesn’t contain proper TW link", details: `should be 'kt', 'names', or 'other'`, fieldName: 'TWLink', rowID, characterIndex, excerpt, location: ourRowLocation from twl-tsv6-row-check.js line 408 diff --git a/package.json b/package.json index c50ea1e7..7e4e14b8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "uw-content-validation", "description": "Functions for Checking Door43.org Scriptural Content/Resources.", - "version": "2.1.3_alpha4", + "version": "2.1.3_alpha5", "private": false, "homepage": "https://unfoldingword.github.io/uw-content-validation/", "repository": { diff --git a/src/__tests__/__snapshots__/book-package-check.test.js.snap b/src/__tests__/__snapshots__/book-package-check.test.js.snap index 2fed162c..788c6bd8 100644 --- a/src/__tests__/__snapshots__/book-package-check.test.js.snap +++ b/src/__tests__/__snapshots__/book-package-check.test.js.snap @@ -4839,7 +4839,7 @@ Object { "branch": "master", "characterIndex": 20, "details": "end part of quote = \\"וְ⁠שֵׁ֥ם הַ⁠שֵּׁנִ֖י\\" -- passage ►וַ⁠יִּשְׂא֣וּ לָ⁠הֶ֗ם נָשִׁים֙ מֹֽאֲבִיּ֔וֹת שֵׁ֤ם הָֽ⁠אַחַת֙ עָרְפָּ֔ה וְ⁠שֵׁ֥ם הַ⁠שֵּׁנִ֖ית ר֑וּת וַ⁠יֵּ֥שְׁבוּ שָׁ֖ם כְּ⁠עֶ֥שֶׂר שָׁנִֽים׃◄", - "excerpt": "…שֵׁ֥ם הַ⁠שֵּׁנִ֖י(ת=D1514/H5ea)", + "excerpt": "…שֵׁ֥ם הַ⁠שֵּׁנִ֖י(ת=D1514/H5ea) occurrence=1", "extra": "TN", "fieldName": "OrigQuote", "filename": "en_tn_08-RUT.tsv", diff --git a/src/__tests__/__snapshots__/tn-table-row-check.test.js.snap b/src/__tests__/__snapshots__/tn-table-row-check.test.js.snap index dbe261fe..a379dde2 100644 --- a/src/__tests__/__snapshots__/tn-table-row-check.test.js.snap +++ b/src/__tests__/__snapshots__/tn-table-row-check.test.js.snap @@ -198,7 +198,7 @@ Object { "bookID": "GEN", "characterIndex": 0, "details": "passage ►וְ⁠הָ⁠אָ֗רֶץ הָיְתָ֥ה תֹ֨הוּ֙ וָ⁠בֹ֔הוּ וְ⁠חֹ֖שֶׁךְ עַל־פְּנֵ֣י תְה֑וֹם וְ⁠ר֣וּחַ אֱלֹהִ֔ים מְרַחֶ֖פֶת עַל־פְּנֵ֥י הַ⁠מָּֽיִם׃◄", - "excerpt": "(ּ=D1468/H5bc) וְ⁠חֹ֖שֶׁךְ", + "excerpt": "(ּ=D1468/H5bc) וְ⁠חֹ֖שֶׁךְ occurrence=1", "fieldName": "OrigQuote", "location": " that was supplied", "message": "Seems original language quote might not start at the beginning of a word", @@ -591,7 +591,7 @@ Object { "fieldName": "Verse", "location": " that was supplied", "message": "Missing row ID field", - "priority": 808, + "priority": 931, }, Object { "C": "1", diff --git a/src/core/notes-tsv7-row-check.js b/src/core/notes-tsv7-row-check.js index a70090ea..b530253c 100644 --- a/src/core/notes-tsv7-row-check.js +++ b/src/core/notes-tsv7-row-check.js @@ -417,7 +417,7 @@ export async function checkNotesTSV7DataRow(languageCode, repoCode, line, bookID addNoticePartial({ priority: 810, message: "Missing verse number", rowID, fieldName: 'Reference', location: ` after ${C}:?${ourRowLocation}` }); if (!rowID.length) - addNoticePartial({ priority: 808, message: "Missing row ID field", fieldName: 'Reference', location: ourRowLocation }); + addNoticePartial({ priority: 931, message: "Missing row ID field", fieldName: 'Reference', location: ourRowLocation }); else { if (rowID.length !== 4) { addNoticePartial({ priority: 778, message: "Row ID should be exactly 4 characters", details: `not ${rowID.length}`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation }); diff --git a/src/core/notes-tsv7-table-check.js b/src/core/notes-tsv7-table-check.js index 3409e295..3cac42cd 100644 --- a/src/core/notes-tsv7-table-check.js +++ b/src/core/notes-tsv7-table-check.js @@ -5,7 +5,7 @@ import { removeDisabledNotices } from './disabled-notices'; import { parameterAssert } from './utilities'; -const NOTES_TABLE_VALIDATOR_VERSION_STRING = '0.3.4'; +const NOTES_TABLE_VALIDATOR_VERSION_STRING = '0.3.5'; const NUM_EXPECTED_NOTES_TSV_FIELDS = 7; // so expects 6 tabs per line const EXPECTED_NOTES_HEADING_LINE = 'Reference\tID\tTags\tSupportReference\tQuote\tOccurrence\tNote'; @@ -134,7 +134,7 @@ export async function checkNotesTSV7Table(languageCode, repoCode, bookID, filena for (const drNoticeEntry of drResultObject.noticeList) if (drNoticeEntry.extra) // it must be an indirect check on a TA or TW article from a TN2 check carResult.noticeList.push(drNoticeEntry); // Just copy the complete notice as is - else + else if (drNoticeEntry.priority !== 931) // We already caught Missing row ID addNoticePartial({ ...drNoticeEntry, lineNumber: n + 1 }); // The following is needed coz we might be checking the linked TA and/or TW articles if (drResultObject.checkedFileCount && drResultObject.checkedFileCount > 0) @@ -223,7 +223,7 @@ export async function checkNotesTSV7Table(languageCode, repoCode, bookID, filena addNoticePartial({ priority: 831, C, V, message: `Duplicate '${rowID}' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation }); rowIDListForVerse.push(rowID); } else - addNoticePartial({ priority: 832, C, V, message: "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); + addNoticePartial({ priority: 932, C, V, message: "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); lastC = C; lastV = V; diff --git a/src/core/orig-quote-check.js b/src/core/orig-quote-check.js index 77b0c555..4abe6896 100644 --- a/src/core/orig-quote-check.js +++ b/src/core/orig-quote-check.js @@ -258,7 +258,7 @@ export async function checkOriginalLanguageQuoteAndOccurrence(languageCode, repo let details = `passage ►${fullVerseText}◄`; if (partDescription.length) details = `${partDescription} part of quote = "${foundQuoteSegment}" -- ${details}`; - // TODO: This algorithm is inadequate if a word is inside another prior word, e.g., searching for δὲ in οὐδὲν δὲ συνκεκαλυμμένον ἐστὶν + // TODO: This algorithm is inadequate if a single word is inside another prior word, e.g., searching for δὲ in οὐδὲν δὲ συνκεκαλυμμένον ἐστὶν let remainingVerseBits = partialVerseText.split(foundQuoteSegment); if (remainingVerseBits.length > 2) // Join the extra bits back up remainingVerseBits = [remainingVerseBits[0], remainingVerseBits.slice(1).join(discontiguousDivider)]; diff --git a/src/core/questions-tsv7-row-check.js b/src/core/questions-tsv7-row-check.js index 197e2bc4..bfa49e44 100644 --- a/src/core/questions-tsv7-row-check.js +++ b/src/core/questions-tsv7-row-check.js @@ -384,7 +384,7 @@ export async function checkQuestionsTSV7DataRow(languageCode, repoCode, line, bo addNoticePartial({ priority: 810, message: "Missing verse number", rowID, fieldName: 'Reference', location: ` after ${C}:?${ourRowLocation}` }); if (!rowID.length) - addNoticePartial({ priority: 808, message: "Missing row ID field", fieldName: 'Reference', location: ourRowLocation }); + addNoticePartial({ priority: 931, message: "Missing row ID field", fieldName: 'Reference', location: ourRowLocation }); else { if (rowID.length !== 4) { addNoticePartial({ priority: 778, message: "Row ID should be exactly 4 characters", details: `not ${rowID.length}`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation }); diff --git a/src/core/questions-tsv7-table-check.js b/src/core/questions-tsv7-table-check.js index d1b0f190..c62ec167 100644 --- a/src/core/questions-tsv7-table-check.js +++ b/src/core/questions-tsv7-table-check.js @@ -5,7 +5,7 @@ import { removeDisabledNotices } from './disabled-notices'; import { parameterAssert } from './utilities'; -const QUESTIONS_TABLE_VALIDATOR_VERSION_STRING = '0.2.2'; +const QUESTIONS_TABLE_VALIDATOR_VERSION_STRING = '0.2.3'; const NUM_EXPECTED_QUESTIONS_TSV_FIELDS = 7; // so expects 6 tabs per line const EXPECTED_QUESTIONS_HEADING_LINE = 'Reference\tID\tTags\tQuote\tOccurrence\tQuestion\tResponse'; @@ -134,7 +134,7 @@ export async function checkQuestionsTSV7Table(languageCode, repoCode, bookID, fi for (const drNoticeEntry of drResultObject.noticeList) if (drNoticeEntry.extra) // it must be an indirect check on a TA or TW article from a TN2 check carResult.noticeList.push(drNoticeEntry); // Just copy the complete notice as is - else + else if (drNoticeEntry.priority !== 931) // We already caught Missing row ID addNoticePartial({ ...drNoticeEntry, lineNumber: n + 1 }); // The following is needed coz we might be checking the linked TA and/or TW articles if (drResultObject.checkedFileCount && drResultObject.checkedFileCount > 0) @@ -223,7 +223,7 @@ export async function checkQuestionsTSV7Table(languageCode, repoCode, bookID, fi addNoticePartial({ priority: 831, C, V, message: `Duplicate '${rowID}' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation }); rowIDListForVerse.push(rowID); } else - addNoticePartial({ priority: 832, C, V, message: "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); + addNoticePartial({ priority: 932, C, V, message: "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); lastC = C; lastV = V; diff --git a/src/core/tn-tsv9-row-check.js b/src/core/tn-tsv9-row-check.js index a43a85f6..0660259b 100644 --- a/src/core/tn-tsv9-row-check.js +++ b/src/core/tn-tsv9-row-check.js @@ -368,7 +368,7 @@ export async function checkTN_TSV9DataRow(languageCode, repoCode, line, bookID, addNoticePartial({ priority: 810, message: "Missing verse number", rowID, fieldName: 'Verse', location: ` after ${C}:?${ourRowLocation}` }); if (!rowID.length) - addNoticePartial({ priority: 808, message: "Missing row ID field", fieldName: 'Verse', location: ourRowLocation }); + addNoticePartial({ priority: 931, message: "Missing row ID field", fieldName: 'Verse', location: ourRowLocation }); else { if (rowID.length !== 4) { addNoticePartial({ priority: 778, message: "Row ID should be exactly 4 characters", details: `not ${rowID.length}`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation }); diff --git a/src/core/tn-tsv9-table-check.js b/src/core/tn-tsv9-table-check.js index f463e37d..9f9e65cb 100644 --- a/src/core/tn-tsv9-table-check.js +++ b/src/core/tn-tsv9-table-check.js @@ -5,7 +5,7 @@ import { removeDisabledNotices } from './disabled-notices'; import { debugLog, parameterAssert } from './utilities'; -const TN_TABLE_TEXT_VALIDATOR_VERSION_STRING = '0.4.1'; +const TN_TABLE_TEXT_VALIDATOR_VERSION_STRING = '0.4.2'; const NUM_EXPECTED_TN_TSV_FIELDS = 9; // so expects 8 tabs per line const EXPECTED_TN_HEADING_LINE = 'Book\tChapter\tVerse\tID\tSupportReference\tOrigQuote\tOccurrence\tGLQuote\tOccurrenceNote'; @@ -141,7 +141,7 @@ export async function checkTN_TSV9Table(languageCode, repoCode, bookID, filename for (const drNoticeEntry of drResultObject.noticeList) if (drNoticeEntry.extra) // it must be an indirect check on a TA or TW article from a TN check ttResult.noticeList.push(drNoticeEntry); // Just copy the complete notice as is - else + else if (drNoticeEntry.priority !== 931) // We already caught Missing row ID addNoticePartial({ ...drNoticeEntry, lineNumber: n + 1 }); // The following is needed coz we might be checking the linked TA and/or TW articles if (drResultObject.checkedFileCount && drResultObject.checkedFileCount > 0) @@ -234,7 +234,7 @@ export async function checkTN_TSV9Table(languageCode, repoCode, bookID, filename addNoticePartial({ priority: 831, C, V, message: `Duplicate '${rowID}' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation }); rowIDListForVerse.push(rowID); } else - addNoticePartial({ priority: 832, C, V, message: "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); + addNoticePartial({ priority: 932, C, V, message: "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); lastB = B; lastC = C; lastV = V; diff --git a/src/core/twl-tsv6-row-check.js b/src/core/twl-tsv6-row-check.js index 0fe1674d..cff4e5bd 100644 --- a/src/core/twl-tsv6-row-check.js +++ b/src/core/twl-tsv6-row-check.js @@ -329,7 +329,7 @@ export async function checkTWL_TSV6DataRow(languageCode, repoCode, line, bookID, addNoticePartial({ priority: 810, message: "Missing verse number", rowID, fieldName: 'Reference', location: ` after ${C}:?${ourRowLocation}` }); if (!rowID.length) - addNoticePartial({ priority: 808, message: "Missing row ID field", fieldName: 'Reference', location: ourRowLocation }); + addNoticePartial({ priority: 931, message: "Missing row ID field", fieldName: 'Reference', location: ourRowLocation }); else { if (rowID.length !== 4) { addNoticePartial({ priority: 778, message: "Row ID should be exactly 4 characters", details: `not ${rowID.length}`, rowID, fieldName: 'ID', excerpt: rowID, location: ourRowLocation }); diff --git a/src/core/twl-tsv6-table-check.js b/src/core/twl-tsv6-table-check.js index bcbcb4b9..17a6a748 100644 --- a/src/core/twl-tsv6-table-check.js +++ b/src/core/twl-tsv6-table-check.js @@ -5,7 +5,7 @@ import { removeDisabledNotices } from './disabled-notices'; import { parameterAssert } from './utilities'; -const TWL_TABLE_VALIDATOR_VERSION_STRING = '0.1.2'; +const TWL_TABLE_VALIDATOR_VERSION_STRING = '0.1.3'; const NUM_EXPECTED_TWL_TSV_FIELDS = 6; // so expects 5 tabs per line const EXPECTED_TWL_HEADING_LINE = 'Reference\tID\tTags\tOrigWords\tOccurrence\tTWLink'; @@ -134,7 +134,7 @@ export async function checkTWL_TSV6Table(languageCode, repoCode, bookID, filenam for (const drNoticeEntry of drResultObject.noticeList) if (drNoticeEntry.extra) // it must be an indirect check on a TA or TW article from a TN2 check carResult.noticeList.push(drNoticeEntry); // Just copy the complete notice as is - else + else if (drNoticeEntry.priority !== 931) // We already caught Missing row ID addNoticePartial({ ...drNoticeEntry, lineNumber: n + 1 }); // The following is needed coz we might be checking the linked TA and/or TW articles if (drResultObject.checkedFileCount && drResultObject.checkedFileCount > 0) @@ -223,7 +223,7 @@ export async function checkTWL_TSV6Table(languageCode, repoCode, bookID, filenam addNoticePartial({ priority: 831, C, V, message: `Duplicate '${rowID}' ID`, fieldName: 'ID', rowID, lineNumber: n + 1, location: ourLocation }); rowIDListForVerse.push(rowID); } else - addNoticePartial({ priority: 832, C, V, message: "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); + addNoticePartial({ priority: 932, C, V, message: "Missing row ID", fieldName: 'ID', lineNumber: n + 1, location: ourLocation }); lastC = C; lastV = V; diff --git a/src/demos/book-package-check/README.md b/src/demos/book-package-check/README.md index 2571be5d..e887e744 100644 --- a/src/demos/book-package-check/README.md +++ b/src/demos/book-package-check/README.md @@ -29,7 +29,7 @@ import BookPackageCheck from './BookPackageCheck'; languageCode='en' // bookID can be a USFM bookID, e.g., 'GEN', 'MAT', '3JN' // and can also be 'OBS' (for Open Bible Stories) - bookID='EZR' + bookID='LUK' // We can choose the forthcoming new TSV formats or the existing formats // dataSet='BOTH' // 'OLD' (Markdown TQ, TSV9 TN, etc.), 'NEW' (TSV7 TQ2, TSV7 TN2, TSV6 TWL,etc.), 'DEFAULT', or 'BOTH' diff --git a/yarn.lock b/yarn.lock index 165ab6aa..4d90736a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -141,10 +141,10 @@ "@babel/helper-annotate-as-pure" "^7.12.13" regexpu-core "^4.7.1" -"@babel/helper-define-polyfill-provider@^0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz#a640051772045fedaaecc6f0c6c69f02bdd34bf1" - integrity sha512-JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw== +"@babel/helper-define-polyfill-provider@^0.2.1": + version "0.2.1" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.1.tgz#e6f5f4a6edc3722152c21359190de67fc6cf664d" + integrity sha512-x3AUTVZNPunaw1opRTa5OwVA5N0YxGlIad9xQ5QflK1uIS7PnAGGU5O2Dj/G183fR//N8AzTq+Q8+oiu9m0VFg== dependencies: "@babel/helper-compilation-targets" "^7.13.0" "@babel/helper-module-imports" "^7.12.13" @@ -1245,9 +1245,9 @@ integrity sha512-AlEKV7TxjeK+jxWVKcCFrfYAk8spX9aCyiToFIiLPtfQbsjmRGLIhb5VZgptQcJdHtLXo7+m0DuurwFgUToQuA== "@date-io/core@^2.10.6": - version "2.10.7" - resolved "https://registry.yarnpkg.com/@date-io/core/-/core-2.10.7.tgz#0fe1fa0ef02c827919e23c2802a4b25589ac522d" - integrity sha512-EG/1qDiQvd12RoNJ6H+sZcHVswC/3uMx/ySvfaJ24vB30rLjkgHggEXbgMbfgki7wMuiQ/zXI8QlmF1k3kWRGQ== + version "2.10.11" + resolved "https://registry.yarnpkg.com/@date-io/core/-/core-2.10.11.tgz#b1a3d57730f3eaaab54d5658be4a71727297e357" + integrity sha512-keXQnwH0LM8wyvu+j5Z2KGK56D+eItjy7DnwuWl/oV+DM2UEYl0z5WhdPMpfswSyt/kjuPOzcVF/7u/skMLaoA== "@date-io/date-fns@1.1.0": version "1.1.0" @@ -2107,9 +2107,9 @@ integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== "@types/node@*": - version "15.3.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.3.1.tgz#23a06b87eedb524016616e886b116b8fdcb180af" - integrity sha512-weaeiP4UF4XgF++3rpQhpIJWsCTS4QJw5gvBhQu6cFIxTwyxWIe3xbnrY/o2lTCQ0lsdb8YIUDUvLR4Vuz5rbw== + version "15.6.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.6.0.tgz#f0ddca5a61e52627c9dcb771a6039d44694597bc" + integrity sha512-gCYSfQpy+LYhOFTKAeE8BkyGqaxmlFxe+n4DKM6DR0wzw/HISUE/hAmkC/KT8Sw5PCJblqg062b3z9gucv3k0A== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -2666,7 +2666,7 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.1.0: +acorn@^8.2.4: version "8.2.4" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz#caba24b08185c3b56e3168e97d15ed17f4d31fd0" integrity sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg== @@ -3219,28 +3219,28 @@ babel-plugin-named-asset-import@^0.3.6: integrity sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw== babel-plugin-polyfill-corejs2@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz#686775bf9a5aa757e10520903675e3889caeedc4" - integrity sha512-9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg== + version "0.2.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.1.tgz#ae2cf6d6f1aa7c0edcf04a25180e8856a6d1184f" + integrity sha512-hXGSPbr6IbjeMyGew+3uGIAkRjBFSOJ9FLDZNOfHuyJZCcoia4nd/72J0bSgvfytcVfUcP/dxEVcUhVJuQRtSw== dependencies: "@babel/compat-data" "^7.13.11" - "@babel/helper-define-polyfill-provider" "^0.2.0" + "@babel/helper-define-polyfill-provider" "^0.2.1" semver "^6.1.1" babel-plugin-polyfill-corejs3@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz#f4b4bb7b19329827df36ff56f6e6d367026cb7a2" - integrity sha512-zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg== + version "0.2.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.1.tgz#786f40218040030f0edecfd48e6e59f1ee9bef53" + integrity sha512-WZCqF3DLUhdTD/P381MDJfuP18hdCZ+iqJ+wHtzhWENpsiof284JJ1tMQg1CE+hfCWyG48F7e5gDMk2c3Laz7w== dependencies: - "@babel/helper-define-polyfill-provider" "^0.2.0" + "@babel/helper-define-polyfill-provider" "^0.2.1" core-js-compat "^3.9.1" babel-plugin-polyfill-regenerator@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz#853f5f5716f4691d98c84f8069c7636ea8da7ab8" - integrity sha512-J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg== + version "0.2.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.1.tgz#ca9595d7d5f3afefec2d83126148b90db751a091" + integrity sha512-T3bYyL3Sll2EtC94v3f+fA8M28q7YPTOZdB++SRHjvYZTvtd+WorMUq3tDTD4Q7Kjk1LG0gGromslKjcO5p2TA== dependencies: - "@babel/helper-define-polyfill-provider" "^0.2.0" + "@babel/helper-define-polyfill-provider" "^0.2.1" babel-plugin-syntax-object-rest-spread@^6.8.0: version "6.13.0" @@ -4276,7 +4276,7 @@ columnify@~1.5.4: strip-ansi "^3.0.0" wcwidth "^1.0.0" -combined-stream@^1.0.6, combined-stream@~1.0.6: +combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== @@ -4402,14 +4402,6 @@ contains-path@^0.1.0: resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= -contains-path@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-1.0.0.tgz#3458b332185603e8eed18f518d4a10888a3abc91" - integrity sha1-NFizMhhWA+ju0Y9RjUoQiIo6vJE= - dependencies: - normalize-path "^2.1.1" - path-starts-with "^1.0.0" - content-disposition@0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" @@ -5646,13 +5638,12 @@ eslint-plugin-import@2.20.1: resolve "^1.12.0" eslint-plugin-import@^2.22.0: - version "2.23.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.23.2.tgz#ee15dd68fc7a1a1ba4c653c734e0d01c100d3484" - integrity sha512-LmNoRptHBxOP+nb0PIKz1y6OSzCJlB+0g0IGS3XV4KaKk2q4szqQ6s6F1utVf5ZRkxk/QOTjdxe7v4VjS99Bsg== + version "2.23.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.23.3.tgz#8a1b073289fff03c4af0f04b6df956b7d463e191" + integrity sha512-wDxdYbSB55F7T5CC7ucDjY641VvKmlRwT0Vxh7PkY1mI4rclVRFWYfsrjDgZvwYYDZ5ee0ZtfFKXowWjqvEoRQ== dependencies: array-includes "^3.1.3" array.prototype.flat "^1.2.4" - contains-path "^1.0.0" debug "^2.6.9" doctrine "^2.1.0" eslint-import-resolver-node "^0.3.4" @@ -6406,6 +6397,15 @@ fork-ts-checker-webpack-plugin@3.1.1: tapable "^1.0.0" worker-rpc "^0.1.0" +form-data@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" + integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + form-data@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" @@ -7724,7 +7724,7 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-potential-custom-element-name@^1.0.0: +is-potential-custom-element-name@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== @@ -8775,12 +8775,12 @@ jsdom@^14.1.0: xml-name-validator "^3.0.0" jsdom@^16.4.0: - version "16.5.3" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.3.tgz#13a755b3950eb938b4482c407238ddf16f0d2136" - integrity sha512-Qj1H+PEvUsOtdPJ056ewXM4UJPCi4hhLA8wpiz9F2YvsRBhuFsXxtrIFAgGBDynQA9isAMGE91PfUYbdMPXuTA== + version "16.6.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.6.0.tgz#f79b3786682065492a3da6a60a4695da983805ac" + integrity sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg== dependencies: abab "^2.0.5" - acorn "^8.1.0" + acorn "^8.2.4" acorn-globals "^6.0.0" cssom "^0.4.4" cssstyle "^2.3.0" @@ -8788,12 +8788,13 @@ jsdom@^16.4.0: decimal.js "^10.2.1" domexception "^2.0.1" escodegen "^2.0.0" + form-data "^3.0.0" html-encoding-sniffer "^2.0.1" - is-potential-custom-element-name "^1.0.0" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + is-potential-custom-element-name "^1.0.1" nwsapi "^2.2.0" parse5 "6.0.1" - request "^2.88.2" - request-promise-native "^1.0.9" saxes "^5.0.1" symbol-tree "^3.2.4" tough-cookie "^4.0.0" @@ -8803,7 +8804,7 @@ jsdom@^16.4.0: whatwg-encoding "^1.0.5" whatwg-mimetype "^2.3.0" whatwg-url "^8.5.0" - ws "^7.4.4" + ws "^7.4.5" xml-name-validator "^3.0.0" jsesc@^2.5.1: @@ -10972,13 +10973,6 @@ path-parse@^1.0.6: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== -path-starts-with@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/path-starts-with/-/path-starts-with-1.0.0.tgz#b28243015e8b138de572682ac52da42e646ad84e" - integrity sha1-soJDAV6LE43lcmgqxS2kLmRq2E4= - dependencies: - normalize-path "^2.1.1" - path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" @@ -11020,9 +11014,9 @@ performance-now@^2.1.0: integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d" - integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg== + version "2.3.0" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== pify@^2.0.0: version "2.3.0" @@ -12819,7 +12813,7 @@ request-promise-core@1.1.4: dependencies: lodash "^4.17.19" -request-promise-native@^1.0.5, request-promise-native@^1.0.9: +request-promise-native@^1.0.5: version "1.0.9" resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28" integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g== @@ -13591,9 +13585,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.8" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.8.tgz#eb1e97ad99b11bf3f82a3b71a0472dd9a00f2ecf" - integrity sha512-NDgA96EnaLSvtbM7trJj+t1LUR3pirkDCcz9nOUlPb5DMBGsH7oES6C3hs3j7R9oHEa1EMvReS/BUAIT5Tcr0g== + version "3.0.9" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f" + integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ== spdy-transport@^3.0.0: version "3.0.0" @@ -14307,9 +14301,9 @@ tr46@^1.0.1: punycode "^2.1.0" tr46@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479" - integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg== + version "2.1.0" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" + integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw== dependencies: punycode "^2.1.1" @@ -15450,7 +15444,7 @@ ws@^6.1.2, ws@^6.2.1: dependencies: async-limiter "~1.0.0" -ws@^7.4.4: +ws@^7.4.5: version "7.4.5" resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== From d66ccacd141f6df43c845da6d253a0e0fb221510 Mon Sep 17 00:00:00 2001 From: Robert Hunt Date: Mon, 24 May 2021 13:45:03 +1200 Subject: [PATCH 13/15] Improve checking of origL quotes --- package.json | 2 +- src/core/orig-quote-check.js | 35 ++++++++++++++++++++++------------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 7e4e14b8..07fd4a39 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "uw-content-validation", "description": "Functions for Checking Door43.org Scriptural Content/Resources.", - "version": "2.1.3_alpha5", + "version": "2.1.3", "private": false, "homepage": "https://unfoldingword.github.io/uw-content-validation/", "repository": { diff --git a/src/core/orig-quote-check.js b/src/core/orig-quote-check.js index 4abe6896..a78ecdbe 100644 --- a/src/core/orig-quote-check.js +++ b/src/core/orig-quote-check.js @@ -258,10 +258,9 @@ export async function checkOriginalLanguageQuoteAndOccurrence(languageCode, repo let details = `passage ►${fullVerseText}◄`; if (partDescription.length) details = `${partDescription} part of quote = "${foundQuoteSegment}" -- ${details}`; - // TODO: This algorithm is inadequate if a single word is inside another prior word, e.g., searching for δὲ in οὐδὲν δὲ συνκεκαλυμμένον ἐστὶν - let remainingVerseBits = partialVerseText.split(foundQuoteSegment); + let remainingVerseBits = partialVerseText.split(foundQuoteSegment); // NOTE: can split (badly) on short strings (like δὲ or εἰ) mid-word if (remainingVerseBits.length > 2) // Join the extra bits back up - remainingVerseBits = [remainingVerseBits[0], remainingVerseBits.slice(1).join(discontiguousDivider)]; + remainingVerseBits = [remainingVerseBits[0], remainingVerseBits.slice(1).join(discontiguousDivider)]; logicAssert(remainingVerseBits.length === 2, `remaining bits are ${remainingVerseBits.length}`); // Note: There's some Hebrew (RTL) characters at the beginning of the following regex @@ -270,25 +269,35 @@ export async function checkOriginalLanguageQuoteAndOccurrence(languageCode, repo const precedingChar = remainingVerseBits[0].slice(-1); // debugLog(`Previous char before ${C}:${V} '${foundQuoteSegment}' is '${precedingChar}'`); // const precedingRegex = new RegExp('[ ־*[("\'“‘]', 'g'); - if (foundQuoteSegment.slice(0) !== ' ' && remainingVerseBits[0] && precedingChar && ' ־*[("\'“‘—'.indexOf(precedingChar) === -1) { + // NOTE: This algorithm has to handle a single word inside another prior word, e.g., searching for δὲ in οὐδὲν δὲ συνκεκαλυμμένον ἐστὶν + if (foundQuoteSegment.slice(0) !== ' ' && remainingVerseBits[0] + && precedingChar && ' ־*[("\'“‘—'.indexOf(precedingChar) === -1 // handle punctuation expected before words + && (foundQuoteSegment.indexOf(' ') !== -1 || partialVerseText.indexOf(` ${foundQuoteSegment}`) === -1) // it's multiword, or there's not another word that fits + ) { let precederDescription; if (precedingChar === '\u2060') precederDescription = 'WordJoiner'; else if (precedingChar === '\u200D') precederDescription = 'ZeroWidth-WordJoiner'; else precederDescription = `${precedingChar}=D${precedingChar.charCodeAt(0)}/H${precedingChar.charCodeAt(0).toString(16)}`; - debugLog(`Seems '${foundQuoteSegment}' might not start at the beginning of a word—it’s preceded by '${precederDescription}' in '${fullVerseText}'`); + debugLog(`Seems ${bookID} ${C}:${V} '${foundQuoteSegment}' might not start at the beginning of a word—it’s preceded by '${precederDescription}' in '${partialVerseText}' of '${fullVerseText}'`); const excerpt = `(${precederDescription})${foundQuoteSegment.substring(0, excerptLength - 3)}${(foundQuoteSegment.length > excerptLength - 3 ? '…' : '')}${occurrenceString.length? ` occurrence=${occurrenceString}`:''}`; - addNotice({ priority: 909, message: "Seems original language quote might not start at the beginning of a word", details, characterIndex: 0, excerpt, location }); + // We greatly lower the priority if we're less sure that it's a genuine error + addNotice({ priority: foundQuoteSegment.indexOf(' ') !== -1 || fullVerseText.search(` ${foundQuoteSegment}`) === -1?909: 389, message: "Seems original language quote might not start at the beginning of a word", details, characterIndex: 0, excerpt, location }); } - // Note: There's some Hebrew (RTL) characters at the beginning of the following regex const followingChar = remainingVerseBits[1][0]; // debugLog(`Next char after ${C}:${V} '${foundQuoteSegment}' is '${followingChar}'`); - // const followingRegex = new RegExp('[ ׃־.,:;?!–)]', 'g'); - if (foundQuoteSegment.slice(-1) !== ' ' && remainingVerseBits[1] && followingChar && ' ׃־.,:;?!–—)'.indexOf(followingChar) === -1) { + // Note: There's some Hebrew (RTL) characters at the beginning of the following string used in regex + const allowedWordEndChars = ' ׃־.,:;?!–—)'; + const followingRegex = new RegExp(`${foundQuoteSegment}[${allowedWordEndChars}]`, 'g'); + if (foundQuoteSegment.slice(-1) !== ' ' && remainingVerseBits[1] + && followingChar && allowedWordEndChars.indexOf(followingChar) === -1 // handle punctuation expected after words + && (foundQuoteSegment.indexOf(' ') !== -1 || partialVerseText.search(followingRegex) === -1) // it's multiword, or there's not another word that fits + ) { // No problems if quote is followed by expected terminator-type punctuation const badCharString = `'${followingChar}'=D${followingChar.charCodeAt(0)}/H${followingChar.charCodeAt(0).toString(16)}`; - debugLog(`Seems '${foundQuoteSegment}' might not finish at the end of a word—it’s followed by ${badCharString} in '${fullVerseText}'`); + debugLog(`Seems ${bookID} ${C}:${V} '${foundQuoteSegment}' might not finish at the end of a word—it’s followed by ${badCharString} in '${partialVerseText}' of '${fullVerseText}'`); const excerpt = `${(foundQuoteSegment.length > excerptLength - 3 ? '…' : '')}${foundQuoteSegment.substring(foundQuoteSegment.length - excerptLength + 3, foundQuoteSegment.length)}(${followingChar}=D${remainingVerseBits[1].charCodeAt(0)}/H${remainingVerseBits[1].charCodeAt(0).toString(16)})${occurrenceString.length? ` occurrence=${occurrenceString}`:''}`; - addNotice({ priority: 908, message: "Seems original language quote might not finish at the end of a word", details, characterIndex: foundQuoteSegment.length, excerpt, location }); + // We greatly lower the priority if we're less sure that it's a genuine error + addNotice({ priority: foundQuoteSegment.indexOf(' ') !== -1 || fullVerseText.search(followingRegex) === -1? 908: 388, message: "Seems original language quote might not finish at the end of a word", details, characterIndex: foundQuoteSegment.length, excerpt, location }); } } // end of checkFoundQuoteSegment function @@ -456,7 +465,7 @@ export async function checkOriginalLanguageQuoteAndOccurrence(languageCode, repo } } else { // We found this bit // debugLog(`Found ${C}:${V} origQuote portion ${bitIndex} '${quoteBits[bitIndex]}' at ${quoteIndex} (num text chars = ${verseText.length})`); - const verseTextBits = verseText.split(quoteBits[bitIndex]); + const verseTextBits = verseText.split(quoteBits[bitIndex]); // NOTE: can split (badly) on short strings (like δὲ or εἰ) mid-word checkFoundQuoteSegment(quoteBits[bitIndex], partDescription, occurrenceString, `${verseTextBits[occurrence-1]}${quoteBits[bitIndex]}${verseTextBits[occurrence]}`, verseText, ourLocation); } } @@ -466,7 +475,7 @@ export async function checkOriginalLanguageQuoteAndOccurrence(languageCode, repo if (verseText.indexOf(fieldText) >= 0) { if (occurrence > 1) { // functionLog(`checkOriginalLanguageQuoteAndOccurrence is checking for ${occurrence} occurrences of ${fieldText}`); - const verseTextBits = verseText.split(fieldText); + const verseTextBits = verseText.split(fieldText); // NOTE: can split (badly) on short strings (like δὲ or εἰ) mid-word const actualNumOccurrences = verseTextBits.length - 1; if (occurrence > actualNumOccurrences) { // There's not enough of them const actualOccurrencesText = actualNumOccurrences === 0 ? 'no' : `only ${actualNumOccurrences}`; From 3ba283d7d82eddb558a8df03e10deaf3d553cf54 Mon Sep 17 00:00:00 2001 From: Robert Hunt Date: Mon, 24 May 2021 17:46:29 +1200 Subject: [PATCH 14/15] Fix TSV6 field name --- noticeList.txt | 42 +++++++++++++++++----------------- src/core/twl-tsv6-row-check.js | 18 +++++++-------- yarn.lock | 6 ++--- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/noticeList.txt b/noticeList.txt index 8da304a2..875856df 100644 --- a/noticeList.txt +++ b/noticeList.txt @@ -1,4 +1,4 @@ -Last updated 2021-05-24 09:07:06.144138 by makeNoticeList.py +Last updated 2021-05-24 15:18:39.038077 by makeNoticeList.py Got 490 notices: checkRepoResult.noticeList.push( 997, "Repository doesn’t exist", details, username, repoCode, repoName, location: givenLocation, extra: repoCode from checkRepo.js line 267 languageCode === 'en' || languageCode === 'fr' ? 490 : 190, "Expected header field to contain a mixed-case string", fieldName: `\\$marker`, excerpt: rest, C, V, location: lineLocation from usfm-text-check.js line 971 @@ -7,6 +7,8 @@ Got 490 notices: C === '1' ? 657 : 457, C, V, "Paragraph marker expected before first verse", lineNumber: n, characterIndex: 1, details: `'\\$marker' after '\\$lastMarker'`, location: ourLocation from usfm-text-check.js line 1,219 thisPriority, `Mismatched $leftChar$rightChar characters`, details: `left=$leftCount.toLocaleString(), right=$rightCount.toLocaleString()`, location: ourLocation from field-text-check.js line 404 thisPriority, thisMessage, excerpt: regexResultArray[0], location: ourLocation from field-text-check.js line 419 + foundQuoteSegment.indexOf(' ') !== -1 || fullVerseText.search(` $foundQuoteSegment`) === -1?909: 389, "Seems original language quote might not start at the beginning of a word", details, characterIndex: 0, excerpt, location from orig-quote-check.js line 284 + foundQuoteSegment.indexOf(' ') !== -1 || fullVerseText.search(followingRegex) === -1? 908: 388, "Seems original language quote might not finish at the end of a word", details, characterIndex: foundQuoteSegment.length, excerpt, location from orig-quote-check.js line 300 leftChar === '“' ? 162 : 462, `Mismatched $leftChar$rightChar characters`, details: `left=$leftCount.toLocaleString(), right=$rightCount.toLocaleString()`, location: ourLocation from plain-text-check.js line 245 999, "checkRepo function FAILED", repoName, excerpt: checkRepoError, location: repoName from RepoCheck.js line 114 997, "Repository doesn’t exist", details, username, repoCode, repoName, location: manifestLocation, extra: repoCode from checkBookPackage.js line 187 @@ -82,26 +84,24 @@ Got 490 notices: 929, "'projects' key is missing", location: ourLocation from manifest-text-check.js line 674 928, "'dublin_core' key is missing", location: ourLocation from manifest-text-check.js line 672 920, yamlError.message, location: ourLocation ) from yaml-text-check.js line 175 - 919, "Missing Quote field", fieldName: 'Quote', rowID, location: ourRowLocation from twl-tsv6-row-check.js line 368 + 919, "Missing OrigWords field", fieldName: 'OrigWords', rowID, location: ourRowLocation from twl-tsv6-row-check.js line 368 919, "Missing OrigQuote field", fieldName: 'OrigQuote', rowID, location: ourRowLocation from tn-tsv9-row-check.js line 424 919, "Missing Quote field", fieldName: 'Quote', rowID, location: ourRowLocation from questions-tsv7-row-check.js line 424 919, "Missing Quote field", fieldName: 'Quote', rowID, location: ourRowLocation from notes-tsv7-row-check.js line 485 - 917, "Unable to find duplicate original language quote in verse text", details: `occurrence=$occurrenceString but $actualOccurrencesText occurrence$actualNumOccurrences === 1 ? '' : 's' found, passage ►$verseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 474 - 916, "Unable to find original language quote in verse text", details: "quote which starts with a space" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 324 - 916, "Unable to find original language quote in verse text", details: "quote which ends with a space" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 327 - 916, "Unable to find original language quote in verse text", details: "quote which starts with 'word joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 330 - 916, "Unable to find original language quote in verse text", details: "quote which ends with 'word joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 333 - 916, "Unable to find original language quote in verse text", details: "quote which starts with 'zero-width space'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 336 - 916, "Unable to find original language quote in verse text", details: "quote which ends with 'zero-width space'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 339 - 916, "Unable to find original language quote in verse text", details: "quote which starts with 'zero-width joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 342 - 916, "Unable to find original language quote in verse text", details: "quote which ends with 'zero-width joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 345 - 916, "Unable to find original language quote in verse text", details: noBreakSpaceText ? noBreakSpaceText : `passage ►$fullVerseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 348 - 914, "Unable to find original language quote portion in the right place in the verse text", details: `passage ►$verseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 451 + 917, "Unable to find duplicate original language quote in verse text", details: `occurrence=$occurrenceString but $actualOccurrencesText occurrence$actualNumOccurrences === 1 ? '' : 's' found, passage ►$verseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 483 + 916, "Unable to find original language quote in verse text", details: "quote which starts with a space" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 333 + 916, "Unable to find original language quote in verse text", details: "quote which ends with a space" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 336 + 916, "Unable to find original language quote in verse text", details: "quote which starts with 'word joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 339 + 916, "Unable to find original language quote in verse text", details: "quote which ends with 'word joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 342 + 916, "Unable to find original language quote in verse text", details: "quote which starts with 'zero-width space'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 345 + 916, "Unable to find original language quote in verse text", details: "quote which ends with 'zero-width space'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 348 + 916, "Unable to find original language quote in verse text", details: "quote which starts with 'zero-width joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 351 + 916, "Unable to find original language quote in verse text", details: "quote which ends with 'zero-width joiner'" + (noBreakSpaceText ? ' ' + noBreakSpaceText : ''), excerpt, location: ourLocation from orig-quote-check.js line 354 + 916, "Unable to find original language quote in verse text", details: noBreakSpaceText ? noBreakSpaceText : `passage ►$fullVerseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 357 + 914, "Unable to find original language quote portion in the right place in the verse text", details: `passage ►$verseText◄`, excerpt, location: ourLocation from orig-quote-check.js line 460 912, 'Missing | character in \\w line', lineNumber, C, V, characterIndex, excerpt, location: lineLocation from usfm-text-check.js line 678 911, 'Missing | character in \\w field', details, lineNumber, C, V, characterIndex, excerpt, location: lineLocation from usfm-text-check.js line 734 911, 'Missing | character in \\+w field', details, lineNumber, C, V, characterIndex, excerpt, location: lineLocation from usfm-text-check.js line 755 - 909, "Seems original language quote might not start at the beginning of a word", details, characterIndex: 0, excerpt, location from orig-quote-check.js line 280 - 908, "Seems original language quote might not finish at the end of a word", details, characterIndex: foundQuoteSegment.length, excerpt, location from orig-quote-check.js line 291 903, "Bad function call: should be given a valid book abbreviation", excerpt: bookID, location: ourLocation from usfm-text-check.js line 1,068 902, "Bad function call: should be given a valid book abbreviation", excerpt: bookID, location: ` (not '$bookID')$generalLocation` ); return checkBookPackageResult; from checkBookPackage.js line 317 900, "Bad parameter: should be given a valid book abbreviation", excerpt: bookIDList, location: ` (not '$bookIDList')` from checkBookPackages.js line 76 @@ -142,7 +142,7 @@ Got 490 notices: 854, "Unexpected sixth original \\w attribute", details: "expected third 'x-tw'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 865 853, "Unexpected extra original \\w attribute", details, lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 867 852, "Unexpected original \\w x-morph language prefix", details: "Expected 'He,' 'Ar,' or 'Gr,'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 871 - 851, bookID === 'OBS' ? "Unable to load OBS story text" : "Unable to load original language verse text", location: ourLocation from orig-quote-check.js line 422 + 851, bookID === 'OBS' ? "Unable to load OBS story text" : "Unable to load original language verse text", location: ourLocation from orig-quote-check.js line 431 849, `Unexpected '$badCharCombination' character combination`, characterIndex, excerpt, location: ourLocation from field-text-check.js line 373 848, "Unexpected first translation \\w attribute", details: "expected 'x-occurrence'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 877 847, "Unexpected second translation \\w attribute", details: "expected 'x-occurrences'", lineNumber, C, V, excerpt: regexResultArray2[0], location: lineLocation from usfm-text-check.js line 880 @@ -190,7 +190,7 @@ Got 490 notices: 820, "Missing chapter number", rowID, fieldName: 'Reference', location: ` ?:$V$ourRowLocation` from questions-tsv7-row-check.js line 362 820, "Missing chapter number", rowID, fieldName: 'Reference', location: ` ?:$V$ourRowLocation` from notes-tsv7-row-check.js line 395 819, "Missing compulsory USFM line", excerpt: `missing \\$compulsoryMarker`, location: fileLocation from usfm-text-check.js line 602 - 815, "Divider without surrounding snippet", location: ourLocation from orig-quote-check.js line 464 + 815, "Divider without surrounding snippet", location: ourLocation from orig-quote-check.js line 473 814, "Invalid zero verse number", rowID, fieldName: 'Reference', excerpt: V, location: ourRowLocation from twl-tsv6-row-check.js line 316 814, "Invalid zero verse number", rowID, fieldName: 'Verse', excerpt: V, location: ourRowLocation from tn-tsv9-row-check.js line 355 814, "Invalid zero verse number", rowID, fieldName: 'Reference', excerpt: V, location: ourRowLocation from questions-tsv7-row-check.js line 371 @@ -452,9 +452,9 @@ Got 490 notices: 173, "Row ID characters should only be lowercase letters, digits, or hypen", fieldName: 'ID', characterIndex: 2, rowID, excerpt: rowID, location: ourRowLocation from questions-tsv7-row-check.js line 403 173, "Row ID characters should only be lowercase letters, digits, or hypen", fieldName: 'ID', characterIndex: 2, rowID, excerpt: rowID, location: ourRowLocation from notes-tsv7-row-check.js line 436 172, "Header levels should only increment by one", lineNumber: n, characterIndex: 0, location: ourLocation ; from markdown-text-check.js line 301 - 159, "Should use proper ellipse character (not periods)", characterIndex, excerpt, location: ourLocation from orig-quote-check.js line 383 - 158, `Unexpected space(s) beside divider $discontiguousDivider`, characterIndex, excerpt, location: ourLocation from orig-quote-check.js line 392 - 156, "Unexpected space(s) beside ellipse characters", characterIndex, excerpt, location: ourLocation from orig-quote-check.js line 406 + 159, "Should use proper ellipse character (not periods)", characterIndex, excerpt, location: ourLocation from orig-quote-check.js line 392 + 158, `Unexpected space(s) beside divider $discontiguousDivider`, characterIndex, excerpt, location: ourLocation from orig-quote-check.js line 401 + 156, "Unexpected space(s) beside ellipse characters", characterIndex, excerpt, location: ourLocation from orig-quote-check.js line 415 152, "Should http link be https", excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,190 148, "'checking' key is missing", location: ourLocation from manifest-text-check.js line 676 144, "Unknown Bible book name in TN link", details: totalLink, excerpt: optionalB1, location: ourLocation from notes-links-check.js line 1,099 @@ -484,7 +484,7 @@ Got 490 notices: 67, C: chapterNumberString, V: `$v`, "Verse appears to be left out", location: CVlocation from usfm-text-check.js line 473 64, "Unexpected leading space(s) after break", characterIndex, excerpt, location: ourLocation from field-text-check.js line 157 63, "Unexpected leading space(s) after line break", characterIndex, excerpt, location: ourLocation from field-text-check.js line 162 - 50, "Is this quote/occurrence correct???", details: `Occurrence=$occurrence`, excerpt: fieldText, location: ourLocation from orig-quote-check.js line 432 + 50, "Is this quote/occurrence correct???", details: `Occurrence=$occurrence`, excerpt: fieldText, location: ourLocation from orig-quote-check.js line 441 32, `Untested general/outside link`, details: "please manually double-check link—probably no problem", excerpt: totalLink, location: ourLocation from notes-links-check.js line 1,156 20, "Note that 'disableAllLinkFetchingFlag' was set so link targets were not checked", location: ourLocation from tn-tsv9-table-check.js line 264 20, "Note that 'disableAllLinkFetchingFlag' was set so link targets were not checked", location: ourLocation from twl-tsv6-table-check.js line 253 diff --git a/src/core/twl-tsv6-row-check.js b/src/core/twl-tsv6-row-check.js index cff4e5bd..63b0c04e 100644 --- a/src/core/twl-tsv6-row-check.js +++ b/src/core/twl-tsv6-row-check.js @@ -9,7 +9,7 @@ import { checkOriginalLanguageQuoteAndOccurrence } from './orig-quote-check'; import { parameterAssert } from './utilities'; -// const TWL_TABLE_ROW_VALIDATOR_VERSION_STRING = '0.1.5'; +// const TWL_TABLE_ROW_VALIDATOR_VERSION_STRING = '0.1.6'; const NUM_EXPECTED_TWL_TSV_FIELDS = 6; // so expects 5 tabs per line const EXPECTED_TWL_HEADING_LINE = 'Reference\tID\tTags\tOrigWords\tOccurrence\tTWLink'; @@ -262,7 +262,7 @@ export async function checkTWL_TSV6DataRow(languageCode, repoCode, line, bookID, let fields = line.split('\t'); let RIDSuggestion, QSuggestion, OSuggestion, LSuggestion; if (fields.length === NUM_EXPECTED_TWL_TSV_FIELDS) { - const [reference, rowID, tags, quote, occurrence, TWLink] = fields; + const [reference, rowID, tags, origWords, occurrence, TWLink] = fields; // let withString = ` with '${rowID}'${inString}`; // let CV_withString = ` ${C}:${V}${withString}`; // let atString = ` at ${B} ${C}:${V} (${rowID})${inString}`; @@ -356,20 +356,20 @@ export async function checkTWL_TSV6DataRow(languageCode, repoCode, line, bookID, } } - if (quote.length) { // need to check UTN against UHB and UGNT - QSuggestion = ourCheckTextField(rowID, 'Quote', quote, false, ourRowLocation, checkingOptions); + if (origWords.length) { // need to check UTN against UHB and UGNT + QSuggestion = ourCheckTextField(rowID, 'OrigWords', origWords, false, ourRowLocation, checkingOptions); if (occurrence.length) - await ourCheckTNOriginalLanguageQuoteAndOccurrence(rowID, 'Quote', quote, occurrence, ourRowLocation, checkingOptions); + await ourCheckTNOriginalLanguageQuoteAndOccurrence(rowID, 'OrigWords', origWords, occurrence, ourRowLocation, checkingOptions); else addNoticePartial({ priority: 750, message: "Missing occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, location: ourRowLocation }); } else // TODO: Find more details about when these fields are really compulsory (and when they're not, e.g., for 'intro') ??? if (V !== 'intro' && occurrence !== '0') - addNoticePartial({ priority: 919, message: "Missing Quote field", fieldName: 'Quote', rowID, location: ourRowLocation }); + addNoticePartial({ priority: 919, message: "Missing OrigWords field", fieldName: 'OrigWords', rowID, location: ourRowLocation }); if (occurrence.length) { // This should usually be a digit if (occurrence === '0') { // zero means that it doesn’t occur - if (quote.length) { + if (origWords.length) { addNoticePartial({ priority: 751, message: "Invalid zero occurrence field when we have an original quote", fieldName: 'Occurrence', rowID, excerpt: occurrence, location: ourRowLocation }); OSuggestion = '1'; } @@ -383,7 +383,7 @@ export async function checkTWL_TSV6DataRow(languageCode, repoCode, line, bookID, OSuggestion = '1'; } } - else if (quote.length) { + else if (origWords.length) { addNoticePartial({ priority: 791, message: `Missing occurrence field`, fieldName: 'Occurrence', rowID, location: ourRowLocation }); OSuggestion = '1'; } @@ -417,7 +417,7 @@ export async function checkTWL_TSV6DataRow(languageCode, repoCode, line, bookID, addNoticePartial({ priority: 799, message: "Missing TWLink field", fieldName: 'TWLink', rowID, location: ourRowLocation }); // 7 [reference, rowID, tags, quote, occurrence, TWLink] - const suggestion = `${reference}\t${RIDSuggestion === undefined ? rowID : RIDSuggestion}\t${tags}\t${QSuggestion === undefined ? quote : QSuggestion}\t${OSuggestion === undefined ? occurrence : OSuggestion}\t${LSuggestion === undefined ? TWLink : LSuggestion}`; + const suggestion = `${reference}\t${RIDSuggestion === undefined ? rowID : RIDSuggestion}\t${tags}\t${QSuggestion === undefined ? origWords : QSuggestion}\t${OSuggestion === undefined ? occurrence : OSuggestion}\t${LSuggestion === undefined ? TWLink : LSuggestion}`; if (suggestion !== line) { drResult.suggestion = suggestion; } diff --git a/yarn.lock b/yarn.lock index 4d90736a..6c5413d7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7130,9 +7130,9 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24: safer-buffer ">= 2.1.2 < 3" iconv-lite@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01" - integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ== + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== dependencies: safer-buffer ">= 2.1.2 < 3.0.0" From caf079c80e764e868e623355ceeed430b640b82d Mon Sep 17 00:00:00 2001 From: Robert Hunt Date: Mon, 24 May 2021 17:58:33 +1200 Subject: [PATCH 15/15] Disable debug statements --- src/core/orig-quote-check.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/orig-quote-check.js b/src/core/orig-quote-check.js index a78ecdbe..f5b51346 100644 --- a/src/core/orig-quote-check.js +++ b/src/core/orig-quote-check.js @@ -278,7 +278,7 @@ export async function checkOriginalLanguageQuoteAndOccurrence(languageCode, repo if (precedingChar === '\u2060') precederDescription = 'WordJoiner'; else if (precedingChar === '\u200D') precederDescription = 'ZeroWidth-WordJoiner'; else precederDescription = `${precedingChar}=D${precedingChar.charCodeAt(0)}/H${precedingChar.charCodeAt(0).toString(16)}`; - debugLog(`Seems ${bookID} ${C}:${V} '${foundQuoteSegment}' might not start at the beginning of a word—it’s preceded by '${precederDescription}' in '${partialVerseText}' of '${fullVerseText}'`); + // debugLog(`Seems ${bookID} ${C}:${V} '${foundQuoteSegment}' might not start at the beginning of a word—it’s preceded by '${precederDescription}' in '${partialVerseText}' of '${fullVerseText}'`); const excerpt = `(${precederDescription})${foundQuoteSegment.substring(0, excerptLength - 3)}${(foundQuoteSegment.length > excerptLength - 3 ? '…' : '')}${occurrenceString.length? ` occurrence=${occurrenceString}`:''}`; // We greatly lower the priority if we're less sure that it's a genuine error addNotice({ priority: foundQuoteSegment.indexOf(' ') !== -1 || fullVerseText.search(` ${foundQuoteSegment}`) === -1?909: 389, message: "Seems original language quote might not start at the beginning of a word", details, characterIndex: 0, excerpt, location }); @@ -293,8 +293,8 @@ export async function checkOriginalLanguageQuoteAndOccurrence(languageCode, repo && (foundQuoteSegment.indexOf(' ') !== -1 || partialVerseText.search(followingRegex) === -1) // it's multiword, or there's not another word that fits ) { // No problems if quote is followed by expected terminator-type punctuation - const badCharString = `'${followingChar}'=D${followingChar.charCodeAt(0)}/H${followingChar.charCodeAt(0).toString(16)}`; - debugLog(`Seems ${bookID} ${C}:${V} '${foundQuoteSegment}' might not finish at the end of a word—it’s followed by ${badCharString} in '${partialVerseText}' of '${fullVerseText}'`); + // const badCharString = `'${followingChar}'=D${followingChar.charCodeAt(0)}/H${followingChar.charCodeAt(0).toString(16)}`; + // debugLog(`Seems ${bookID} ${C}:${V} '${foundQuoteSegment}' might not finish at the end of a word—it’s followed by ${badCharString} in '${partialVerseText}' of '${fullVerseText}'`); const excerpt = `${(foundQuoteSegment.length > excerptLength - 3 ? '…' : '')}${foundQuoteSegment.substring(foundQuoteSegment.length - excerptLength + 3, foundQuoteSegment.length)}(${followingChar}=D${remainingVerseBits[1].charCodeAt(0)}/H${remainingVerseBits[1].charCodeAt(0).toString(16)})${occurrenceString.length? ` occurrence=${occurrenceString}`:''}`; // We greatly lower the priority if we're less sure that it's a genuine error addNotice({ priority: foundQuoteSegment.indexOf(' ') !== -1 || fullVerseText.search(followingRegex) === -1? 908: 388, message: "Seems original language quote might not finish at the end of a word", details, characterIndex: foundQuoteSegment.length, excerpt, location });