From 7dc554280f06b150dcb35f5b10b6266c4d48ddd2 Mon Sep 17 00:00:00 2001 From: Andley Chang Date: Wed, 26 Apr 2023 05:53:44 +0800 Subject: [PATCH] vault backup: 2023-04-26 05:53:44 Affected files: .obsidian/workspace.json 62-1John/1Jo.3.11-18.md 62-1John/1Jo.3.4-10.md 62-1John/Untitled 1.md 62-1John/Untitled.md --- .obsidian/workspace.json | 30 ++++++++---------------------- 62-1John/1Jo.3.11-18.md | 15 +++++---------- 62-1John/1Jo.3.4-10.md | 3 +-- 62-1John/Untitled 1.md | 15 --------------- 62-1John/Untitled.md | 0 5 files changed, 14 insertions(+), 49 deletions(-) delete mode 100644 62-1John/Untitled 1.md delete mode 100644 62-1John/Untitled.md diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index 4357d66..aac3ecb 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -18,21 +18,8 @@ "source": true } } - }, - { - "id": "755548155b424283", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "62-1John/Untitled 1.md", - "mode": "preview", - "source": true - } - } } - ], - "currentTab": 1 + ] }, { "id": "04f7ac18f5e3104b", @@ -100,8 +87,7 @@ } ], "direction": "horizontal", - "width": 267, - "collapsed": true + "width": 267 }, "right": { "id": "1464b72f66019d33", @@ -117,7 +103,7 @@ "state": { "type": "outline", "state": { - "file": "62-1John/Untitled 1.md" + "file": "62-1John/1Jo.3.4-10.md" } } }, @@ -138,7 +124,7 @@ "state": { "type": "backlink", "state": { - "file": "62-1John/Untitled 1.md", + "file": "62-1John/1Jo.3.4-10.md", "collapseAll": false, "extraContext": false, "sortOrder": "alphabetical", @@ -155,7 +141,7 @@ "state": { "type": "outgoing-link", "state": { - "file": "62-1John/Untitled 1.md", + "file": "62-1John/1Jo.3.4-10.md", "linksCollapsed": false, "unlinkedCollapsed": true } @@ -178,10 +164,12 @@ "workspaces:Manage workspace layouts": false } }, - "active": "755548155b424283", + "active": "dae111dd20f5ff34", "lastOpenFiles": [ + "62-1John/1Jo.3.11-18.md", "62-1John/1Jo.3.4-10.md", "62-1John/Untitled 1.md", + "62-1John/Untitled.md", "BG4E–III/HW8-Key.md", "BG4E–III/Untitled.md", "BG4E–III/HW8.md", @@ -189,7 +177,6 @@ "62-1John/1Jo.2.28-3.3.md", "62-1John/1Jo.2.26-27.md", "62-1John/1Jo.2.18-25.md", - "62-1John/Untitled.md", "50-Philippians/Php.4.2-7.md", "Syntax/§000.md", "Syntax/Syntax.md", @@ -206,7 +193,6 @@ "62-1John/1John-Notes.md", "62-1John/1John-Interlinear-TC.md", "Untitled.md", - "40-Matthew/Mat.19.5-6.md", "40-Matthew", "images/Pasted image 20230317084752.png", "images/Pasted image 20230317084649.png", diff --git a/62-1John/1Jo.3.11-18.md b/62-1John/1Jo.3.11-18.md index 444134f..47d3efd 100644 --- a/62-1John/1Jo.3.11-18.md +++ b/62-1John/1Jo.3.11-18.md @@ -1,14 +1,9 @@ ### 圖析 (1Jo 3:11-18) -- ————— #1 種畫法 ————————— -- 3:10b {πᾶςπᾶςAnyoneA-NSM [the]T-NSM μὴμήnotPRT-N ποιῶνποιέωpracticingV-PAP-NSM (δικαιοσύνηνδικαιοσύνηrighteousnessN-ASF)c }S οὐκοὐnotPRT-N (ἔστινεἰμίisV-PAI-3S)P (ἐκἐκofPREP τοῦ[the]T-GSM θεοῦ,✡θεόςGod,N-GSM)A -- 3:10b' καὶκαίand alsoCONJ {the [one]T-NSM {μὴμήnotPRT-N ἀγαπῶνἀγαπάωlovingV-PAP-NSM (τὸνtheT-ASM ἀδελφὸνἀδελφόςbrotherN-ASM αὐτοῦ·αὐτόςof him.P-GSM)c }S -- ————— #2 種畫法 ————————— -- 3:10b {πᾶςπᾶςAnyoneA-NSM [the]T-NSM μὴμήnotPRT-N ποιῶνποιέωpracticingV-PAP-NSM (δικαιοσύνηνδικαιοσύνηrighteousnessN-ASF)c }S◖ οὐκοὐnotPRT-N (ἔστινεἰμίisV-PAI-3S)P (ἐκἐκofPREP τοῦ[the]T-GSM θεοῦ,✡θεόςGod,N-GSM)A ◗{καὶκαίand alsoCONJ the [one]T-NSM {μὴμήnotPRT-N ἀγαπῶνἀγαπάωlovingV-PAP-NSM (τὸνtheT-ASM ἀδελφὸνἀδελφόςbrotherN-ASM αὐτοῦ·αὐτόςof him.P-GSM)c }S -- —————————————— - - 3:11a ὅτιὅτιForCONJ (αὕτη°¹↴οὗτοςthisD-NSF)S (ἐστὶνεἰμίisV-PAI-3S)P (theT-NSF ἀγγελία°²ἀγγελίαmessageN-NSF)C - - 3:11b (ἣν°²ὅς, ἥthatR-ASF)C (ἠκούσατεἀκούωyou have heardV-AAI-2P)P (ἀπ᾽ἀπόfromPREP ἀρχῆςἀρχή[the] beginning,N-GSF )A - - 3:11c ἵνα°¹ἵναthatCONJ ἀγαπῶμεν°³ἀγαπάωwe may loveV-PAS-1P (ἀλλήλους·ἀλλήλωνone another,C-APM)C - - 3:12a οὐοὐnotPRT-N (καθὼςκαθώςasCONJ Κάϊν°⁴ΚάϊνCain ,N-NSM-P)A°³ — + +- 3:11a ὅτιὅτιForCONJ (αὕτη°¹↴οὗτοςthisD-NSF)S (ἐστὶνεἰμίisV-PAI-3S)P (theT-NSF ἀγγελία°²ἀγγελίαmessageN-NSF)C + - 3:11b (ἣν°²ὅς, ἥthatR-ASF)C (ἠκούσατεἀκούωyou have heardV-AAI-2P)P (ἀπ᾽ἀπόfromPREP ἀρχῆςἀρχή[the] beginning,N-GSF )A + - 3:11c ἵνα°¹ἵναthatCONJ ἀγαπῶμεν°³ἀγαπάωwe may loveV-PAS-1P (ἀλλήλους·ἀλλήλωνone another,C-APM)C + - 3:12a οὐοὐnotPRT-N (καθὼςκαθώςasCONJ Κάϊν°⁴ΚάϊνCain ,N-NSM-P)A°³ — - —————————————— - 3:12b (ἐκἐκ[who] ofPREP τοῦtheT-GSM πονηροῦπονηρόςevil [one]A-GSM)A (ἦνεἰμίwasV-IAI-3S°⁴)P - 3:12c καὶκαίandCONJ (ἔσφαξενσφάζωslewV-AAI-3S°⁴)P (τὸνtheT-ASM ἀδελφὸν°⁵ἀδελφόςbrotherN-ASM αὐτοῦ·°⁴αὐτόςof him.P-GSM)C diff --git a/62-1John/1Jo.3.4-10.md b/62-1John/1Jo.3.4-10.md index 45e87a5..aa9e5af 100644 --- a/62-1John/1Jo.3.4-10.md +++ b/62-1John/1Jo.3.4-10.md @@ -26,8 +26,7 @@ - 3:9c καὶκαίandCONJ οὐοὐnotPRT-N (δύναταιδύναμαιhe is ableV-PNI-3S)P { (ἁμαρτάνειν,ἁμαρτάνωto continue sinning,V-PAN)p }C - 3:9d ὅτιὅτιbecauseCONJ (ἐκἐκofPREP τοῦ[the]T-GSM θεοῦθεόςGodN-GSM)A (γεγέννηται.γεννάωhe has been born.V-RPI-3S)P - 3:10a (ἐνἐνThroughPREP τούτῳοὗτοςthisD-DSN)A (φανεράφανερόςmanifestA-NPN)C (ἐστινεἰμίareV-PAI-3S)P ( ‹τὰtheT-NPN τέκνατέκνονchildrenN-NPN τοῦ[the]T-GSM θεοῦθεόςof GodN-GSMκαὶκαίandCONJτὰtheT-NPN τέκνατέκνονchildrenN-NPN τοῦof theT-GSM διαβόλου.διάβολοςdevil:A-GSM› )S -- 3:10b {πᾶςπᾶςAnyoneA-NSM [the]T-NSM [ μὴμήnotPRT-N (ποιῶνποιέωpracticingV-PAP-NSM)p (δικαιοσύνηνδικαιοσύνηrighteousnessN-ASF)c ] }S οὐκοὐnotPRT-N (ἔστινεἰμίisV-PAI-3S)P (ἐκἐκofPREP τοῦ[the]T-GSM θεοῦ,θεόςGod,N-GSM)A -- 3:10c καὶκαίand alsoCONJ {the [one]T-NSM [ μὴμήnotPRT-N (ἀγαπῶνἀγαπάωlovingV-PAP-NSM)p (τὸνtheT-ASM ἀδελφὸνἀδελφόςbrotherN-ASM αὐτοῦ·αὐτόςof him.P-GSM)c ] }S +- 3:10b {πᾶςπᾶςAnyoneA-NSM [the]T-NSM [ μὴμήnotPRT-N (ποιῶνποιέωpracticingV-PAP-NSM)p (δικαιοσύνηνδικαιοσύνηrighteousnessN-ASF)c ] }S1 οὐκοὐnotPRT-N (ἔστινεἰμίisV-PAI-3S)P (ἐκἐκofPREP τοῦ[the]T-GSM θεοῦ,θεόςGod,N-GSM)A καὶκαίand alsoCONJ {the [one]T-NSM [ μὴμήnotPRT-N (ἀγαπῶνἀγαπάωlovingV-PAP-NSM)p (τὸνtheT-ASM ἀδελφὸνἀδελφόςbrotherN-ASM αὐτοῦ·αὐτόςof him.P-GSM)c ] }S2 diff --git a/62-1John/Untitled 1.md b/62-1John/Untitled 1.md deleted file mode 100644 index e1672bc..0000000 --- a/62-1John/Untitled 1.md +++ /dev/null @@ -1,15 +0,0 @@ -- 奶茶 ^8b3cf7 - - 牛奶 ^ddcc50 - - 紅茶 - - apple - - orange ^c75872 - - - - - - - - ---- -- 蛋糕[[#^ddcc50]] + [[#^c75872]] \ No newline at end of file diff --git a/62-1John/Untitled.md b/62-1John/Untitled.md deleted file mode 100644 index e69de29..0000000