From 122d45eea1f327125292512aff798e25ab6277ed Mon Sep 17 00:00:00 2001 From: Henry Whitney Date: Thu, 9 May 2019 15:51:13 -0400 Subject: [PATCH] PDF Prov 5 --- .../Exceptions/Consistent_Deletes.txt | 1 + .../Exceptions/Exceptions_tWs_from_OSHB.txt | 103 +++++++++--------- .../FilesForUpdates/Temp/.gitignore | 1 + ...liminate_unused_Strongs_numbers.windows.pl | 4 +- .../FilesForUpdates/mark_consistent_omit.sh | 2 +- ...te_in_exceptions_and_consistent_deletes.sh | 5 +- 6 files changed, 58 insertions(+), 58 deletions(-) diff --git a/MAST_tW_PDF_Updater/FilesForUpdates/Exceptions/Consistent_Deletes.txt b/MAST_tW_PDF_Updater/FilesForUpdates/Exceptions/Consistent_Deletes.txt index 265744c..1148585 100644 --- a/MAST_tW_PDF_Updater/FilesForUpdates/Exceptions/Consistent_Deletes.txt +++ b/MAST_tW_PDF_Updater/FilesForUpdates/Exceptions/Consistent_Deletes.txt @@ -538,3 +538,4 @@ 5027 3225 8040 +5197 \ No newline at end of file diff --git a/MAST_tW_PDF_Updater/FilesForUpdates/Exceptions/Exceptions_tWs_from_OSHB.txt b/MAST_tW_PDF_Updater/FilesForUpdates/Exceptions/Exceptions_tWs_from_OSHB.txt index b741616..3996578 100644 --- a/MAST_tW_PDF_Updater/FilesForUpdates/Exceptions/Exceptions_tWs_from_OSHB.txt +++ b/MAST_tW_PDF_Updater/FilesForUpdates/Exceptions/Exceptions_tWs_from_OSHB.txt @@ -2407,49 +2407,44 @@ Proverbs 4:27 7272 || Proverbs 5:1 5186 || Proverbs 5:1 241 || Proverbs 5:2 8104 || -Proverbs 5:2 4209 +Proverbs 5:2 4209 discretion Proverbs 5:2 8193 || -Proverbs 5:2 5341 -Proverbs 5:3 5197 +Proverbs 5:2 5341 protect +Proverbs 5:3 5197 || Proverbs 5:3 8193 || -Proverbs 5:3 2114 -Proverbs 5:4 319 +Proverbs 5:3 2114 adulteress +Proverbs 5:4 319 || Proverbs 5:4 6310 || Proverbs 5:5 7272 || Proverbs 5:5 3381 || -Proverbs 5:6 5128 +Proverbs 5:6 5128 || Proverbs 5:7 6310 || Proverbs 5:8 7368 || Proverbs 5:8 1870 || -Proverbs 5:8 7126 -Proverbs 5:8 6607 +Proverbs 5:8 7126 || +Proverbs 5:8 6607 || Proverbs 5:9 5414 || -Proverbs 5:9 312 -Proverbs 5:10 2114 -Proverbs 5:10 3581 -Proverbs 5:10 6089 -Proverbs 5:10 5237 -Proverbs 5:11 319 -Proverbs 5:12 8130 -Proverbs 5:13 6963 +Proverbs 5:9 312 || +Proverbs 5:10 2114 strangers +Proverbs 5:10 6089 labor +Proverbs 5:10 5237 foreigners +Proverbs 5:11 319 || Proverbs 5:13 5186 || Proverbs 5:13 241 || -Proverbs 5:14 4592 +Proverbs 5:14 4592 || Proverbs 5:15 8354 || -Proverbs 5:16 6327 +Proverbs 5:16 6327 dispersed Proverbs 5:16 7339 || -Proverbs 5:17 2114 +Proverbs 5:17 2114 || Proverbs 5:19 2580 || -Proverbs 5:19 7301 -Proverbs 5:19 7686 -Proverbs 5:19 8548 -Proverbs 5:20 2114 -Proverbs 5:20 2436 -Proverbs 5:20 5237 +Proverbs 5:19 7301 || +Proverbs 5:19 8548 || +Proverbs 5:20 2114 || +Proverbs 5:20 2436 || Proverbs 5:21 5869 || Proverbs 5:21 1870 || Proverbs 5:21 376 || -Proverbs 6:1 2114 +Proverbs 6:1 2114 || Proverbs 6:1 3709 Proverbs 6:2 6310 || Proverbs 6:3 6213 || @@ -2468,7 +2463,7 @@ Proverbs 6:8 3559 Proverbs 6:8 7019 Proverbs 6:8 3899 Proverbs 6:8 3978 -Proverbs 6:10 4592 +Proverbs 6:10 4592 || Proverbs 6:11 935 || Proverbs 6:11 376 || Proverbs 6:11 4043 @@ -2497,7 +2492,7 @@ Proverbs 6:19 8267 Proverbs 6:19 4090 Proverbs 6:20 5341 Proverbs 6:20 8451 -Proverbs 6:21 8548 +Proverbs 6:21 8548 || Proverbs 6:22 5148 Proverbs 6:22 7878 Proverbs 6:23 8451 @@ -2538,7 +2533,7 @@ Proverbs 6:35 14 || Proverbs 7:2 8451 Proverbs 7:2 5869 || Proverbs 7:3 3789 -Proverbs 7:5 2114 +Proverbs 7:5 2114 || Proverbs 7:5 5237 Proverbs 7:5 2505 Proverbs 7:7 7200 @@ -2566,7 +2561,7 @@ Proverbs 7:15 7836 Proverbs 7:15 4672 || Proverbs 7:17 5130 Proverbs 7:18 3212 || -Proverbs 7:18 7301 +Proverbs 7:18 7301 || Proverbs 7:18 5965 Proverbs 7:19 376 || Proverbs 7:19 1980 || @@ -2657,7 +2652,7 @@ Proverbs 8:34 8085 || Proverbs 8:34 1817 Proverbs 8:34 8104 || Proverbs 8:34 4201 -Proverbs 8:34 6607 +Proverbs 8:34 6607 || Proverbs 8:35 4672 || Proverbs 8:36 2398 Proverbs 8:36 2554 @@ -2689,7 +2684,7 @@ Proverbs 9:10 998 Proverbs 9:11 3254 || Proverbs 9:13 1993 || Proverbs 9:14 3427 -Proverbs 9:14 6607 +Proverbs 9:14 6607 || Proverbs 9:14 3678 Proverbs 9:15 5674 || Proverbs 9:15 1870 || @@ -2796,7 +2791,7 @@ Proverbs 11:14 5971 Proverbs 11:14 8668 Proverbs 11:14 3289 Proverbs 11:15 7489 -Proverbs 11:15 2114 +Proverbs 11:15 2114 || Proverbs 11:15 8130 Proverbs 11:15 982 Proverbs 11:16 6184 @@ -2960,17 +2955,17 @@ Proverbs 14:7 1847 Proverbs 14:8 1870 || Proverbs 14:10 5315 Proverbs 14:10 6148 -Proverbs 14:10 2114 +Proverbs 14:10 2114 || Proverbs 14:11 6524 Proverbs 14:12 3426 || Proverbs 14:12 1870 || Proverbs 14:12 3477 upright Proverbs 14:12 6440 || Proverbs 14:12 376 || -Proverbs 14:12 319 +Proverbs 14:12 319 || Proverbs 14:13 7814 Proverbs 14:13 3510 -Proverbs 14:13 319 +Proverbs 14:13 319 || Proverbs 14:14 1870 || Proverbs 14:14 7646 Proverbs 14:14 5472 @@ -3029,8 +3024,8 @@ Proverbs 15:14 7462 Proverbs 15:15 6041 Proverbs 15:15 7451 Proverbs 15:15 2896 -Proverbs 15:15 8548 -Proverbs 15:16 4592 +Proverbs 15:15 8548 || +Proverbs 15:16 4592 || Proverbs 15:16 214 Proverbs 15:16 7227 Proverbs 15:16 4103 @@ -3082,7 +3077,7 @@ Proverbs 16:5 1362 Proverbs 16:5 5352 Proverbs 16:7 1870 || Proverbs 16:7 376 || -Proverbs 16:8 4592 +Proverbs 16:8 4592 || Proverbs 16:8 7230 Proverbs 16:8 8393 Proverbs 16:9 120 || @@ -3125,7 +3120,7 @@ Proverbs 16:25 1870 || Proverbs 16:25 3477 right Proverbs 16:25 6440 || Proverbs 16:25 376 || -Proverbs 16:25 319 +Proverbs 16:25 319 || Proverbs 16:26 5315 Proverbs 16:26 5998 Proverbs 16:26 6310 || @@ -3191,7 +3186,7 @@ Proverbs 17:18 6148 Proverbs 17:18 6161 Proverbs 17:18 6440 || Proverbs 17:19 1361 -Proverbs 17:19 6607 +Proverbs 17:19 6607 || Proverbs 17:20 4672 || Proverbs 17:20 5307 || Proverbs 17:20 7451 @@ -3307,7 +3302,7 @@ Proverbs 19:19 5375 Proverbs 19:19 6066 Proverbs 19:19 3254 || Proverbs 19:20 4148 -Proverbs 19:20 319 +Proverbs 19:20 319 || Proverbs 19:21 376 || Proverbs 19:22 120 || Proverbs 19:22 2896 @@ -3357,7 +3352,7 @@ Proverbs 20:15 3426 || Proverbs 20:15 3627 Proverbs 20:15 8193 || Proverbs 20:16 3947 -Proverbs 20:16 2114 +Proverbs 20:16 2114 || Proverbs 20:16 5237 Proverbs 20:16 2254 Proverbs 20:17 376 || @@ -3371,7 +3366,7 @@ Proverbs 20:19 6148 Proverbs 20:20 1846 Proverbs 20:21 926 Proverbs 20:21 7223 -Proverbs 20:21 319 +Proverbs 20:21 319 || Proverbs 20:21 1288 Proverbs 20:22 7999 Proverbs 20:23 8441 @@ -3475,7 +3470,7 @@ Proverbs 22:12 1847 Proverbs 22:12 5557 Proverbs 22:13 7339 || Proverbs 22:14 6310 || -Proverbs 22:14 2114 +Proverbs 22:14 2114 || Proverbs 22:14 5307 || Proverbs 22:15 7368 || Proverbs 22:16 5414 || @@ -3562,11 +3557,11 @@ Proverbs 23:31 5414 || Proverbs 23:31 5869 || Proverbs 23:31 1980 || Proverbs 23:31 4339 || -Proverbs 23:32 319 +Proverbs 23:32 319 || Proverbs 23:32 6567 Proverbs 23:33 5869 || Proverbs 23:33 7200 -Proverbs 23:33 2114 +Proverbs 23:33 2114 || Proverbs 23:33 1696 || Proverbs 23:34 3820 Proverbs 23:34 3220 @@ -3640,7 +3635,7 @@ Proverbs 24:31 6440 || Proverbs 24:32 7896 Proverbs 24:32 3820 Proverbs 24:32 7200 -Proverbs 24:33 4592 +Proverbs 24:33 4592 || Proverbs 24:34 935 || Proverbs 24:34 1980 || Proverbs 24:34 376 || @@ -3655,10 +3650,10 @@ Proverbs 25:7 7200 Proverbs 25:7 5869 || Proverbs 25:8 3318 Proverbs 25:8 6213 || -Proverbs 25:8 319 +Proverbs 25:8 319 || Proverbs 25:9 7378 || Proverbs 25:9 5475 || -Proverbs 25:9 312 +Proverbs 25:9 312 || Proverbs 25:9 1540 Proverbs 25:10 7725 || Proverbs 25:11 4906 @@ -3772,7 +3767,7 @@ Proverbs 26:28 6310 || Proverbs 26:28 6213 || Proverbs 27:1 4279 || Proverbs 27:1 3205 -Proverbs 27:2 2114 +Proverbs 27:2 2114 || Proverbs 27:2 6310 || Proverbs 27:2 5237 Proverbs 27:2 8193 || @@ -3794,7 +3789,7 @@ Proverbs 27:12 7200 Proverbs 27:12 6612 || Proverbs 27:12 5674 || Proverbs 27:13 3947 -Proverbs 27:13 2114 +Proverbs 27:13 2114 || Proverbs 27:13 5237 Proverbs 27:13 2254 Proverbs 27:14 1419 @@ -3847,7 +3842,7 @@ Proverbs 28:12 7227 Proverbs 28:12 120 || Proverbs 28:13 3680 Proverbs 28:14 120 || -Proverbs 28:14 8548 +Proverbs 28:14 8548 || Proverbs 28:14 5307 || Proverbs 28:15 5098 Proverbs 28:15 8264 @@ -3924,7 +3919,7 @@ Proverbs 29:19 3256 Proverbs 29:20 2372 Proverbs 29:20 376 || Proverbs 29:20 213 -Proverbs 29:21 319 +Proverbs 29:21 319 || Proverbs 29:22 376 || Proverbs 29:23 120 || Proverbs 29:23 8217 diff --git a/MAST_tW_PDF_Updater/FilesForUpdates/Temp/.gitignore b/MAST_tW_PDF_Updater/FilesForUpdates/Temp/.gitignore index 07d8910..f8dc811 100644 --- a/MAST_tW_PDF_Updater/FilesForUpdates/Temp/.gitignore +++ b/MAST_tW_PDF_Updater/FilesForUpdates/Temp/.gitignore @@ -3,3 +3,4 @@ /mismatched_snippets.html /Extract.txt /mine_results.html +*.htm diff --git a/MAST_tW_PDF_Updater/FilesForUpdates/eliminate_unused_Strongs_numbers.windows.pl b/MAST_tW_PDF_Updater/FilesForUpdates/eliminate_unused_Strongs_numbers.windows.pl index 8c12b33..a367a67 100644 --- a/MAST_tW_PDF_Updater/FilesForUpdates/eliminate_unused_Strongs_numbers.windows.pl +++ b/MAST_tW_PDF_Updater/FilesForUpdates/eliminate_unused_Strongs_numbers.windows.pl @@ -14,13 +14,13 @@ if ($text =~ /([^:]*[a-z]) [0-9]*:[0-9]*.([0-9]*)/) { ($book, $strong) = ($1, $2) } -$text = read_file ("$Bin${d}Exceptions_tWs_from_OSHB.txt") or die; +$text = read_file ("$Bin${d}Exceptions${d}Exceptions_tWs_from_OSHB.txt") or die "$!"; $text =~ s/($book [^\t\n]*\t($strong))(\r?\n)/$1\t||$3/g; say "\$book: $book; \$strong: $strong"; -open OUT, ">Exceptions_tWs_from_OSHB.txt"; +open OUT, ">$Bin${d}Exceptions${d}Exceptions_tWs_from_OSHB.txt" or die "$!"; print OUT $text; close OUT; diff --git a/MAST_tW_PDF_Updater/FilesForUpdates/mark_consistent_omit.sh b/MAST_tW_PDF_Updater/FilesForUpdates/mark_consistent_omit.sh index c82a7da..ed68638 100644 --- a/MAST_tW_PDF_Updater/FilesForUpdates/mark_consistent_omit.sh +++ b/MAST_tW_PDF_Updater/FilesForUpdates/mark_consistent_omit.sh @@ -4,5 +4,5 @@ book=$1 strong=$2 -perl -pi eliminate_unused_Strongs_numbers.pl Exceptions_tWs_from_OSHB.txt $book $strong +perl -pi eliminate_unused_Strongs_numbers.pl Exceptions/Exceptions_tWs_from_OSHB.txt $book $strong perl add_number_to_consistent_deletes.pl $strong diff --git a/MAST_tW_PDF_Updater/FilesForUpdates/obviate_in_exceptions_and_consistent_deletes.sh b/MAST_tW_PDF_Updater/FilesForUpdates/obviate_in_exceptions_and_consistent_deletes.sh index 11df5c8..312cfd4 100644 --- a/MAST_tW_PDF_Updater/FilesForUpdates/obviate_in_exceptions_and_consistent_deletes.sh +++ b/MAST_tW_PDF_Updater/FilesForUpdates/obviate_in_exceptions_and_consistent_deletes.sh @@ -8,6 +8,9 @@ if [[ $string =~ ([^:]*[a-z])[[:space:]][0-9]*:[0-9]*.([0-9]*) ]]; then book=${BASH_REMATCH[1]} strong=${BASH_REMATCH[2]} fi +echo "Running Apple Script to save current file" osascript "/Users/Henry/Library/Application Support/BBEdit/Scripts/SaveCurrentFile.scpt" -perl -pi eliminate_unused_Strongs_numbers.pl Exceptions_tWs_from_OSHB.txt $book $strong +echo Marking all instances of this $strong in $book in the exceptions file. +perl -pi eliminate_unused_Strongs_numbers.pl Exceptions/Exceptions_tWs_from_OSHB.txt $book $strong +echo Adding $strong to consistent deletes file perl add_number_to_consistent_deletes.pl $strong