Auto stash before merge of "master" and "origin/master"

This commit is contained in:
Henry Whitney 2019-09-02 14:50:40 -04:00
parent 17d61b579e
commit 6715eb8f3b
8 changed files with 10480 additions and 2 deletions

View File

@ -1,9 +1,17 @@
ParseLine
<<<<<<< Updated upstream
$book_name: 1 Samuel, $bkno{1 Samuel}: 09
$exceptions_file: /Users/Henry/Documents/git.Door43/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Exceptions/Exceptions_tWs_from_MAST_HB.txt
$blbRef: https://www.blueletterbible.org/net/1sa/24/15
xxx
$missingLine: 1 Samuel 24:15 7379, $ref: 1 Samuel 24:15, $book_name: 1 Samuel, $ch: 24, $vs: 15
=======
$book_name: Job, $bkno{Job}: 18
$exceptions_file: /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Exceptions/Exceptions_tWs_from_MAST_HB.txt
$blbRef: https://www.biblehub.com/job/7-14.htm
xxx
$missingLine: Job 7:14 2865, $ref: Job 7:14, $book_name: Job, $ch: 7, $vs: 14
>>>>>>> Stashed changes
$dataFile: /Users/Henry/Documents/git.Door43/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/User/tW_work_OT.txt
$line: ### Single hash means the book has been done but is not currently being done
@ -35,7 +43,20 @@ $line: #14 2 Chronicles 2ch 2Ch
$line: #15 Ezra ezr Ezr
$line: #16 Nehemiah neh Ne
$line: #17 Esther est Es
<<<<<<< Updated upstream
$line: #18 Job job Job
=======
$line: 18 Job job Job
$fullBk: Job, $wabbr: job, $numBk: Job, $abr: Job, $lbsBk: Job
$fullBk: |Job|, $wa{Job}: ||, $numBk: Job, $abr: Job, $book_name: |Job|, $lbsBk: Job
logos4:TextComparison;ref=BibleNIV.Job7.14;res=esv,niv2011,niv,nasb95,nrsv,gs-netbible,nlt,leb,kjv1900
$abbr: job
$wa{Job}/$ch/$vs: job/07/14
To system:
/home/henry/Komodo-Edit-8/lib/mozilla/komodo /home/henry/Documents/WA_Repo/en_tn/job/07/14.md
>>>>>>> Stashed changes
$line: ## 19 Psalms psa Ps
$line: #20 Proverbs pro Pr
$line: #21 Ecclesiastes ecc Ec
@ -57,6 +78,7 @@ $line: #36 Zephaniah zep Zep
$line: #37 Haggai hag Hag
$line: #38 Zechariah zec Zec
$line: #39 Malachi mal Mal
<<<<<<< Updated upstream
FindVerse |H7379|.
$ref: 1 Samuel 24:15
$fore: May Yahweh be judge and give judgment between you and me, and see to it, and plead my cause and permit me to escape from your hand."
@ -71,3 +93,19 @@ $&: "The LORD <H3068> therefore be judge <H1781> and decide <H8199> between <H99
$preprecon: "The LORD <H3068> therefore be judge <H1781> and decide <H8199> between <H996> you and me; and may He see <H7200> and plead <H7378> my
$word: cause
<<cause>>
=======
FindVerse |H2865|.
$ref: Job 7:14
$fore: then you frighten me with dreams and terrify me through visions,
Then Thou dost frighten <H2865> me with dreams <H2472> And terrify <H1204> me by visions <H2384>;
$precon:
Then Thou dost frighten <
$aft: > me with dreams <H2472> And terrify <H1204> me by visions <H2384>;
$thisULB: then you frighten me with dreams and terrify me through visions,
$&: Then Thou dost frighten <
$preprecon: Then Thou dost
$word: frighten
<<frighten>>
>>>>>>> Stashed changes

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "//www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="//www.w3.org/1999/xhtml"><head><meta charset="UTF-8"/><title>Job 7:15</title></head><h1>Job 7:15</h1><table width="100%" border="0" cellspacing="1" cellpadding="5" class="maintext"><tr><td class="top" width="25%">Strong's</td><td class="top" width="25%">Hebrew</td><td class="top" width="25%">English</td><td class="top" width="25%">Morphology</td></tr><tr><td class="strongsnt" valign="top"><span class="strongs"><a href="/hebrew/977.htm" title="Strong's Hebrew 977: 1) to choose, elect, decide for<BR> 1a) (Qal) to choose <BR> 1b) (Niphal) to be chosen <BR> 1c) (Pual) to be chosen, selected">977</a></span> <span class="strongs"><a href="/hebrew/strongs_977.htm" title="Englishman's Hebrew: 977 -- Occurrence 96 of 152">[e]</a></span></td><td class="hebrew2" valign="top">וַתִּבְחַ֣ר<br /><span class="translit"><a href="/hebrew/vattivchar_977.htm" title="vat·tiv·Char: choose -- Occurrence 1 of 1.">wat-tiḇ-ḥar</a></span></td><td class="eng" valign="top">So that chooses</td><td class="pos" valign="top"><span class="pos"><a href="/hebrewparse.htm" title="Conjunctive waw :: Verb - Qal - Consecutive imperfect - third person feminine singular">Conj-w &#124; V-Qal-ConsecImperf-3fs</a></span></td></tr><tr><td class="strongsnt" valign="top"><span class="strongs"><a href="/hebrew/4267.htm" title="Strong's Hebrew 4267: 1) strangling, suffocation <BR> 1a) as a mode of death">4267</a></span> <span class="strongs"><a href="/hebrew/strongs_4267.htm" title="Englishman's Hebrew: 4267 -- Occurrence 1 of 1">[e]</a></span></td><td class="hebrew2" valign="top">מַחֲנָ֣ק<br /><span class="translit"><a href="/hebrew/machanak_4267.htm" title="ma·cha·Nak: suffocation -- Occurrence 1 of 1.">ma-ḥă-nāq</a></span></td><td class="eng" valign="top">strangling</td><td class="pos" valign="top"><span class="pos"><a href="/hebrewparse.htm" title="Noun - masculine singular">N-ms</a></span></td></tr><tr><td class="strongsnt" valign="top"><span class="strongs"><a href="/hebrew/5315.htm" title="Strong's Hebrew 5315: 1) soul, self, life, creature, person, appetite, mind, living being, desire, emotion, passion <BR> 1a) that which breathes, the breathing substance or being, soul, the inner being of man <BR> 1b) living being <BR> 1c) living being (with life in the blood) <BR> 1d) the man himself, self, person or individual <BR> 1e) seat of the appetites <BR> 1f) seat of emotions and passions <BR> 1g) activity of mind <BR> 1g1) dubious <BR> 1h) activity of the will <BR> 1h1) dubious <BR> 1i) activity of the character <BR> 1i1) dubious">5315</a></span> <span class="strongs"><a href="/hebrew/strongs_5315.htm" title="Englishman's Hebrew: 5315 -- Occurrence 343 of 754">[e]</a></span></td><td class="hebrew2" valign="top">נַפְשִׁ֑י<br /><span class="translit"><a href="/hebrew/nafshi_5315.htm" title="naf·Shi;: my soul -- Occurrence 36 of 172.">nap̄-šî;</a></span></td><td class="eng" valign="top">my soul</td><td class="pos" valign="top"><span class="pos"><a href="/hebrewparse.htm" title="Noun - feminine singular construct :: first person common singular">N-fsc &#124; 1cs</a></span></td></tr><tr><td class="strongsnt" valign="top"><span class="strongs"><a href="/hebrew/4194.htm" title="Strong's Hebrew 4194: 1) death, dying, Death (personified), realm of the dead <BR> 1a) death <BR> 1b) death by violence (as a penalty)<BR> 1c) state of death, place of death">4194</a></span> <span class="strongs"><a href="/hebrew/strongs_4194.htm" title="Englishman's Hebrew: 4194 -- Occurrence 71 of 155">[e]</a></span></td><td class="hebrew2" valign="top">מָ֝֗וֶת<br /><span class="translit"><a href="/hebrew/mavet_4194.htm" title="Ma·vet,: Death -- Occurrence 14 of 50.">mā-weṯ,</a></span></td><td class="eng" valign="top">[And] death</td><td class="pos" valign="top"><span class="pos"><a href="/hebrewparse.htm" title="Noun - masculine singular">N-ms</a></span></td></tr><tr><td class="strongsnt" valign="top"><span class="strongs"><a href="/hebrew/6106.htm" title="Strong's Hebrew 6106: 1) bone, essence, substance <BR> 1a) bone <BR> 1a1) body, limbs, members, external body<BR> 1b) bone (of animal) <BR> 1c) substance, self">6106</a></span> <span class="strongs"><a href="/hebrew/strongs_6106.htm" title="Englishman's Hebrew: 6106 -- Occurrence 55 of 126">[e]</a></span></td><td class="hebrew2" valign="top">מֵֽעַצְמוֹתָֽי׃<br /><span class="translit"><a href="/hebrew/meatzmotai_6106.htm" title="Me·'atz·mo·Tai.: my pains -- Occurrence 1 of 1.">mê-aṣ-mō-w-ṯāy.</a></span></td><td class="eng" valign="top">rather than my body</td><td class="pos" valign="top"><span class="pos"><a href="/hebrewparse.htm" title="Preposition-m :: Noun - feminine plural construct :: first person common singular">Prep-m &#124; N-fpc &#124; 1cs</a></span></td></tr></table></body></html>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "//www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="//www.w3.org/1999/xhtml"><head><meta charset="UTF-8"/><title>Job 7:14</title></head><h1>Job 7:14</h1><table width="100%" border="0" cellspacing="1" cellpadding="5" class="maintext"><tr><td class="top" width="25%">Strong's</td><td class="top" width="25%">Hebrew</td><td class="top" width="25%">English</td><td class="top" width="25%">Morphology</td></tr><tr><td class="strongsnt" valign="top"><span class="strongs"><a href="/hebrew/2865.htm" title="Strong's Hebrew 2865: 1) to be shattered, be dismayed, be broken, be abolished, be afraid <BR> 1a) (Qal) <BR> 1a1) to be shattered, be broken <BR> 1a2) to be dismayed <BR> 1b) (Niphal) to be broken, be dismayed <BR> 1c) (Piel) to be shattered, be dismayed, be scared <BR> 1d) (Hiphil) <BR> 1d1) to cause to be dismayed <BR> 1d2) to dismay, terrify <BR> 1d3) to shatter">2865</a></span> <span class="strongs"><a href="/hebrew/strongs_2865.htm" title="Englishman's Hebrew: 2865 -- Occurrence 13 of 51">[e]</a></span></td><td class="hebrew2" valign="top">וְחִתַּתַּ֥נִי<br /><span class="translit"><a href="/hebrew/vechittattani_2865.htm" title="ve·chit·tat·Ta·ni: frighten -- Occurrence 1 of 1.">wə-ḥit-tat-ta-nî</a></span></td><td class="eng" valign="top">And You scare me</td><td class="pos" valign="top"><span class="pos"><a href="/hebrewparse.htm" title="Conjunctive waw :: Verb - Piel - Conjunctive perfect - second person masculine singular :: first person common singular">Conj-w &#124; V-Piel-ConjPerf-2ms &#124; 1cs2</a></span></td></tr><tr><td class="strongsnt" valign="top"><span class="strongs"><a href="/hebrew/2472.htm" title="Strong's Hebrew 2472: 1) dream <BR> 1a) dream (ordinary) <BR> 1b) dream (with prophetic meaning)">2472</a></span> <span class="strongs"><a href="/hebrew/strongs_2472.htm" title="Englishman's Hebrew: 2472 -- Occurrence 45 of 64">[e]</a></span></td><td class="hebrew2" valign="top">בַחֲלֹמ֑וֹת<br /><span class="translit"><a href="/hebrew/vachalomot_2472.htm" title="va·cha·lo·Mot;: dreams -- Occurrence 1 of 3.">ḇa-ḥă-lō-mō-wṯ;</a></span></td><td class="eng" valign="top">with dreams</td><td class="pos" valign="top"><span class="pos"><a href="/hebrewparse.htm" title="Preposition-b, Article :: Noun - masculine plural">Prep-b, Art &#124; N-mp</a></span></td></tr><tr><td class="strongsnt" valign="top"><span class="strongs"><a href="/hebrew/2384.htm" title="Strong's Hebrew 2384: 1) vision <BR> 1a) vision (in the ecstatic state) <BR> 1a1) valley of vision (perhaps fig. of Jerusalem or Hinnom) <BR> 1b) vision (in the night) <BR> 1c) vision, oracle, prophecy (in divine communication)">2384</a></span> <span class="strongs"><a href="/hebrew/strongs_2384.htm" title="Englishman's Hebrew: 2384 -- Occurrence 3 of 9">[e]</a></span></td><td class="hebrew2" valign="top">וּֽמֵחֶזְיֹנ֥וֹת<br /><span class="translit"><a href="/hebrew/umechezyonot_2384.htm" title="u·me·chez·yo·Not: visions -- Occurrence 1 of 1.">ū-mê-ḥez-yō-nō-wṯ</a></span></td><td class="eng" valign="top">and with visions</td><td class="pos" valign="top"><span class="pos"><a href="/hebrewparse.htm" title="Conjunctive waw, Preposition-m :: Noun - masculine plural">Conj-w, Prep-m &#124; N-mp</a></span></td></tr><tr><td class="strongsnt" valign="top"><span class="strongs"><a href="/hebrew/1204.htm" title="Strong's Hebrew 1204: 1) to terrify, startle, fall upon, dismay, be overtaken by sudden terror <BR> 1a) (Niphal) to be terrified <BR> 1b) (Piel)<BR> 1b1) to fall upon, overwhelm <BR> 1b2) to terrify">1204</a></span> <span class="strongs"><a href="/hebrew/strongs_1204.htm" title="Englishman's Hebrew: 1204 -- Occurrence 7 of 16">[e]</a></span></td><td class="hebrew2" valign="top">תְּבַעֲתַֽנִּי׃<br /><span class="translit"><a href="/hebrew/tevaatanni_1204.htm" title="te·va·'a·Tan·ni.: and terrify -- Occurrence 1 of 3.">tə-ḇa-‘ă-ṯan-nî.</a></span></td><td class="eng" valign="top">terrify me</td><td class="pos" valign="top"><span class="pos"><a href="/hebrewparse.htm" title="Verb - Piel - Imperfect - second person masculine singular :: first person common singular">V-Piel-Imperf-2ms &#124; 1cse</a></span></td></tr></table></body></html>

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,3 @@
Job 7:14 2865
hebrew
firefox<>

