From abce1317ee4ec0bad5768aab8eec82672551ec35 Mon Sep 17 00:00:00 2001 From: Andley Chang Date: Mon, 3 Apr 2023 09:30:24 +0800 Subject: [PATCH] vault backup: 2023-04-03 09:30:24 Affected files: .obsidian/app.json .obsidian/workspace.json 62-1John/123John-Clause.md 62-1John/1Jo.2.18-27.md --- .obsidian/app.json | 2 +- .obsidian/workspace.json | 39 +++++++------------------------------- 62-1John/123John-Clause.md | 2 +- 62-1John/1Jo.2.18-27.md | 8 ++++---- 4 files changed, 13 insertions(+), 38 deletions(-) diff --git a/.obsidian/app.json b/.obsidian/app.json index bc20781..32fff82 100644 --- a/.obsidian/app.json +++ b/.obsidian/app.json @@ -9,7 +9,7 @@ "includeName": false, "pageSize": "A4", "landscape": false, - "margin": "2", + "margin": "0", "downscalePercent": 100 }, "autoConvertHtml": true, diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index 1dc4497..d8abc24 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -20,21 +20,8 @@ "source": true } } - }, - { - "id": "e4a2c5321484d0ed", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "62-1John/123John-Clause.md", - "mode": "source", - "source": true - } - } } - ], - "currentTab": 1 + ] }, { "id": "277fe5ce47a0ac6e", @@ -53,21 +40,8 @@ "source": true } } - }, - { - "id": "8faf67c9868aafeb", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "62-1John/123John-Clause.md", - "mode": "preview", - "source": true - } - } } - ], - "currentTab": 1 + ] } ], "direction": "vertical" @@ -134,7 +108,7 @@ "state": { "type": "outline", "state": { - "file": "62-1John/123John-Clause.md" + "file": "62-1John/1Jo.2.18-27.md" } } }, @@ -153,7 +127,8 @@ } ], "direction": "horizontal", - "width": 308.5 + "width": 308.5, + "collapsed": true }, "left-ribbon": { "hiddenItems": { @@ -165,10 +140,10 @@ "workspaces:Manage workspace layouts": false } }, - "active": "8faf67c9868aafeb", + "active": "1a81d9f000627cca", "lastOpenFiles": [ - "62-1John/1Jo.2.18-27.md", "62-1John/123John-Clause.md", + "62-1John/1Jo.2.18-27.md", "48-Galatians/Gal.3.7-14.md", "Syntax/§311a.md", "62-1John/1Jo.1.5-10.md", diff --git a/62-1John/123John-Clause.md b/62-1John/123John-Clause.md index 5576c67..34ef6a4 100644 --- a/62-1John/123John-Clause.md +++ b/62-1John/123John-Clause.md @@ -21,7 +21,7 @@ - 從屬子句負責補充說明主要論點。例如:子句 A1, A2 補充說明論點 A;子句 B1 補充說明論點 B;子句 C1 補充說明論點 C。 - 內嵌子句,則是扮演主要子句或者從屬子句裡面的某個元素。例如:內嵌子句 x,就可以是從屬子句 A2 裡的主語 (s);而內嵌子句 y,就可以是主要子句 B 裡面的補語 (C);而內嵌子句 z,就可以是主要子句 C 裡面的狀語 (A)。 -## (0) 子句的分類 +## 子句的分類 歸納起來,希臘文的子句可以分類如下: - (1) 主要 (primary) 子句、獨立 (independent) 子句 diff --git a/62-1John/1Jo.2.18-27.md b/62-1John/1Jo.2.18-27.md index be8a737..6614948 100644 --- a/62-1John/1Jo.2.18-27.md +++ b/62-1John/1Jo.2.18-27.md @@ -39,10 +39,10 @@ - ═════════════ - 2:24a { (ὙμεῖςσύYouP-2NP)S (ὅςwhatR-ASN[^14])C (ἠκούσατεἀκούωyou have heardV-AAI-2P)P (ἀπ᾽ἀπόfromPREP ἀρχῆς,ἀρχή[the] beginningN-GSF)A }S[^15] (ἐνἐνinPREP ὑμῖνσύyouP-2DP)A (μενέτω.μένωlet it abideV-PAM-3S)P - 2:24b ἐὰνἐάνIfCONJ (ἐνἐνinPREP ὑμῖνσύyouP-2DP)A (μείνῃμένωshould abideV-AAS-3S)P { (ὅςwhatR-ASN)C (ἀπ᾽ἀπόfromPREP ἀρχῆςἀρχή[the] beginningN-GSF)A (ἠκούσατε,ἀκούωyou have heardV-AAI-2P)P }S[^16] -- καὶκαίalsoCONJ ὑμεῖςσύyouP-2NP ἐνἐνinPREP τῷtheT-DSM ΥἱῷυἱόςSonN-DSM -- καὶκαίandCONJ ἐνἐνinPREP τῷtheT-DSM ΠατρὶπατήρFatherN-DSM (μενεῖτε.μένωwill abideV-FAI-2P)P -- 2:25 -- καὶκαίAndCONJ αὕτηοὗτοςthisD-NSF (ἐστὶνεἰμίisV-PAI-3S)P theT-NSF ἐπαγγελίαἐπαγγελίαpromiseN-NSF ἣνὅςthatR-ASF αὐτὸςαὐτόςHeP-NSM (ἐπηγγείλατοἐπαγγέλλωpromisedV-ADI-3S)P ἡμῖν,ἐγώusP-1DP τὴν-T-ASF ζωὴνζωήlifeN-ASF τὴν-T-ASF αἰώνιον.¶αἰώνιοςeternalA-ASF + - 2:24c καὶκαίalsoCONJ (ὑμεῖςσύyouP-2NP)S (ἐνἐνinPREP τῷtheT-DSM ΥἱῷυἱόςSonN-DSM)A +- 2:24d καὶκαίandCONJ (ἐνἐνinPREP τῷtheT-DSM ΠατρὶπατήρFatherN-DSM)A (μενεῖτε.μένωwill abideV-FAI-2P)P +- 2:25a καὶκαίAndCONJ( αὕτηοὗτοςthisD-NSF)S (ἐστὶνεἰμίisV-PAI-3S)P (theT-NSF ἐπαγγελίαἐπαγγελίαpromiseN-NSF)C + - 2:25b (ἣνὅςthatR-ASF)C (αὐτὸςαὐτόςHeP-NSM)S (ἐπηγγείλατοἐπαγγέλλωpromisedV-ADI-3S)P ἡμῖν,ἐγώusP-1DP τὴν-T-ASF ζωὴνζωήlifeN-ASF τὴν-T-ASF αἰώνιον.¶αἰώνιοςeternalA-ASF ### 圖析 (1Jo 2:26-27)