From 96041a6ed8f207acadf043f5539e5259fa34d8bb Mon Sep 17 00:00:00 2001 From: Henry Whitney Date: Tue, 3 Dec 2019 17:49:00 -0500 Subject: [PATCH] PDF Genesis 1-30 --- .../Exceptions/Consistent_Deletes.OT.txt | 1 + .../Exceptions_tWs_from_MAST_HB.txt | 84 +++++++++---------- .../FindMismatchedULBSnippets.3.noChunks.pl | 82 +++++++++++++++++- .../FilesForUpdates/Output.to.csv.pl | 5 +- .../Output/Entries_not_handled.txt | 65 -------------- 5 files changed, 122 insertions(+), 115 deletions(-) diff --git a/MAST_tW_PDF_Updater/FilesForUpdates/Exceptions/Consistent_Deletes.OT.txt b/MAST_tW_PDF_Updater/FilesForUpdates/Exceptions/Consistent_Deletes.OT.txt index fe952e4..177ef62 100644 --- a/MAST_tW_PDF_Updater/FilesForUpdates/Exceptions/Consistent_Deletes.OT.txt +++ b/MAST_tW_PDF_Updater/FilesForUpdates/Exceptions/Consistent_Deletes.OT.txt @@ -800,4 +800,5 @@ 7659 883 3478 +5288 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 21522a4..996561c 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 @@ -1900,6 +1900,7 @@ Genesis 31:18 935 || Genesis 31:18 7399 || Genesis 31:19 1589 || Genesis 31:19 1980 || +Genesis 31:19 1494 || Genesis 31:19 6629 flock Genesis 31:20 1272 fleeing Genesis 31:20 1589 || @@ -2215,10 +2216,9 @@ Genesis 34:27 2930 defiled Genesis 34:27 5892 || Genesis 34:28 3947 || Genesis 34:28 5892 || -Genesis 34:29 962 Genesis 34:30 3427 || Genesis 34:30 4557 || -Genesis 34:30 8045 +Genesis 34:30 8045 be destroyed Genesis 35:1 3427 || Genesis 35:1 5927 || Genesis 35:1 6213 || @@ -2239,11 +2239,10 @@ Genesis 35:7 1129 || Genesis 35:7 4725 || Genesis 35:7 6440 || Genesis 35:8 3243 || -Genesis 35:8 8034 +Genesis 35:8 8034 destroyed Genesis 35:9 935 || Genesis 35:9 5750 || -Genesis 35:11 2504 -Genesis 35:11 6951 +Genesis 35:11 2504 || Genesis 35:12 5414 || Genesis 35:13 1696 || Genesis 35:13 4725 || @@ -2252,17 +2251,17 @@ Genesis 35:14 68 || Genesis 35:14 1696 || Genesis 35:14 3332 || Genesis 35:14 4725 || -Genesis 35:14 5262 +Genesis 35:14 5262 drink offering Genesis 35:15 1696 || Genesis 35:15 4725 || Genesis 35:16 776 || Genesis 35:16 935 || -Genesis 35:16 7185 +Genesis 35:16 7185 hard Genesis 35:18 3318 || -Genesis 35:19 1035 +Genesis 35:19 1035 || Genesis 35:19 1870 || -Genesis 35:20 4676 -Genesis 35:20 4678 +Genesis 35:20 4676 pillar +Genesis 35:20 4678 marker Genesis 35:21 5186 || Genesis 35:22 3212 || Genesis 35:22 7901 || @@ -2277,7 +2276,6 @@ Genesis 36:6 3212 || Genesis 36:6 5315 || Genesis 36:6 6440 || Genesis 36:7 3427 || -Genesis 36:7 4033 Genesis 36:7 6440 || Genesis 36:7 7399 || Genesis 36:8 3427 || @@ -2289,25 +2287,24 @@ Genesis 36:24 7462 || Genesis 36:32 5892 || Genesis 36:35 5221 || Genesis 36:35 5892 || -Genesis 36:37 7586 -Genesis 36:38 7586 +Genesis 36:37 7586 || +Genesis 36:38 7586 || Genesis 36:39 1323 || Genesis 36:39 5892 || Genesis 36:40 4725 || -Genesis 36:41 441 -Genesis 36:42 441 +Genesis 36:41 441 || +Genesis 36:42 441 || Genesis 36:43 4186 || Genesis 37:1 3427 || -Genesis 37:1 4033 Genesis 37:2 935 || +Genesis 37:2 5288 young man Genesis 37:2 7451 || Genesis 37:2 7651 || -Genesis 37:2 8435 +Genesis 37:2 8435 account Genesis 37:4 1696 || Genesis 37:4 3201 || Genesis 37:4 7200 || -Genesis 37:4 7965 -Genesis 37:5 2472 +Genesis 37:5 2472 dream Genesis 37:5 5750 || Genesis 37:6 4994 || Genesis 37:7 5437 || @@ -2315,9 +2312,9 @@ Genesis 37:8 5750 || Genesis 37:9 312 || Genesis 37:9 5750 || Genesis 37:10 935 || -Genesis 37:10 2492 +Genesis 37:10 2492 dreamed Genesis 37:12 3212 || -Genesis 37:12 6629 +Genesis 37:12 6629 flock Genesis 37:13 3212 || Genesis 37:14 935 || Genesis 37:14 3212 || @@ -2332,13 +2329,12 @@ Genesis 37:16 5046 || Genesis 37:17 376 || Genesis 37:17 3212 || Genesis 37:17 4672 || -Genesis 37:18 5230 +Genesis 37:18 5230 plotted Genesis 37:18 7126 || Genesis 37:18 7200 || Genesis 37:19 376 || Genesis 37:19 935 || Genesis 37:19 1167 || -Genesis 37:19 2472 Genesis 37:20 3212 || Genesis 37:20 7200 || Genesis 37:20 7451 || @@ -2364,7 +2360,7 @@ Genesis 37:28 5674 || Genesis 37:28 6242 || Genesis 37:30 935 || Genesis 37:31 3947 || -Genesis 37:31 5795 +Genesis 37:31 5795 goat Genesis 37:32 935 || Genesis 37:32 4672 || Genesis 37:32 4994 || @@ -2375,19 +2371,17 @@ Genesis 37:33 7451 || Genesis 37:34 7760 || Genesis 37:35 1323 || Genesis 37:35 3381 || -Genesis 37:36 6547 +Genesis 37:36 6547 Pharaoh Genesis 38:1 376 || Genesis 38:1 3381 || Genesis 38:1 5186 || Genesis 38:2 376 || Genesis 38:2 935 || -Genesis 38:2 3063 +Genesis 38:2 3063 || Genesis 38:2 3947 || Genesis 38:2 7200 || -Genesis 38:3 2029 Genesis 38:3 3205 || Genesis 38:3 7121 || -Genesis 38:4 2029 Genesis 38:4 3205 || Genesis 38:4 5750 || Genesis 38:5 3254 || @@ -2397,7 +2391,6 @@ Genesis 38:7 5869 || Genesis 38:8 935 || Genesis 38:9 935 || Genesis 38:9 5414 || -Genesis 38:9 7843 Genesis 38:10 5869 || Genesis 38:10 6213 || Genesis 38:11 1431 || @@ -2405,10 +2398,10 @@ Genesis 38:11 3212 || Genesis 38:11 3427 || Genesis 38:11 3618 || Genesis 38:12 5927 || -Genesis 38:12 6629 +Genesis 38:12 6629 sheep Genesis 38:12 7235 || Genesis 38:13 5927 || -Genesis 38:13 6629 +Genesis 38:13 6629 sheep Genesis 38:14 1431 || Genesis 38:14 1870 || Genesis 38:14 3427 || @@ -2423,14 +2416,13 @@ Genesis 38:16 3618 || Genesis 38:16 4994 || Genesis 38:16 5186 || Genesis 38:16 5414 || -Genesis 38:17 5795 +Genesis 38:17 5795 young goat Genesis 38:18 935 || -Genesis 38:18 2029 Genesis 38:18 5414 || Genesis 38:19 3212 || Genesis 38:19 5493 || Genesis 38:20 4672 || -Genesis 38:20 5795 +Genesis 38:20 5795 young goat Genesis 38:21 376 || Genesis 38:21 1870 || Genesis 38:21 4725 || @@ -2440,7 +2432,7 @@ Genesis 38:22 4672 || Genesis 38:22 4725 || Genesis 38:23 3947 || Genesis 38:23 4672 || -Genesis 38:24 2183 +Genesis 38:24 2183 || Genesis 38:24 3318 || Genesis 38:24 3618 || Genesis 38:25 376 || @@ -2511,19 +2503,19 @@ Genesis 39:18 7311 || Genesis 39:19 639 || Genesis 39:19 1696 || Genesis 39:19 6213 || -Genesis 39:20 615 +Genesis 39:20 615 prisoners Genesis 39:20 631 || Genesis 39:20 4725 || Genesis 39:20 5414 || Genesis 39:21 2580 || Genesis 39:21 5186 || -Genesis 39:21 5470 +Genesis 39:21 5470 || Genesis 39:21 5869 || Genesis 39:21 8269 || Genesis 39:22 5414 || Genesis 39:22 6213 || Genesis 39:22 8269 || -Genesis 39:23 5470 +Genesis 39:23 5470 || Genesis 39:23 6213 || Genesis 39:23 6743 || Genesis 39:23 7200 || @@ -2534,24 +2526,24 @@ Genesis 40:2 8147 || Genesis 40:3 631 || Genesis 40:3 4725 || Genesis 40:3 5414 || -Genesis 40:3 5470 +Genesis 40:3 5470 prison Genesis 40:5 376 || Genesis 40:5 1004 || -Genesis 40:5 4714 -Genesis 40:5 5470 +Genesis 40:5 4714 || +Genesis 40:5 5470 prison Genesis 40:5 8147 || Genesis 40:6 935 || -Genesis 40:6 2196 +Genesis 40:6 2196 upset Genesis 40:6 7200 || Genesis 40:7 6440 || Genesis 40:7 7451 || Genesis 40:7 7592 || -Genesis 40:8 2492 +Genesis 40:8 2492 dreamed Genesis 40:8 4994 || Genesis 40:8 5608 || Genesis 40:9 6440 || Genesis 40:10 5927 || -Genesis 40:10 6025 +Genesis 40:10 6025 grapes Genesis 40:10 6524 || Genesis 40:11 3947 || Genesis 40:11 5414 || @@ -2568,7 +2560,7 @@ Genesis 40:15 7760 || Genesis 40:16 7200 || Genesis 40:17 398 || Genesis 40:17 3978 || -Genesis 40:17 4639 +Genesis 40:17 4639 || Genesis 40:17 5945 || Genesis 40:18 6030 || Genesis 40:19 398 || @@ -2598,7 +2590,7 @@ Genesis 41:4 1320 || Genesis 41:4 4758 || Genesis 41:4 7451 || Genesis 41:4 7651 || -Genesis 41:5 2492 +Genesis 41:5 2492 dreamed Genesis 41:5 5927 || Genesis 41:5 7070 || Genesis 41:5 7651 || diff --git a/MAST_tW_PDF_Updater/FilesForUpdates/FindMismatchedULBSnippets.3.noChunks.pl b/MAST_tW_PDF_Updater/FilesForUpdates/FindMismatchedULBSnippets.3.noChunks.pl index 68b3e57..8382e60 100644 --- a/MAST_tW_PDF_Updater/FilesForUpdates/FindMismatchedULBSnippets.3.noChunks.pl +++ b/MAST_tW_PDF_Updater/FilesForUpdates/FindMismatchedULBSnippets.3.noChunks.pl @@ -152,12 +152,19 @@ sub ProcessFiles { $tN =~ s/$key/$toDummy{$key}/g; $thisText =~ s/$key/$toDummy{$key}/g; } - $tN =~ s/# ((General Information|Connecting Statement|translationWords):?)[^\r\n]*\r?\n//g; + $tN =~ s/# ((General Information|Connecting Statement|translationWords|Informasi Umum):?)[^\r\n]*\r?\n//g; $tN =~ s/\* \[\[[^\r\n]*\r?\n//g; $tN =~ s/(#[^\r\n]*\r?\n)[^\r\n]*\r?\n[^\r\n]*\r?\n/$1/g; - say LOG ">7>\n\n\n\$curRef: $curRef\n\$thisText:$thisText\n\$tN: $tN<7<"; + say LOG ">7>\n\$curRef: $curRef\n\$thisText:$thisText\n\$tN: $tN\n<7<"; + $tN =~ s/\\\*//g; + #$tN =~ s/\*//g; + $tN =~ s/\n#{2,} /\n/g; + $tN =~ s/\[\[[^\]]*\]\]//g; + $tN =~ s/(\x{A0})+\n/\n/g; while ($tN =~ /# ([^\r\n]*)\r?\n/g) { $thisNote = $1; + $thisNote =~ s/^ +//; + $thisNote =~ s/ +$//; say LOG ">8>\t\$thisNote: $thisNote\n\$thisText: $thisText<8<"; $thisText =~ s/ {2,}/ /g; say LOG ">9>\t>\t|$thisNote|\n$thisText<9<"; @@ -193,6 +200,76 @@ close LOG; say "Done."; +# +# Indonesian data +#__DATA__ +#1 gen KEJADIAN +#2 exo KELUARAN +#3 lev IMAMAT +#4 num BILANGAN +#5 deu ULANGAN +#6 jos YOSUA +#7 jdg HAKIM-HAKIM +#8 rut RUT +#9 1sa 1 SAMUEL +#10 2sa 2 SAMUEL +#11 1ki 1 RAJA-RAJA +#12 2ki 2 RAJA-RAJA +#13 1ch 1 TAWARIKH +#14 2ch 2 TAWARIKH +#15 ezr EZRA +#16 neh NEHEMIA +#17 est ESTER +#18 job AYUB +#19 psa MAZMUR +#20 pro AMSAL +#21 ecc PENGKHOTBAH +#22 sng KIDUNG AGUNG +#23 isa YESAYA +#24 jer YEREMIA +#25 lam RATAPAN +#26 ezk YEHEZKIEL +#27 dan DANIEL +#28 hos HOSEA +#29 jol YOEL +#30 amo AMOS +#31 oba OBAJA +#32 jon YUNUS +#33 mic MIKHA +#34 nam NAHUM +#35 hab HABAKUK +#36 zep ZEFANYA +#37 hag HAGAI +#38 zec ZAKHARIA +#39 mal MALEAKHI +#41 mat MATIUS +#42 mrk MARKUS +#43 luk LUKAS +#44 jhn YOHANES +#45 act KISAH PARA RASUL +#46 rom ROMA +#47 1co 1 KORINTUS +#48 2co 2 KORINTUS +#49 gal GALATIA +#50 eph EFESUS +#51 php FILIPI +#52 col KOLOSE +#53 1th 1 TESALONIKA +#54 2th 2 TESALONIKA +#55 1ti 1 TIMOTIUS +#56 2ti 2 TIMOTIUS +#57 tit TITUS +#58 phm FILEMON +#59 heb IBRANI +#60 jas YAKOBUS +#61 1pe 1 PETRUS +#62 2pe 2 PETRUS +#63 1jn 1 YOHANES +#64 2jn 2 YOHANES +#65 3jn 3 YOHANES +#66 jud YUDAS +#67 rev WAHYU +# English data __DATA__ 01 gen Genesis 02 exo Exodus @@ -260,4 +337,3 @@ __DATA__ 65 3jn 3 John 66 jud Jude 67 rev Revelation - diff --git a/MAST_tW_PDF_Updater/FilesForUpdates/Output.to.csv.pl b/MAST_tW_PDF_Updater/FilesForUpdates/Output.to.csv.pl index 74413de..77a5f82 100644 --- a/MAST_tW_PDF_Updater/FilesForUpdates/Output.to.csv.pl +++ b/MAST_tW_PDF_Updater/FilesForUpdates/Output.to.csv.pl @@ -38,4 +38,7 @@ close LOG; if ($^O eq "darwin") {system 'open -a /Applications/BBEdit.app $destinationFile'} -print "\n\tDone.\n\n\tBe sure to rename the new file for New or Old Testament."; \ No newline at end of file +print "\n\tDone.\n\n\tBe sure to rename the new file for New or Old Testament.\n + !!! Important !!!\n +If this is for the Old Testament, make sure all instances of +josephnt are changed to josephot."; \ No newline at end of file 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 0e0654d..49343ed 100644 --- a/MAST_tW_PDF_Updater/FilesForUpdates/Output/Entries_not_handled.txt +++ b/MAST_tW_PDF_Updater/FilesForUpdates/Output/Entries_not_handled.txt @@ -1,67 +1,3 @@ -Genesis 31:19 1494 -Genesis 31:26 3824 -Genesis 31:26 2719 -Genesis 31:28 5528 -Genesis 31:34 3733 -Genesis 31:41 4489 -Genesis 31:42 6040 -Genesis 31:42 3018 -Genesis 31:53 8199 -Genesis 32:8 6413 -Genesis 32:24 7837 -Genesis 32:25 3409 -Genesis 32:25 3363 -Genesis 32:31 3409 -Genesis 32:32 3478 -Genesis 32:32 3409 -Genesis 33:13 7390 -Genesis 33:20 410 -Genesis 34:7 6087 -Genesis 34:24 8179 -Genesis 34:27 962 -Genesis 34:27 2930 -Genesis 34:29 962 -Genesis 34:30 8045 -Genesis 35:8 8034 -Genesis 35:11 6951 -Genesis 35:11 2504 -Genesis 35:14 5262 -Genesis 35:16 7185 -Genesis 35:19 1035 -Genesis 35:20 4676 -Genesis 35:20 4678 -Genesis 36:7 4033 -Genesis 36:37 7586 -Genesis 36:38 7586 -Genesis 36:41 441 -Genesis 36:42 441 -Genesis 37:1 4033 -Genesis 37:2 5288 -Genesis 37:4 7965 -Genesis 37:12 6629 -Genesis 37:18 5230 -Genesis 37:19 2472 -Genesis 37:31 5795 -Genesis 37:36 6547 -Genesis 38:2 3063 -Genesis 38:3 2029 -Genesis 38:4 2029 -Genesis 38:9 7843 -Genesis 38:12 6629 -Genesis 38:13 6629 -Genesis 38:17 5795 -Genesis 38:18 2029 -Genesis 38:20 5795 -Genesis 38:24 2183 -Genesis 39:20 615 -Genesis 39:21 5470 -Genesis 39:23 5470 -Genesis 40:3 5470 -Genesis 40:5 4714 -Genesis 40:5 5470 -Genesis 40:6 2196 -Genesis 40:10 6025 -Genesis 40:17 4639 Genesis 41:9 2399 Genesis 41:14 7323 Genesis 42:7 7186 @@ -108,7 +44,6 @@ Genesis 49:23 7852 Genesis 49:24 46 Genesis 49:26 2029 Genesis 49:27 5706 -Genesis 49:28 3478 Genesis 49:29 1 Genesis 49:30 272 Genesis 49:32 4735