View File

@ -0,0 +1,45 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8"/>
</head>
<body>
<p>Job 7:14 then you frighten me with dreams and terrify me through visions,
</p>
<p>Then Thou dost <span style="color:red">frighten</span> <<span style="color:red">H2865</span>&gt; me with dreams &lt;H2472&gt; And terrify &lt;H1204&gt; me by visions &lt;H2384&gt;;</p>
<p>
/home/henry/Documents/WA_Repo/en_tw/bible/other/awe<br />
/home/henry/Documents/WA_Repo/en_tw/bible/other/amazed<br />
/home/henry/Documents/WA_Repo/en_tw/bible/other/disgrace<br />
/home/henry/Documents/WA_Repo/en_tw/bible/other/terror<br />
/home/henry/Documents/WA_Repo/en_tw/bible/kt/fear<br />
/home/henry/Documents/WA_Repo/en_tw/bible/kt/fear<br />
/home/henry/Documents/WA_Repo/en_tw/bible/kt/sign<br />
</p>
<p>
/home/henry/Documents/WA_Repo/en_tw/bible/other/awe: * Strong's: H366, H1481, <span style="color:red">H2865,</span> H3372, H6206, H7227, G2124<br />
/home/henry/Documents/WA_Repo/en_tw/bible/other/amazed: * Strong's: H226, H852, H926, H943, <span style="color:red">H2865,</span> H3820, H4159, H6313, H6381, H6382, H6383, H6395, H8074, H8429, H8539, H8540, H8541, G639, G1411, G1568, G1569, G1605, G1611, G1839, G2284, G2285, G2296, G2297, G2298, G4023, G4592, G5059<br />
/home/henry/Documents/WA_Repo/en_tw/bible/other/disgrace: * Strong's: H954, H1984, H2490, H2617, H2659, H2781, <span style="color:red">H2865,</span> H3637, H3971, H5007, H5034, H5039, H6031, H7036, G149, G150, G819, G3680, G3856<br />
/home/henry/Documents/WA_Repo/en_tw/bible/other/terror: * Strong's: H366, H367, H926, H928, H1091, H1161, H1204, H1205, H1763, H2111, H2113, H2189, H2729, H2731, H2847, H2851, <span style="color:red">H2865,</span> H3372, H3707, H4032, H4172, H4288, H4637, H6184, H6206, H6343, H6973, H7374, G1629, G1630, G4422, G4426, G5400, G5401<br />
/home/henry/Documents/WA_Repo/en_tw/bible/kt/fear: * Strong's: H367, H926, H1204, H1481, H1672, H1674, H1763, H2119, H2729, H2730, H2731, H2844, H2849, <span style="color:red">H2865,</span> H3016, H3025, H3372, H3373, H3374, H4032, H4034, H4035, H4116, H4172, H6206, H6342, H6343, H6345, H6427, H7264, H7267, H7297, H7461, H7493, H8175, G870, G1167, G1168, G1169, G1630, G1719, G2125, G5398, G5399, G5401<br />
/home/henry/Documents/WA_Repo/en_tw/bible/kt/sign: * Strong's: H226, H852, H926, H2368, <span style="color:red">H2865,</span> H3820, H3824, H4150, H4159, H4864, H5162, H5251, H5824, H5953, H6161, H6725, H6734, H7560, H7725, H8074, H8540, G364, G1271, G1730, G1732, G1770, G1839, G2298, G4102, G4592, G4953, G4973, G5059, G5280, G5590<br />
</p>
<p>
/home/henry/Documents/WA_Repo/en_tw/bible/kt/fear: fear, fears, feared, afraid, be careful, fearful thing, fearful, dismayed, <span style="color:red">frighten</span>, anxiety<br />
</p>

