From 2c02747cfe547fe30583b07c742da528105bdc70 Mon Sep 17 00:00:00 2001 From: Henry Whitney Date: Wed, 6 Nov 2019 17:03:53 -0500 Subject: [PATCH] PDF Isaiah 1-14 partial --- .../Exceptions_tWs_from_MAST_HB.txt | 90 +++++++------------ .../Output/Entries_not_handled.txt | 65 +------------- .../FilesForUpdates/tWs.from.MAST_HB.pl | 19 ++-- .../FilesForUpdates/tWs.from.MAST_NT.pl | 2 +- 4 files changed, 48 insertions(+), 128 deletions(-) diff --git a/MAST_tW_PDF_Updater/FilesForUpdates/Exceptions/Exceptions_tWs_from_MAST_HB.txt b/MAST_tW_PDF_Updater/FilesForUpdates/Exceptions/Exceptions_tWs_from_MAST_HB.txt index 3a112cf..6003ed7 100644 --- a/MAST_tW_PDF_Updater/FilesForUpdates/Exceptions/Exceptions_tWs_from_MAST_HB.txt +++ b/MAST_tW_PDF_Updater/FilesForUpdates/Exceptions/Exceptions_tWs_from_MAST_HB.txt @@ -20652,6 +20652,7 @@ Isaiah 5:14 3381 || Isaiah 5:14 5315 || Isaiah 5:14 6310 || Isaiah 5:14 7588 || +Isaiah 5:15 120 || Isaiah 5:15 376 || Isaiah 5:15 1364 || Isaiah 5:15 5869 || @@ -20955,36 +20956,33 @@ Isaiah 10:34 1270 || Isaiah 10:34 3293 || Isaiah 10:34 5307 || Isaiah 10:34 5362 || -Isaiah 11:1 2415 +Isaiah 11:1 2415 || Isaiah 11:1 3318 || Isaiah 11:3 241 || Isaiah 11:3 3068 || Isaiah 11:3 4758 || Isaiah 11:3 5869 || -Isaiah 11:4 4191 +Isaiah 11:4 4191 slay Isaiah 11:4 4334 || Isaiah 11:4 6310 || Isaiah 11:4 8193 || -Isaiah 11:5 2504 +Isaiah 11:5 2504 waist Isaiah 11:6 1481 || Isaiah 11:7 398 || Isaiah 11:7 7462 || -Isaiah 11:8 2352 -Isaiah 11:8 6848 -Isaiah 11:8 8173 -Isaiah 11:10 5251 +Isaiah 11:8 2352 || +Isaiah 11:8 8173 play Isaiah 11:11 3254 || Isaiah 11:11 7069 || Isaiah 11:11 8145 || -Isaiah 11:12 1760 +Isaiah 11:12 1760 || Isaiah 11:12 3671 || -Isaiah 11:12 5251 Isaiah 11:12 5310 || Isaiah 11:12 5375 || -Isaiah 11:12 6908 +Isaiah 11:12 6908 gather Isaiah 11:14 3027 || Isaiah 11:14 3220 || -Isaiah 11:14 4916 +Isaiah 11:14 4916 || Isaiah 11:14 6924 || Isaiah 11:15 1869 || Isaiah 11:15 3956 || @@ -20996,10 +20994,10 @@ Isaiah 11:16 3117 || Isaiah 11:16 5927 || Isaiah 11:16 7604 || Isaiah 12:1 3034 || -Isaiah 12:2 5797 +Isaiah 12:2 5797 strength Isaiah 12:4 3034 || -Isaiah 12:5 1348 -Isaiah 12:5 2167 +Isaiah 12:5 2167 Praise ... in song +Isaiah 12:5 3068 Yahweh Isaiah 12:6 3427 || Isaiah 13:1 2372 || Isaiah 13:2 935 || @@ -21007,90 +21005,74 @@ Isaiah 13:2 5130 || Isaiah 13:2 5375 || Isaiah 13:2 7311 || Isaiah 13:3 1346 || -Isaiah 13:3 6942 Isaiah 13:4 1471 || Isaiah 13:4 6485 || Isaiah 13:4 6963 || Isaiah 13:4 7588 || Isaiah 13:5 935 || -Isaiah 13:5 2195 Isaiah 13:5 3627 || Isaiah 13:5 8064 || Isaiah 13:6 935 || Isaiah 13:6 3068 || -Isaiah 13:6 3213 Isaiah 13:6 7138 || Isaiah 13:7 7503 || Isaiah 13:8 376 || Isaiah 13:8 2256 || Isaiah 13:8 7453 || -Isaiah 13:8 8539 Isaiah 13:9 639 || Isaiah 13:9 935 || Isaiah 13:9 3068 || -Isaiah 13:9 8045 +Isaiah 13:9 7760 || Isaiah 13:10 1984 || Isaiah 13:10 3318 || -Isaiah 13:11 5771 +Isaiah 13:11 5771 iniquity Isaiah 13:11 7673 || -Isaiah 13:11 8213 Isaiah 13:13 639 || Isaiah 13:13 4725 || -Isaiah 13:13 6635 +Isaiah 13:13 6635 || Isaiah 13:13 7493 || Isaiah 13:14 376 || -Isaiah 13:14 5080 -Isaiah 13:14 6908 -Isaiah 13:15 1856 +Isaiah 13:14 5080 || Isaiah 13:15 4672 || Isaiah 13:15 5307 || -Isaiah 13:15 5595 Isaiah 13:16 5869 || Isaiah 13:16 7901 || Isaiah 13:17 2803 || Isaiah 13:17 5782 || Isaiah 13:18 990 || Isaiah 13:18 5869 || -Isaiah 13:18 6529 Isaiah 13:18 7198 || -Isaiah 13:19 1347 -Isaiah 13:20 5331 -Isaiah 13:20 6163 +Isaiah 13:19 8597 Isaiah 13:20 7931 || Isaiah 13:21 1323 || Isaiah 13:21 7931 || -Isaiah 13:22 338 +Isaiah 13:22 338 || Isaiah 13:22 935 || -Isaiah 13:22 6027 +Isaiah 13:22 6027 || Isaiah 13:22 6256 || -Isaiah 13:22 8577 -Isaiah 14:1 5596 +Isaiah 13:22 8577 || +Isaiah 14:1 5596 || Isaiah 14:1 5750 || Isaiah 14:2 935 || Isaiah 14:2 4725 || -Isaiah 14:2 5157 -Isaiah 14:3 7186 +Isaiah 14:3 7186 hard Isaiah 14:4 4912 || Isaiah 14:4 5375 || Isaiah 14:4 7673 || Isaiah 14:6 4347 || Isaiah 14:6 5221 || -Isaiah 14:6 5627 +Isaiah 14:6 5627 || Isaiah 14:8 227 || Isaiah 14:8 5927 || Isaiah 14:8 7901 || Isaiah 14:9 935 || -Isaiah 14:9 6260 Isaiah 14:9 6965 || Isaiah 14:9 7264 || Isaiah 14:10 2470 || -Isaiah 14:10 4911 +Isaiah 14:10 4911 like Isaiah 14:10 6030 || -Isaiah 14:11 1347 Isaiah 14:11 5035 || -Isaiah 14:12 2522 Isaiah 14:12 5307 || -Isaiah 14:12 7837 Isaiah 14:13 3427 || Isaiah 14:13 4605 || Isaiah 14:13 7311 || @@ -21099,32 +21081,28 @@ Isaiah 14:14 5927 || Isaiah 14:16 376 || Isaiah 14:16 995 || Isaiah 14:16 7200 || -Isaiah 14:17 2040 +Isaiah 14:17 2040 overthrew Isaiah 14:17 5892 || Isaiah 14:18 376 || Isaiah 14:18 1004 || -Isaiah 14:19 947 -Isaiah 14:19 2026 Isaiah 14:19 3381 || -Isaiah 14:19 8581 Isaiah 14:20 7121 || Isaiah 14:21 3559 || Isaiah 14:21 5892 || Isaiah 14:21 6440 || -Isaiah 14:22 5209 -Isaiah 14:22 6635 +Isaiah 14:22 5209 descendant +Isaiah 14:22 5220 +Isaiah 14:22 6635 || Isaiah 14:22 7605 || -Isaiah 14:23 98 -Isaiah 14:23 6635 -Isaiah 14:23 8045 -Isaiah 14:24 3289 -Isaiah 14:24 6635 +Isaiah 14:23 98 || +Isaiah 14:23 6635 || +Isaiah 14:23 8045 destruction +Isaiah 14:24 6635 || Isaiah 14:25 5493 || Isaiah 14:25 7665 || -Isaiah 14:26 3289 Isaiah 14:26 5186 || Isaiah 14:27 6565 || -Isaiah 14:27 6635 +Isaiah 14:27 6635 || Isaiah 14:27 7725 || Isaiah 14:29 3318 || Isaiah 14:29 5221 || @@ -21990,7 +21968,7 @@ Isaiah 33:23 2256 || Isaiah 33:23 2388 || Isaiah 33:23 2505 || Isaiah 33:23 5203 || -Isaiah 33:23 5251 +Isaiah 33:23 5251 || Isaiah 33:23 5706 Isaiah 33:23 7998 Isaiah 33:24 2470 || diff --git a/MAST_tW_PDF_Updater/FilesForUpdates/Output/Entries_not_handled.txt b/MAST_tW_PDF_Updater/FilesForUpdates/Output/Entries_not_handled.txt index c2b4877..b68f064 100644 --- a/MAST_tW_PDF_Updater/FilesForUpdates/Output/Entries_not_handled.txt +++ b/MAST_tW_PDF_Updater/FilesForUpdates/Output/Entries_not_handled.txt @@ -1,59 +1,5 @@ -Isaiah 11:1 2415 -Isaiah 11:4 4191 -Isaiah 11:5 2504 -Isaiah 11:8 8173 -Isaiah 11:8 2352 -Isaiah 11:8 6848 -Isaiah 11:10 5251 -Isaiah 11:12 5251 -Isaiah 11:12 1760 -Isaiah 11:12 6908 -Isaiah 11:14 4916 -Isaiah 12:2 5797 -Isaiah 12:5 2167 -Isaiah 12:5 1348 -Isaiah 13:3 6942 -Isaiah 13:5 2195 -Isaiah 13:6 3213 -Isaiah 13:8 8539 -Isaiah 13:9 8045 -Isaiah 13:11 5771 -Isaiah 13:13 6635 -Isaiah 13:14 5080 -Isaiah 13:14 6908 -Isaiah 13:15 1856 -Isaiah 13:15 5595 -Isaiah 13:18 6529 -Isaiah 13:19 1347 -Isaiah 13:20 5331 -Isaiah 13:20 6163 -Isaiah 13:22 338 -Isaiah 13:22 8577 -Isaiah 13:22 6027 -Isaiah 14:1 5596 -Isaiah 14:2 5157 -Isaiah 14:3 7186 -Isaiah 14:6 5627 -Isaiah 14:9 6260 -Isaiah 14:10 4911 -Isaiah 14:11 1347 -Isaiah 14:12 7837 -Isaiah 14:12 2522 -Isaiah 14:17 2040 -Isaiah 14:19 8581 -Isaiah 14:19 2026 -Isaiah 14:19 947 -Isaiah 14:22 6635 -Isaiah 14:22 5209 -Isaiah 14:23 98 -Isaiah 14:23 8045 -Isaiah 14:23 6635 -Isaiah 14:24 6635 -Isaiah 14:24 3289 -Isaiah 14:26 3289 -Isaiah 14:27 6635 -Isaiah 14:29 6848 -Isaiah 14:29 8314 +Isaiah 13:19 8597 +Isaiah 14:22 5220 Isaiah 14:31 3213 Isaiah 15:2 3213 Isaiah 15:3 2296 @@ -159,12 +105,10 @@ Isaiah 25:6 6635 Isaiah 25:6 2212 Isaiah 25:11 8213 Isaiah 25:12 4869 -Isaiah 25:12 8213 -Isaiah 26:5 8213 +Isaiah 26:5 7682 Isaiah 26:12 8239 Isaiah 26:18 2029 Isaiah 26:20 7281 -Isaiah 26:20 2195 Isaiah 27:2 2531 Isaiah 27:4 8068 Isaiah 27:5 4581 @@ -267,7 +211,6 @@ Isaiah 33:15 6105 Isaiah 33:16 4869 Isaiah 33:19 3932 Isaiah 33:19 998 -Isaiah 33:23 5251 Isaiah 33:23 5706 Isaiah 33:23 7998 Isaiah 33:23 962 @@ -391,7 +334,6 @@ Isaiah 45:24 6666 Isaiah 46:3 6006 Isaiah 46:3 7356 Isaiah 46:5 4911 -Isaiah 46:11 6098 Isaiah 46:13 8597 Isaiah 47:1 7390 Isaiah 47:4 6635 @@ -530,7 +472,6 @@ Isaiah 65:8 8492 Isaiah 65:19 2201 Isaiah 65:23 928 Isaiah 65:23 6631 -Isaiah 65:25 5175 Isaiah 65:25 7843 Isaiah 66:3 4503 Isaiah 66:3 2386 diff --git a/MAST_tW_PDF_Updater/FilesForUpdates/tWs.from.MAST_HB.pl b/MAST_tW_PDF_Updater/FilesForUpdates/tWs.from.MAST_HB.pl index 841290e..0673ad8 100644 --- a/MAST_tW_PDF_Updater/FilesForUpdates/tWs.from.MAST_HB.pl +++ b/MAST_tW_PDF_Updater/FilesForUpdates/tWs.from.MAST_HB.pl @@ -321,7 +321,6 @@ sub LinkSNsToULBtextViaEntries { say LOG "**\t\$SNsInCV{$thisCV}: >$SNsInCV{$thisCV}<"; } #say LOG "<>\t<>\t\$SNsInCV{$thisCV}: |$SNsInCV{$thisCV}|"; - $SNsInCV{$thisCV} =~ s/ \.\.\. /.*?/g; say LOG "*7*\t\$SNsInCV{$thisCV}:$SNsInCV{$thisCV}"; #while ($SNsInCV{$thisCV} =~ s/(\[[^\]]*?) ([^\]]*?\] )/$1√$2/) {}; say LOG "*8*\t\$SNsInCV{$thisCV}:$SNsInCV{$thisCV}"; @@ -342,15 +341,17 @@ sub LinkSNsToULBtextViaEntries { my ($found, $specPage); if ($thisNum =~ /(\d+)\[(.*?)\]/) { ($thisNum) = ($1); - my ($forced_entry_for_display) = ($2); - say LOG "\$forced_entry_for_display: $forced_entry_for_display, \$pageThisEntry{$forced_entry_for_display}: $pageThisEntry{$forced_entry_for_display}"; + my ($forced_entry_for_display, $forced_entry_for_page, $forced_entry_for_search) = ($2, lc $2, lc $2); + say LOG +"*0* \$forced_entry_for_display: $forced_entry_for_display, \$pageThisEntry{$forced_entry_for_page}: $pageThisEntry{$forced_entry_for_page}"; #while ($forced_entry_for_display =~ s/([^ \]]*?)√([^ \]]*?)/$1 $2/) {} - my $forced_entry_for_search = $forced_entry_for_display; - $pageThisEntry{$forced_entry_for_search} = $pageThisEntry{$forced_entry_for_display}; - while ($forced_entry_for_display =~ s/\.\*\?/ ... /) {} - say LOG "*A*\t\$thisNum: >>$thisNum<<\t\$forced_entry_for_display: >$forced_entry_for_display<, - \$forced_entry_for_search: >>$forced_entry_for_search<<\n\t\$pageThisEntry{$forced_entry_for_display}: $pageThisEntry{$forced_entry_for_display}"; - $outString .= "[$forced_entry_for_display]($pageThisEntry{$forced_entry_for_display})\n"; + $forced_entry_for_search = lc $forced_entry_for_display; + while ($forced_entry_for_search =~ s/ ... /\.\*\?/) {} + say LOG +"*A* \$thisNum: >>$thisNum<< \$forced_entry_for_display: >$forced_entry_for_display<, + \$forced_entry_for_search: >>$forced_entry_for_search<< + \$pageThisEntry{$forced_entry_for_page}: $pageThisEntry{$forced_entry_for_page}"; + $outString .= "[$forced_entry_for_display]($pageThisEntry{$forced_entry_for_page})\n"; say LOG "\t\t$outString:\n$outString"; if ($forced_entry_for_search =~ /([^,]*) \.\.\. ([^,]*) \.\.\. ([^,]*)/) { my ($first, $second, $third) = ($1, $2, $3); diff --git a/MAST_tW_PDF_Updater/FilesForUpdates/tWs.from.MAST_NT.pl b/MAST_tW_PDF_Updater/FilesForUpdates/tWs.from.MAST_NT.pl index 56a0b4f..846a3f9 100644 --- a/MAST_tW_PDF_Updater/FilesForUpdates/tWs.from.MAST_NT.pl +++ b/MAST_tW_PDF_Updater/FilesForUpdates/tWs.from.MAST_NT.pl @@ -277,7 +277,7 @@ sub ReadLinkedSNs { } } foreach my $changedRef (sort keys %temp) { - $SNsInCV{$changedRef} = $temp{$changedRef} + $SNsInCV{$changedRef} = $temp{$changedRef}; say LOG "\$SNsInCV{$changedRef}: $SNsInCV{$changedRef}"; } }