From a747b1ebebd7565015c8426f0a37c36adad3a73d Mon Sep 17 00:00:00 2001 From: Andley Chang Date: Sat, 29 Jul 2023 10:48:24 +0800 Subject: [PATCH] vault backup: 2023-07-29 10:48:23 Affected files: .obsidian/workspace.json 40-Matthew/Mat.5.1-12.md BBG4E/HW5-Key.md --- .obsidian/workspace.json | 35 +++++++++++++++++++++++++++-------- 40-Matthew/Mat.5.1-12.md | 2 +- BBG4E/HW5-Key.md | 6 +++--- 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index 5443274..2f696d2 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -49,7 +49,7 @@ "state": { "type": "markdown", "state": { - "file": "40-Matthew/Sermon-on-the-Mount (BIBa).md", + "file": "BBG4E/HW5-Key.md", "mode": "source", "source": true } @@ -57,6 +57,24 @@ } ], "currentTab": 3 + }, + { + "id": "9c44deb95d1e94eb", + "type": "tabs", + "children": [ + { + "id": "234458db507135a1", + "type": "leaf", + "state": { + "type": "markdown", + "state": { + "file": "BBG4E/HW5-Key.md", + "mode": "preview", + "source": true + } + } + } + ] } ], "direction": "vertical" @@ -114,7 +132,8 @@ } ], "direction": "horizontal", - "width": 313.5 + "width": 313.5, + "collapsed": true }, "right": { "id": "1464b72f66019d33", @@ -130,7 +149,7 @@ "state": { "type": "outline", "state": { - "file": "40-Matthew/Sermon-on-the-Mount (BIBa).md" + "file": "BBG4E/HW5-Key.md" } } }, @@ -151,7 +170,7 @@ "state": { "type": "backlink", "state": { - "file": "40-Matthew/Sermon-on-the-Mount (BIBa).md", + "file": "BBG4E/HW5-Key.md", "collapseAll": false, "extraContext": false, "sortOrder": "alphabetical", @@ -168,7 +187,7 @@ "state": { "type": "outgoing-link", "state": { - "file": "40-Matthew/Sermon-on-the-Mount (BIBa).md", + "file": "BBG4E/HW5-Key.md", "linksCollapsed": false, "unlinkedCollapsed": true } @@ -193,15 +212,15 @@ }, "active": "34f1eff7709ba5e4", "lastOpenFiles": [ + "BBG4E/HW4-Key.md", + "BBG4E/HW5-Key.md", "40-Matthew/Mat.5.1-12.md", + "40-Matthew/Sermon-on-the-Mount (OGNTa).md", "40-Matthew/Sermon-on-the-Mount (BIBa).md", "40-Matthew/Mat.13.24-43.md", "40-Matthew/Mat.19.5-6.md", - "40-Matthew/Sermon-on-the-Mount (OGNTa).md", - "BBG4E/HW5-Key.md", "BBG4E/HW5.md", "BBG4E/HW4.md", - "BBG4E/HW4-Key.md", "Untitled 1.md", "synonyms.md", "Syntax/§311a.md", diff --git a/40-Matthew/Mat.5.1-12.md b/40-Matthew/Mat.5.1-12.md index 555ed28..558e0a3 100644 --- a/40-Matthew/Mat.5.1-12.md +++ b/40-Matthew/Mat.5.1-12.md @@ -24,7 +24,7 @@ - 5:8b ὍτιὅτιforCONJ (αὐτοὶαὐτόςtheyP-NPM)S (τὸν-T-ASM ΘεὸνθεόςGodN-ASM)C (ὄψονται .ὁράωwill seeV-FMI-3P)P - 5:9a (ΜακάριοιμακάριοςBlessedA-NPM)C (οἱtheT-NPM εἰρηνοποιοί ,εἰρηνοποιόςpeacemakersA-NPM)S - 5:9b ὍτιὅτιforCONJ (αὐτοὶαὐτόςtheyP-NPM)S (υἱοὶυἱόςsonsN-NPM Θεοῦθεόςof GodN-GSM)C (κληθήσονται .καλέωwill be calledV-FPI-3P)P -- 5:10a (ΜακάριοιμακάριοςBlessed [are]A-NPM)C {οἱthoseT-NPM [ (δεδιωγμένοιδιώκωhaving been persecutedV-RMP-NPM)p (ἕνεκενἕνεκα, εἵνεκενon account ofPREP δικαιοσύνης ,δικαιοσύνηrighteousnessN-GSF)a ] }S +- 5:10a (ΜακάριοιμακάριοςBlessed [are]A-NPM)C {οἱthoseT-NPM [ (δεδιωγμένοιδιώκωhaving been persecutedV-RPP-NPM)p (ἕνεκενἕνεκα, εἵνεκενon account ofPREP δικαιοσύνης ,δικαιοσύνηrighteousnessN-GSF)a ] }S - 5:10b ὍτιὅτιforCONJ (αὐτῶναὐτόςtheirsP-GPM)C (ἐστινεἰμίisV-PAI-3S)P (theT-NSF βασιλείαβασιλείαkingdomN-NSF τῶνof theT-GPM οὐρανῶν .οὐρανόςheavensN-GPM)S - 5:11a (ΜακάριοίμακάριοςBlessedA-NPM)C (ἐστεεἰμίare youV-PAI-2P)P
- 5:11b ὅτανὅτανwhenCONJ (ὀνειδίσωσινὀνειδίζωthey shall insultV-AAS-3P)P (ὑμᾶςσύyouP-2AP)C diff --git a/BBG4E/HW5-Key.md b/BBG4E/HW5-Key.md index 3ea7140..f840c40 100644 --- a/BBG4E/HW5-Key.md +++ b/BBG4E/HW5-Key.md @@ -10,9 +10,9 @@ - ———————— ἐὰν #1 ———————— - 1:6a ἘὰνἐάνIfCONJ (εἴπωμενεἶπονwe should sayV-AAS-1P)P - 1:6b ὅτιὅτιthatCONJ (κοινωνίανκοινωνίαfellowshipN-ASF)C (ἔχομενἔχωwe haveV-PAI-1P)P (μετ᾽μετάwithPREP αὐτοῦαὐτόςHimP-GSM)A - - 1:6c καὶκαίand yetCONJ (ἐνἐνinPREP τῷtheT-DSN σκότεισκότοςdarknessN-DSN)A (περιπατῶμεν,περιπατέωshould walkV-PAS-1P)P -- 1:6c (ψευδόμεθαψεύδομαιwe lieV-PNI-1P)P -- 1:6d καὶκαίandCONJ οὐοὐnotPRT-N (ποιοῦμενποιέωdo practiceV-PAI-1P)P (τὴνtheT-ASF ἀλήθειαν·ἀλήθειαtruthN-ASF)A + - 1:6c καὶκαίand yetCONJ (ἐνἐνinPREP τῷtheT-DSN σκότεισκότοςdarknessN-DSN)A (περιπατῶμεν,περιπατέωshould walkV-PAS-1P)P +- 1:6d (ψευδόμεθαψεύδομαιwe lieV-PNI-1P)P +- 1:6e καὶκαίandCONJ οὐοὐnotPRT-N (ποιοῦμενποιέωdo practiceV-PAI-1P)P (τὴνtheT-ASF ἀλήθειαν·ἀλήθειαtruthN-ASF)A - ———————— ἐὰν #2 ———————— - 1:7a ἐὰνἐάνIfCONJ (ἐνἐνinPREP τῷtheT-DSN φωτὶφῶςlightN-DSN)A (περιπατῶμεν,περιπατέωwe should walkV-PAS-1P)P - 1:7b ὡςὡςasCONJ (αὐτόςαὐτόςHeP-NSM)S (ἐστινεἰμίisV-PAI-3S)P (ἐνἐνinPREP τῷtheT-DSN φωτί,φῶςlightN-DSN)A