View File

@ -1,4 +1,11 @@
<<<<<<< Updated upstream
curl https://biblehub.com/hebrew/7379.htm > /Users/Henry/Documents/git.Door43/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/Strongs_raw.html
perl get_strongs_gist.pl
open -a /Applications/Firefox.app /Users/Henry/Documents/git.Door43/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/This_interlinear.html /Users/Henry/Documents/git.Door43/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/This_verse.html /Users/Henry/Documents/git.Door43/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/Strongs.html /Users/Henry/Documents/git.Door43/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/mine_results.html &
open -a /Applications/BBEdit.app --new-window /Users/Henry/Documents/git.Door43/en_tn/1sa/24/15.md &
=======
curl https://biblehub.com/hebrew/2865.htm > /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/Strongs.html
perl get_strongs_gist.pl
firefox /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/This_interlinear.html /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/This_verse.html /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/Strongs.html /home/henry/Documents/WA_Repo/Tips_and_Hacks/MAST_tW_PDF_Updater/FilesForUpdates/Temp/mine_results.html &
/home/henry/Komodo-Edit-8/lib/mozilla/komodo --new-window /home/henry/Documents/WA_Repo/en_tw/bible/kt/fear.md /home/henry/Documents/WA_Repo/en_tw/bible/kt/sign.md /home/henry/Documents/WA_Repo/en_tw/bible/other/amazed.md /home/henry/Documents/WA_Repo/en_tw/bible/other/awe.md /home/henry/Documents/WA_Repo/en_tw/bible/other/disgrace.md /home/henry/Documents/WA_Repo/en_tw/bible/other/terror.md /home/henry/Documents/WA_Repo/en_tn/job/07/14.md &
>>>>>>> Stashed changes