mirror of https://git.door43.org/Andley/BG4e
vault backup: 2023-08-07 07:30:01
Affected files: .obsidian/community-plugins.json .obsidian/plugins/obsidian-git/main.js .obsidian/plugins/obsidian-git/manifest.json .obsidian/plugins/obsidian-regex-replace/data.json .obsidian/plugins/obsidian-regex-replace/main.js .obsidian/plugins/obsidian-regex-replace/manifest.json .obsidian/plugins/obsidian-regex-replace/styles.css .obsidian/workspace.json Parables/Joh.10.1-18.md Parables/Joh.15.1-8.md Parables/Parables-John.md Parables/Parables-Mark.md
This commit is contained in:
parent
b1f8bdcbb0
commit
6581312b15
|
@ -4,6 +4,5 @@
|
||||||
"wikilinks-to-mdlinks-obsidian",
|
"wikilinks-to-mdlinks-obsidian",
|
||||||
"obsidian-footnotes",
|
"obsidian-footnotes",
|
||||||
"obsidian-tidy-footnotes",
|
"obsidian-tidy-footnotes",
|
||||||
"obsidian-regex-replace",
|
|
||||||
"control-characters"
|
"control-characters"
|
||||||
]
|
]
|
|
@ -29954,21 +29954,21 @@ var SimpleGit = class extends GitManager {
|
||||||
(err) => this.onError(err)
|
(err) => this.onError(err)
|
||||||
);
|
);
|
||||||
return res.all.map((e) => {
|
return res.all.map((e) => {
|
||||||
var _a2, _b;
|
var _a2, _b, _c, _d;
|
||||||
return {
|
return {
|
||||||
...e,
|
...e,
|
||||||
refs: e.refs.split(", "),
|
refs: e.refs.split(", "),
|
||||||
diff: {
|
diff: {
|
||||||
...e.diff,
|
...e.diff,
|
||||||
files: e.diff.files.map((f) => ({
|
files: (_b = (_a2 = e.diff) == null ? void 0 : _a2.files.map((f) => ({
|
||||||
...f,
|
...f,
|
||||||
status: f.status,
|
status: f.status,
|
||||||
path: f.file,
|
path: f.file,
|
||||||
hash: e.hash,
|
hash: e.hash,
|
||||||
vault_path: this.getVaultPath(f.file)
|
vault_path: this.getVaultPath(f.file)
|
||||||
}))
|
}))) != null ? _b : []
|
||||||
},
|
},
|
||||||
fileName: (_b = (_a2 = e.diff) == null ? void 0 : _a2.files.first()) == null ? void 0 : _b.file
|
fileName: (_d = (_c = e.diff) == null ? void 0 : _c.files.first()) == null ? void 0 : _d.file
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -37390,6 +37390,15 @@ function create_else_block(ctx) {
|
||||||
set_style(div0, "padding-right", "5px");
|
set_style(div0, "padding-right", "5px");
|
||||||
set_style(div0, "display", "flex");
|
set_style(div0, "display", "flex");
|
||||||
attr(div1, "class", "tree-item-icon nav-folder-collapse-indicator collapse-icon");
|
attr(div1, "class", "tree-item-icon nav-folder-collapse-indicator collapse-icon");
|
||||||
|
toggle_class(
|
||||||
|
div1,
|
||||||
|
"is-collapsed",
|
||||||
|
/*closed*/
|
||||||
|
ctx[4][
|
||||||
|
/*entity*/
|
||||||
|
ctx[8].title
|
||||||
|
]
|
||||||
|
);
|
||||||
attr(div2, "class", "tree-item-inner nav-folder-title-content svelte-1lnl15d");
|
attr(div2, "class", "tree-item-inner nav-folder-title-content svelte-1lnl15d");
|
||||||
attr(div3, "class", "tree-item-self is-clickable nav-folder-title");
|
attr(div3, "class", "tree-item-self is-clickable nav-folder-title");
|
||||||
attr(
|
attr(
|
||||||
|
@ -37432,6 +37441,18 @@ function create_else_block(ctx) {
|
||||||
},
|
},
|
||||||
p(new_ctx, dirty) {
|
p(new_ctx, dirty) {
|
||||||
ctx = new_ctx;
|
ctx = new_ctx;
|
||||||
|
if (!current || dirty & /*closed, hierarchy*/
|
||||||
|
17) {
|
||||||
|
toggle_class(
|
||||||
|
div1,
|
||||||
|
"is-collapsed",
|
||||||
|
/*closed*/
|
||||||
|
ctx[4][
|
||||||
|
/*entity*/
|
||||||
|
ctx[8].title
|
||||||
|
]
|
||||||
|
);
|
||||||
|
}
|
||||||
if ((!current || dirty & /*hierarchy*/
|
if ((!current || dirty & /*hierarchy*/
|
||||||
1) && t2_value !== (t2_value = /*entity*/
|
1) && t2_value !== (t2_value = /*entity*/
|
||||||
ctx[8].title + ""))
|
ctx[8].title + ""))
|
||||||
|
@ -38219,6 +38240,12 @@ function create_fragment3(ctx) {
|
||||||
if (if_block1)
|
if (if_block1)
|
||||||
if_block1.c();
|
if_block1.c();
|
||||||
attr(div0, "class", "tree-item-icon nav-folder-collapse-indicator collapse-icon");
|
attr(div0, "class", "tree-item-icon nav-folder-collapse-indicator collapse-icon");
|
||||||
|
toggle_class(
|
||||||
|
div0,
|
||||||
|
"is-collapsed",
|
||||||
|
/*isCollapsed*/
|
||||||
|
ctx[4]
|
||||||
|
);
|
||||||
attr(div1, "class", "tree-item-inner nav-folder-title-content");
|
attr(div1, "class", "tree-item-inner nav-folder-title-content");
|
||||||
attr(div1, "aria-label", div1_aria_label_value = /*log*/
|
attr(div1, "aria-label", div1_aria_label_value = /*log*/
|
||||||
ctx[0].message);
|
ctx[0].message);
|
||||||
|
@ -38264,6 +38291,15 @@ function create_fragment3(ctx) {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
p(ctx2, [dirty]) {
|
p(ctx2, [dirty]) {
|
||||||
|
if (!current || dirty & /*isCollapsed*/
|
||||||
|
16) {
|
||||||
|
toggle_class(
|
||||||
|
div0,
|
||||||
|
"is-collapsed",
|
||||||
|
/*isCollapsed*/
|
||||||
|
ctx2[4]
|
||||||
|
);
|
||||||
|
}
|
||||||
if (
|
if (
|
||||||
/*log*/
|
/*log*/
|
||||||
ctx2[0].refs.length > 0
|
ctx2[0].refs.length > 0
|
||||||
|
@ -39871,6 +39907,15 @@ function create_else_block3(ctx) {
|
||||||
set_style(div0, "padding-right", "5px");
|
set_style(div0, "padding-right", "5px");
|
||||||
set_style(div0, "display", "flex");
|
set_style(div0, "display", "flex");
|
||||||
attr(div1, "class", "tree-item-icon nav-folder-collapse-indicator collapse-icon");
|
attr(div1, "class", "tree-item-icon nav-folder-collapse-indicator collapse-icon");
|
||||||
|
toggle_class(
|
||||||
|
div1,
|
||||||
|
"is-collapsed",
|
||||||
|
/*closed*/
|
||||||
|
ctx[5][
|
||||||
|
/*entity*/
|
||||||
|
ctx[15].title
|
||||||
|
]
|
||||||
|
);
|
||||||
attr(div2, "class", "tree-item-inner nav-folder-title-content svelte-1lnl15d");
|
attr(div2, "class", "tree-item-inner nav-folder-title-content svelte-1lnl15d");
|
||||||
set_style(div3, "width", "11px");
|
set_style(div3, "width", "11px");
|
||||||
attr(div4, "class", "buttons");
|
attr(div4, "class", "buttons");
|
||||||
|
@ -39922,6 +39967,18 @@ function create_else_block3(ctx) {
|
||||||
},
|
},
|
||||||
p(new_ctx, dirty) {
|
p(new_ctx, dirty) {
|
||||||
ctx = new_ctx;
|
ctx = new_ctx;
|
||||||
|
if (!current || dirty & /*closed, hierarchy*/
|
||||||
|
33) {
|
||||||
|
toggle_class(
|
||||||
|
div1,
|
||||||
|
"is-collapsed",
|
||||||
|
/*closed*/
|
||||||
|
ctx[5][
|
||||||
|
/*entity*/
|
||||||
|
ctx[15].title
|
||||||
|
]
|
||||||
|
);
|
||||||
|
}
|
||||||
if ((!current || dirty & /*hierarchy*/
|
if ((!current || dirty & /*hierarchy*/
|
||||||
1) && t2_value !== (t2_value = /*entity*/
|
1) && t2_value !== (t2_value = /*entity*/
|
||||||
ctx[15].title + ""))
|
ctx[15].title + ""))
|
||||||
|
@ -40878,6 +40935,8 @@ function create_if_block8(ctx) {
|
||||||
if (if_block2)
|
if (if_block2)
|
||||||
if_block2.c();
|
if_block2.c();
|
||||||
attr(div0, "class", "tree-item-icon nav-folder-collapse-indicator collapse-icon");
|
attr(div0, "class", "tree-item-icon nav-folder-collapse-indicator collapse-icon");
|
||||||
|
toggle_class(div0, "is-collapsed", !/*stagedOpen*/
|
||||||
|
ctx[13]);
|
||||||
attr(div1, "class", "tree-item-inner nav-folder-title-content");
|
attr(div1, "class", "tree-item-inner nav-folder-title-content");
|
||||||
attr(div2, "data-icon", "minus");
|
attr(div2, "data-icon", "minus");
|
||||||
attr(div2, "aria-label", "Unstage");
|
attr(div2, "aria-label", "Unstage");
|
||||||
|
@ -40890,6 +40949,8 @@ function create_if_block8(ctx) {
|
||||||
toggle_class(div7, "is-collapsed", !/*stagedOpen*/
|
toggle_class(div7, "is-collapsed", !/*stagedOpen*/
|
||||||
ctx[13]);
|
ctx[13]);
|
||||||
attr(div8, "class", "tree-item-icon nav-folder-collapse-indicator collapse-icon");
|
attr(div8, "class", "tree-item-icon nav-folder-collapse-indicator collapse-icon");
|
||||||
|
toggle_class(div8, "is-collapsed", !/*changesOpen*/
|
||||||
|
ctx[12]);
|
||||||
attr(div9, "class", "tree-item-inner nav-folder-title-content");
|
attr(div9, "class", "tree-item-inner nav-folder-title-content");
|
||||||
attr(div10, "data-icon", "undo");
|
attr(div10, "data-icon", "undo");
|
||||||
attr(div10, "aria-label", "Discard");
|
attr(div10, "aria-label", "Discard");
|
||||||
|
@ -40980,6 +41041,11 @@ function create_if_block8(ctx) {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
p(ctx2, dirty) {
|
p(ctx2, dirty) {
|
||||||
|
if (!current || dirty[0] & /*stagedOpen*/
|
||||||
|
8192) {
|
||||||
|
toggle_class(div0, "is-collapsed", !/*stagedOpen*/
|
||||||
|
ctx2[13]);
|
||||||
|
}
|
||||||
if ((!current || dirty[0] & /*status*/
|
if ((!current || dirty[0] & /*status*/
|
||||||
64) && t4_value !== (t4_value = /*status*/
|
64) && t4_value !== (t4_value = /*status*/
|
||||||
ctx2[6].staged.length + ""))
|
ctx2[6].staged.length + ""))
|
||||||
|
@ -41012,6 +41078,11 @@ function create_if_block8(ctx) {
|
||||||
toggle_class(div7, "is-collapsed", !/*stagedOpen*/
|
toggle_class(div7, "is-collapsed", !/*stagedOpen*/
|
||||||
ctx2[13]);
|
ctx2[13]);
|
||||||
}
|
}
|
||||||
|
if (!current || dirty[0] & /*changesOpen*/
|
||||||
|
4096) {
|
||||||
|
toggle_class(div8, "is-collapsed", !/*changesOpen*/
|
||||||
|
ctx2[12]);
|
||||||
|
}
|
||||||
if ((!current || dirty[0] & /*status*/
|
if ((!current || dirty[0] & /*status*/
|
||||||
64) && t12_value !== (t12_value = /*status*/
|
64) && t12_value !== (t12_value = /*status*/
|
||||||
ctx2[6].changed.length + ""))
|
ctx2[6].changed.length + ""))
|
||||||
|
@ -43660,6 +43731,7 @@ var ObsidianGit = class extends import_obsidian30.Plugin {
|
||||||
}
|
}
|
||||||
this.offlineMode = false;
|
this.offlineMode = false;
|
||||||
this.setState(0 /* idle */);
|
this.setState(0 /* idle */);
|
||||||
|
dispatchEvent(new CustomEvent("git-refresh"));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,5 +5,5 @@
|
||||||
"isDesktopOnly": false,
|
"isDesktopOnly": false,
|
||||||
"fundingUrl": "https://ko-fi.com/vinzent",
|
"fundingUrl": "https://ko-fi.com/vinzent",
|
||||||
"js": "main.js",
|
"js": "main.js",
|
||||||
"version": "2.20.5"
|
"version": "2.20.7"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
{
|
|
||||||
"findText": "</br> \\n",
|
|
||||||
"replaceText": "",
|
|
||||||
"useRegEx": true,
|
|
||||||
"selOnly": false,
|
|
||||||
"caseInsensitive": false,
|
|
||||||
"processLineBreak": false,
|
|
||||||
"processTab": false,
|
|
||||||
"prefillFind": false
|
|
||||||
}
|
|
File diff suppressed because one or more lines are too long
|
@ -1,10 +0,0 @@
|
||||||
{
|
|
||||||
"author": "Martin Eder",
|
|
||||||
"authorUrl": "https://www.gruware.org",
|
|
||||||
"description": "Find and replace text using regular expressions.",
|
|
||||||
"id": "obsidian-regex-replace",
|
|
||||||
"isDesktopOnly": false,
|
|
||||||
"minAppVersion": "0.12.17",
|
|
||||||
"name": "Regex Find/Replace",
|
|
||||||
"version": "1.2.0"
|
|
||||||
}
|
|
|
@ -1,51 +0,0 @@
|
||||||
.find-replace-modal .modal-content .row {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
width: 100%;
|
|
||||||
margin-top: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.find-replace-modal .modal-content .row .input-label {
|
|
||||||
display: flex;
|
|
||||||
justify-content: flex-end;
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.find-replace-modal .modal-content .row .postfix-label {
|
|
||||||
display: flex;
|
|
||||||
height: 100%;
|
|
||||||
margin-left: 8px;
|
|
||||||
justify-content: flex-end;
|
|
||||||
color: gray;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.find-replace-modal .modal-content .row .check-label {
|
|
||||||
display: flex;
|
|
||||||
justify-content: flex-end;
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
margin-right: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.find-replace-modal .modal-content .row .input-wrapper {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
height: 100%;
|
|
||||||
width: 100%;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.find-replace-modal .modal-content .row .input-wrapper input {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.find-replace-modal .modal-content .button-wrapper {
|
|
||||||
justify-content: center;
|
|
||||||
margin-top: 16px;
|
|
||||||
}
|
|
|
@ -3,25 +3,6 @@
|
||||||
"id": "3969f3923e6cfedb",
|
"id": "3969f3923e6cfedb",
|
||||||
"type": "split",
|
"type": "split",
|
||||||
"children": [
|
"children": [
|
||||||
{
|
|
||||||
"id": "136215ede165064b",
|
|
||||||
"type": "tabs",
|
|
||||||
"children": [
|
|
||||||
{
|
|
||||||
"id": "80341c8247f9de96",
|
|
||||||
"type": "leaf",
|
|
||||||
"state": {
|
|
||||||
"type": "markdown",
|
|
||||||
"state": {
|
|
||||||
"file": "BBG4E/HW7.md",
|
|
||||||
"mode": "source",
|
|
||||||
"backlinks": false,
|
|
||||||
"source": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"id": "dc6953e52f605198",
|
"id": "dc6953e52f605198",
|
||||||
"type": "tabs",
|
"type": "tabs",
|
||||||
|
@ -30,12 +11,8 @@
|
||||||
"id": "1f29e3fbc98f9a45",
|
"id": "1f29e3fbc98f9a45",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "markdown",
|
"type": "empty",
|
||||||
"state": {
|
"state": {}
|
||||||
"file": "Parables/Parables-John.md",
|
|
||||||
"mode": "source",
|
|
||||||
"source": true
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
@ -111,9 +88,7 @@
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "outline",
|
"type": "outline",
|
||||||
"state": {
|
"state": {}
|
||||||
"file": "BBG4E/HW7.md"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -133,7 +108,6 @@
|
||||||
"state": {
|
"state": {
|
||||||
"type": "backlink",
|
"type": "backlink",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "BBG4E/HW7.md",
|
|
||||||
"collapseAll": false,
|
"collapseAll": false,
|
||||||
"extraContext": false,
|
"extraContext": false,
|
||||||
"sortOrder": "alphabetical",
|
"sortOrder": "alphabetical",
|
||||||
|
@ -150,7 +124,6 @@
|
||||||
"state": {
|
"state": {
|
||||||
"type": "outgoing-link",
|
"type": "outgoing-link",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "BBG4E/HW7.md",
|
|
||||||
"linksCollapsed": false,
|
"linksCollapsed": false,
|
||||||
"unlinkedCollapsed": true
|
"unlinkedCollapsed": true
|
||||||
}
|
}
|
||||||
|
@ -160,8 +133,7 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"direction": "horizontal",
|
"direction": "horizontal",
|
||||||
"width": 362.5,
|
"width": 362.5
|
||||||
"collapsed": true
|
|
||||||
},
|
},
|
||||||
"left-ribbon": {
|
"left-ribbon": {
|
||||||
"hiddenItems": {
|
"hiddenItems": {
|
||||||
|
@ -173,9 +145,13 @@
|
||||||
"workspaces:Manage workspace layouts": false
|
"workspaces:Manage workspace layouts": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"active": "80341c8247f9de96",
|
"active": "1f29e3fbc98f9a45",
|
||||||
"lastOpenFiles": [
|
"lastOpenFiles": [
|
||||||
|
"Parables/Joh.10.1-18.md",
|
||||||
|
"Parables/Joh.15.1-8.md",
|
||||||
"Parables/Parables-John.md",
|
"Parables/Parables-John.md",
|
||||||
|
"Parables/Parables-Mark.md",
|
||||||
|
"BBG4E/HW7.md",
|
||||||
"Biblography.md",
|
"Biblography.md",
|
||||||
"cheatsheet.md",
|
"cheatsheet.md",
|
||||||
"Digital-Tools.md",
|
"Digital-Tools.md",
|
||||||
|
@ -195,13 +171,9 @@
|
||||||
"Mounce-Reader/GRBG-01c.md",
|
"Mounce-Reader/GRBG-01c.md",
|
||||||
"Mounce-Reader/GRBG-01b.md",
|
"Mounce-Reader/GRBG-01b.md",
|
||||||
"Mounce-Reader/GRBG-01a.md",
|
"Mounce-Reader/GRBG-01a.md",
|
||||||
"BBG4E/HW7.md",
|
|
||||||
"Mounce-Reader/GRBG.md",
|
"Mounce-Reader/GRBG.md",
|
||||||
"Mounce-Reader/GRBG-02a.md",
|
"Mounce-Reader/GRBG-02a.md",
|
||||||
"BBG4E/HW6-Key.md",
|
"BBG4E/HW6-Key.md",
|
||||||
"Mounce-BBG/複習 7 (Mat 13.1–23) 解答.md",
|
|
||||||
"Mounce-BBG/BBG.md",
|
|
||||||
"Mounce-BBG/複習 5 (Joh 9.18–34) 解答.md",
|
|
||||||
"47-2Corinthians",
|
"47-2Corinthians",
|
||||||
"BBG4E/BG4E 規劃.canvas",
|
"BBG4E/BG4E 規劃.canvas",
|
||||||
"62-1John/1Jo.4.7-12.pdf",
|
"62-1John/1Jo.4.7-12.pdf",
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
#### 真葡萄樹的比喻 (John 15:1-8)
|
|
||||||
|
|
||||||
|
|
||||||
- 15:1a (<RUBY><ruby><ruby>Ἐγώ<rt>ἐγώ</rt></ruby><rt>I</rt></ruby><rt>P-1NS</rt></RUBY>)S ((<RUBY><ruby><ruby><strong>εἰμι</strong><rt>εἰμί</rt></ruby><rt>am</rt></ruby><rt>V-PAI-1S</rt></RUBY>)P)P (<RUBY><ruby><ruby>ἡ<rt>ὁ</rt></ruby><rt>the</rt></ruby><rt>T-NSF</rt></RUBY> <RUBY><ruby><ruby>ἄμπελος<rt>ἄμπελος</rt></ruby><rt>vine</rt></ruby><rt>N-NSF</rt></RUBY> <RUBY><ruby><ruby>ἡ<rt>ὁ</rt></ruby><rt>-</rt></ruby><rt>T-NSF</rt></RUBY> <RUBY><ruby><ruby>ἀληθινή<rt>ἀληθινός</rt></ruby><rt>true</rt></ruby><rt>A-NSF</rt></RUBY>)C
|
|
||||||
- 15:1b <RUBY><ruby><ruby>καὶ<rt>καί</rt></ruby><rt>and</rt></ruby><rt>CONJ</rt></RUBY> (<RUBY><ruby><ruby>ὁ<rt>ὁ</rt></ruby><rt>the</rt></ruby><rt>T-NSM</rt></RUBY> <RUBY><ruby><ruby>Πατήρ<rt>πατήρ</rt></ruby><rt>Father</rt></ruby><rt>N-NSM</rt></RUBY> <RUBY><ruby><ruby>μου<rt>ἐγώ</rt></ruby><rt>of Me</rt></ruby><rt>P-1GS</rt></RUBY>)S (<RUBY><ruby><ruby>ὁ<rt>ὁ</rt></ruby><rt>the</rt></ruby><rt>T-NSM</rt></RUBY> <RUBY><ruby><ruby>γεωργός<rt>γεωργός</rt></ruby><rt>vinedresser</rt></ruby><rt>N-NSM</rt></RUBY>)C ((<RUBY><ruby><ruby><strong>ἐστιν .</strong><rt>εἰμί</rt></ruby><rt>is</rt></ruby><rt>V-PAI-3S</rt></RUBY>)P)P
|
|
||||||
- 15:2a { <RUBY><ruby><ruby>πᾶν<rt>πᾶς</rt></ruby><rt>Every</rt></ruby><rt>A-ASN</rt></RUBY> <RUBY><ruby><ruby>κλῆμα<rt>κλῆμα</rt></ruby><rt>branch</rt></ruby><rt>N-ASN</rt></RUBY> <RUBY><ruby><ruby>ἐν<rt>ἐν</rt></ruby><rt>in</rt></ruby><rt>PREP</rt></RUBY> <RUBY><ruby><ruby>ἐμοὶ<rt>ἐγώ</rt></ruby><rt>Me</rt></ruby><rt>P-1DS</rt></RUBY> <RUBY><ruby><ruby>μὴ<rt>μή</rt></ruby><rt>not</rt></ruby><rt>PRT-N</rt></RUBY> <RUBY><ruby><ruby><em>φέρον</em><rt>φέρω</rt></ruby><rt>bearing</rt></ruby><rt>V-PAP-ASN</rt></RUBY> <RUBY><ruby><ruby>καρπὸν<rt>καρπός</rt></ruby><rt>fruit</rt></ruby><rt>N-ASM</rt></RUBY> }+C ((<RUBY><ruby><ruby><strong>αἴρει</strong><rt>αἴρω</rt></ruby><rt>He takes away</rt></ruby><rt>V-PAI-3S</rt></RUBY>)P)P (<RUBY><ruby><ruby>αὐτό ,<rt>αὐτός</rt></ruby><rt>it</rt></ruby><rt>P-ASN</rt></RUBY>)C
|
|
||||||
- <RUBY><ruby><ruby>καὶ<rt>καί</rt></ruby><rt>and</rt></ruby><rt>CONJ</rt></RUBY> <RUBY><ruby><ruby>πᾶν<rt>πᾶς</rt></ruby><rt>every one</rt></ruby><rt>A-ASN</rt></RUBY> <RUBY><ruby><ruby>τὸ<rt>ὁ</rt></ruby><rt>-</rt></ruby><rt>T-ASN</rt></RUBY> <RUBY><ruby><ruby>καρπὸν<rt>καρπός</rt></ruby><rt>fruit</rt></ruby><rt>N-ASM</rt></RUBY> <RUBY><ruby><ruby><em>φέρον</em><rt>φέρω</rt></ruby><rt>bearing</rt></ruby><rt>V-PAP-ASN</rt></RUBY> ((<RUBY><ruby><ruby><strong>καθαίρει</strong><rt>καθαίρω</rt></ruby><rt>He prunes</rt></ruby><rt>V-PAI-3S</rt></RUBY>)P)P <RUBY><ruby><ruby>αὐτὸ<rt>αὐτός</rt></ruby><rt>it</rt></ruby><rt>P-ASN</rt></RUBY>
|
|
||||||
- <RUBY><ruby><ruby>ἵνα<rt>ἵνα</rt></ruby><rt>that</rt></ruby><rt>CONJ</rt></RUBY> <RUBY><ruby><ruby>καρπὸν<rt>καρπός</rt></ruby><rt>fruit</rt></ruby><rt>N-ASM</rt></RUBY> <RUBY><ruby><ruby>πλείονα<rt>πλείων, πλεῖον</rt></ruby><rt>more</rt></ruby><rt>A-ASM-C</rt></RUBY> ((<RUBY><ruby><ruby><strong>φέρῃ .</strong><rt>φέρω</rt></ruby><rt>it may bear</rt></ruby><rt>V-PAS-3S</rt></RUBY>)P)P
|
|
||||||
- 15:3 <RUBY><ruby><ruby>ἤδη<rt>ἤδη</rt></ruby><rt>Already</rt></ruby><rt>ADV</rt></RUBY> <RUBY><ruby><ruby>ὑμεῖς<rt>σύ</rt></ruby><rt>you</rt></ruby><rt>P-2NP</rt></RUBY> <RUBY><ruby><ruby>καθαροί<rt>καθαρός</rt></ruby><rt>clean</rt></ruby><rt>A-NPM</rt></RUBY> ((<RUBY><ruby><ruby><strong>ἐστε</strong><rt>εἰμί</rt></ruby><rt>are</rt></ruby><rt>V-PAI-2P</rt></RUBY>)P)P <RUBY><ruby><ruby>διὰ<rt>διά</rt></ruby><rt>by reason of</rt></ruby><rt>PREP</rt></RUBY> <RUBY><ruby><ruby>τὸν<rt>ὁ</rt></ruby><rt>the</rt></ruby><rt>T-ASM</rt></RUBY> <RUBY><ruby><ruby>λόγον<rt>λόγος</rt></ruby><rt>word</rt></ruby><rt>N-ASM</rt></RUBY> <RUBY><ruby><ruby>ὃν<rt>ὅς, ἥ</rt></ruby><rt>that</rt></ruby><rt>R-ASM</rt></RUBY> ((<RUBY><ruby><ruby><strong>λελάληκα</strong><rt>λαλέω</rt></ruby><rt>I have spoken</rt></ruby><rt>V-RAI-1S</rt></RUBY>)P)P <RUBY><ruby><ruby>ὑμῖν ·<rt>σύ</rt></ruby><rt>to you</rt></ruby><rt>P-2DP</rt></RUBY>
|
|
||||||
- 15:4 ((<RUBY><ruby><ruby><strong>μείνατε</strong><rt>μένω</rt></ruby><rt>Abide</rt></ruby><rt>V-AAM-2P</rt></RUBY>)P)P <RUBY><ruby><ruby>ἐν<rt>ἐν</rt></ruby><rt>in</rt></ruby><rt>PREP</rt></RUBY> <RUBY><ruby><ruby>ἐμοί ,<rt>ἐγώ</rt></ruby><rt>Me</rt></ruby><rt>P-1DS</rt></RUBY> <RUBY><ruby><ruby>κἀγὼ<rt>κἀγώ</rt></ruby><rt>and I</rt></ruby><rt>P-1NS-K</rt></RUBY> <RUBY><ruby><ruby>ἐν<rt>ἐν</rt></ruby><rt>in</rt></ruby><rt>PREP</rt></RUBY> <RUBY><ruby><ruby>ὑμῖν .<rt>σύ</rt></ruby><rt>you</rt></ruby><rt>P-2DP</rt></RUBY>
|
|
||||||
- <RUBY><ruby><ruby>καθὼς<rt>καθώς</rt></ruby><rt>As</rt></ruby><rt>CONJ</rt></RUBY> <RUBY><ruby><ruby>τὸ<rt>ὁ</rt></ruby><rt>the</rt></ruby><rt>T-NSN</rt></RUBY> <RUBY><ruby><ruby>κλῆμα<rt>κλῆμα</rt></ruby><rt>branch</rt></ruby><rt>N-NSN</rt></RUBY> <RUBY><ruby><ruby>οὐ<rt>οὐ</rt></ruby><rt>not</rt></ruby><rt>PRT-N</rt></RUBY> ((<RUBY><ruby><ruby><strong>δύναται</strong><rt>δύναμαι</rt></ruby><rt>is able</rt></ruby><rt>V-PNI-3S</rt></RUBY>)P)P <RUBY><ruby><ruby>καρπὸν<rt>καρπός</rt></ruby><rt>fruit</rt></ruby><rt>N-ASM</rt></RUBY> <RUBY><ruby><ruby><em>φέρειν</em><rt>φέρω</rt></ruby><rt>to bear</rt></ruby><rt>V-PAN</rt></RUBY> <RUBY><ruby><ruby>ἀφ᾽<rt>ἀπό</rt></ruby><rt>of</rt></ruby><rt>PREP</rt></RUBY> <RUBY><ruby><ruby>ἑαυτοῦ<rt>ἑαυτοῦ</rt></ruby><rt>itself</rt></ruby><rt>F-3GSN</rt></RUBY>
|
|
||||||
- <RUBY><ruby><ruby>ἐὰν<rt>ἐάν</rt></ruby><rt>if</rt></ruby><rt>CONJ</rt></RUBY> <RUBY><ruby><ruby>μὴ<rt>μή</rt></ruby><rt>not</rt></ruby><rt>PRT-N</rt></RUBY> ((<RUBY><ruby><ruby><strong>μένῃ</strong><rt>μένω</rt></ruby><rt>it abide</rt></ruby><rt>V-PAS-3S</rt></RUBY>)P)P <RUBY><ruby><ruby>ἐν<rt>ἐν</rt></ruby><rt>in</rt></ruby><rt>PREP</rt></RUBY> <RUBY><ruby><ruby>τῇ<rt>ὁ</rt></ruby><rt>the</rt></ruby><rt>T-DSF</rt></RUBY> <RUBY><ruby><ruby>ἀμπέλῳ ,<rt>ἄμπελος</rt></ruby><rt>vine</rt></ruby><rt>N-DSF</rt></RUBY> <RUBY><ruby><ruby>οὕτως<rt>οὕτω, οὕτως</rt></ruby><rt>so</rt></ruby><rt>ADV</rt></RUBY> <RUBY><ruby><ruby>οὐδὲ<rt>οὐδέ</rt></ruby><rt>neither [can]</rt></ruby><rt>CONJ-N</rt></RUBY> <RUBY><ruby><ruby>ὑμεῖς<rt>σύ</rt></ruby><rt>you</rt></ruby><rt>P-2NP</rt></RUBY>
|
|
||||||
- <RUBY><ruby><ruby>ἐὰν<rt>ἐάν</rt></ruby><rt>if</rt></ruby><rt>CONJ</rt></RUBY> <RUBY><ruby><ruby>μὴ<rt>μή</rt></ruby><rt>not</rt></ruby><rt>PRT-N</rt></RUBY> <RUBY><ruby><ruby>ἐν<rt>ἐν</rt></ruby><rt>in</rt></ruby><rt>PREP</rt></RUBY> <RUBY><ruby><ruby>ἐμοὶ<rt>ἐγώ</rt></ruby><rt>Me</rt></ruby><rt>P-1DS</rt></RUBY> ((<RUBY><ruby><ruby><strong>μένητε .</strong><rt>μένω</rt></ruby><rt>you abide</rt></ruby><rt>V-PAS-2P</rt></RUBY>)P)P
|
|
||||||
- 15:5 <RUBY><ruby><ruby>Ἐγώ<rt>ἐγώ</rt></ruby><rt>I</rt></ruby><rt>P-1NS</rt></RUBY> ((<RUBY><ruby><ruby><strong>εἰμι</strong><rt>εἰμί</rt></ruby><rt>am</rt></ruby><rt>V-PAI-1S</rt></RUBY>)P)P <RUBY><ruby><ruby>ἡ<rt>ὁ</rt></ruby><rt>the</rt></ruby><rt>T-NSF</rt></RUBY> <RUBY><ruby><ruby>ἄμπελος ,<rt>ἄμπελος</rt></ruby><rt>vine</rt></ruby><rt>N-NSF</rt></RUBY> <RUBY><ruby><ruby>ὑμεῖς<rt>σύ</rt></ruby><rt>you [are]</rt></ruby><rt>P-2NP</rt></RUBY> <RUBY><ruby><ruby>τὰ<rt>ὁ</rt></ruby><rt>the</rt></ruby><rt>T-NPN</rt></RUBY> <RUBY><ruby><ruby>κλήματα .<rt>κλῆμα</rt></ruby><rt>branches</rt></ruby><rt>N-NPN</rt></RUBY> <RUBY><ruby><ruby>ὁ<rt>ὁ</rt></ruby><rt>The [one]</rt></ruby><rt>T-NSM</rt></RUBY> <RUBY><ruby><ruby><em>μένων</em><rt>μένω</rt></ruby><rt>abiding</rt></ruby><rt>V-PAP-NSM</rt></RUBY> <RUBY><ruby><ruby>ἐν<rt>ἐν</rt></ruby><rt>in</rt></ruby><rt>PREP</rt></RUBY> <RUBY><ruby><ruby>ἐμοὶ<rt>ἐγώ</rt></ruby><rt>Me</rt></ruby><rt>P-1DS</rt></RUBY> <RUBY><ruby><ruby>κἀγὼ<rt>κἀγώ</rt></ruby><rt>and I</rt></ruby><rt>P-1NS-K</rt></RUBY> <RUBY><ruby><ruby>ἐν<rt>ἐν</rt></ruby><rt>in</rt></ruby><rt>PREP</rt></RUBY> <RUBY><ruby><ruby>αὐτῷ<rt>αὐτός</rt></ruby><rt>him</rt></ruby><rt>P-DSM</rt></RUBY> <RUBY><ruby><ruby>οὗτος<rt>οὗτος</rt></ruby><rt>he</rt></ruby><rt>D-NSM</rt></RUBY> ((<RUBY><ruby><ruby><strong>φέρει</strong><rt>φέρω</rt></ruby><rt>bears</rt></ruby><rt>V-PAI-3S</rt></RUBY>)P)P <RUBY><ruby><ruby>καρπὸν<rt>καρπός</rt></ruby><rt>fruit</rt></ruby><rt>N-ASM</rt></RUBY> <RUBY><ruby><ruby>πολύν ,<rt>πολύς</rt></ruby><rt>much</rt></ruby><rt>A-ASM</rt></RUBY>
|
|
||||||
- <RUBY><ruby><ruby>ὅτι<rt>ὅτι</rt></ruby><rt>For</rt></ruby><rt>CONJ</rt></RUBY> <RUBY><ruby><ruby>χωρὶς<rt>χωρίς</rt></ruby><rt>apart from</rt></ruby><rt>PREP</rt></RUBY> <RUBY><ruby><ruby>ἐμοῦ<rt>ἐγώ</rt></ruby><rt>Me</rt></ruby><rt>P-1GS</rt></RUBY> <RUBY><ruby><ruby>οὐ<rt>οὐ</rt></ruby><rt>not</rt></ruby><rt>PRT-N</rt></RUBY> ((<RUBY><ruby><ruby><strong>δύνασθε</strong><rt>δύναμαι</rt></ruby><rt>you are able</rt></ruby><rt>V-PNI-2P</rt></RUBY>)P)P <RUBY><ruby><ruby><em>ποιεῖν</em><rt>ποιέω</rt></ruby><rt>to do</rt></ruby><rt>V-PAN</rt></RUBY> <RUBY><ruby><ruby>οὐδέν .<rt>οὐδείς</rt></ruby><rt>nothing</rt></ruby><rt>A-ASN</rt></RUBY>
|
|
||||||
- 15:6
|
|
||||||
- <RUBY><ruby><ruby>ἐὰν<rt>ἐάν</rt></ruby><rt>If</rt></ruby><rt>CONJ</rt></RUBY> <RUBY><ruby><ruby>μή<rt>μή</rt></ruby><rt>not</rt></ruby><rt>PRT-N</rt></RUBY> <RUBY><ruby><ruby>τις<rt>τις</rt></ruby><rt>anyone</rt></ruby><rt>X-NSM</rt></RUBY> ((<RUBY><ruby><ruby><strong>μένῃ</strong><rt>μένω</rt></ruby><rt>abide</rt></ruby><rt>V-PAS-3S</rt></RUBY>)P)P <RUBY><ruby><ruby>ἐν<rt>ἐν</rt></ruby><rt>in</rt></ruby><rt>PREP</rt></RUBY> <RUBY><ruby><ruby>ἐμοί ,<rt>ἐγώ</rt></ruby><rt>Me</rt></ruby><rt>P-1DS</rt></RUBY> ((<RUBY><ruby><ruby><strong>ἐβλήθη</strong><rt>βάλλω</rt></ruby><rt>he is thrown</rt></ruby><rt>V-API-3S</rt></RUBY>)P)P <RUBY><ruby><ruby>ἔξω<rt>ἔξω</rt></ruby><rt>out</rt></ruby><rt>ADV</rt></RUBY>
|
|
||||||
- <RUBY><ruby><ruby>ὡς<rt>ὡς</rt></ruby><rt>like</rt></ruby><rt>CONJ</rt></RUBY> <RUBY><ruby><ruby>τὸ<rt>ὁ</rt></ruby><rt>the</rt></ruby><rt>T-NSN</rt></RUBY> <RUBY><ruby><ruby>κλῆμα<rt>κλῆμα</rt></ruby><rt>branch</rt></ruby><rt>N-NSN</rt></RUBY>
|
|
||||||
- <RUBY><ruby><ruby>καὶ<rt>καί</rt></ruby><rt>and</rt></ruby><rt>CONJ</rt></RUBY> ((<RUBY><ruby><ruby><strong>ἐξηράνθη</strong><rt>ξηραίνω</rt></ruby><rt>is dried up</rt></ruby><rt>V-API-3S</rt></RUBY>)P)P
|
|
||||||
- <RUBY><ruby><ruby>καὶ<rt>καί</rt></ruby><rt>and</rt></ruby><rt>CONJ</rt></RUBY> ((<RUBY><ruby><ruby><strong>συνάγουσιν</strong><rt>συνάγω</rt></ruby><rt>they gather</rt></ruby><rt>V-PAI-3P</rt></RUBY>)P)P <RUBY><ruby><ruby>αὐτὰ<rt>αὐτός</rt></ruby><rt>them</rt></ruby><rt>P-APN</rt></RUBY>
|
|
||||||
- <RUBY><ruby><ruby>καὶ<rt>καί</rt></ruby><rt>and</rt></ruby><rt>CONJ</rt></RUBY> <RUBY><ruby><ruby>εἰς<rt>εἰς</rt></ruby><rt>into</rt></ruby><rt>PREP</rt></RUBY> <RUBY><ruby><ruby>τὸ<rt>ὁ</rt></ruby><rt>the</rt></ruby><rt>T-ASN</rt></RUBY> <RUBY><ruby><ruby>πῦρ<rt>πῦρ</rt></ruby><rt>fire</rt></ruby><rt>N-ASN</rt></RUBY> ((<RUBY><ruby><ruby><strong>βάλλουσιν</strong><rt>βάλλω</rt></ruby><rt>cast</rt></ruby><rt>V-PAI-3P</rt></RUBY>)P)P
|
|
||||||
- <RUBY><ruby><ruby>καὶ<rt>καί</rt></ruby><rt>and</rt></ruby><rt>CONJ</rt></RUBY> ((<RUBY><ruby><ruby><strong>καίεται .</strong><rt>καίω</rt></ruby><rt>it is burned</rt></ruby><rt>V-PPI-3S</rt></RUBY>)P)P
|
|
||||||
- 15:7
|
|
||||||
- <RUBY><ruby><ruby>ἐὰν<rt>ἐάν</rt></ruby><rt>If</rt></ruby><rt>CONJ</rt></RUBY> ((<RUBY><ruby><ruby><strong>μείνητε</strong><rt>μένω</rt></ruby><rt>you abide</rt></ruby><rt>V-AAS-2P</rt></RUBY>)P)P <RUBY><ruby><ruby>ἐν<rt>ἐν</rt></ruby><rt>in</rt></ruby><rt>PREP</rt></RUBY> <RUBY><ruby><ruby>ἐμοὶ<rt>ἐγώ</rt></ruby><rt>Me</rt></ruby><rt>P-1DS</rt></RUBY>
|
|
||||||
- <RUBY><ruby><ruby>καὶ<rt>καί</rt></ruby><rt>and</rt></ruby><rt>CONJ</rt></RUBY> <RUBY><ruby><ruby>τὰ<rt>ὁ</rt></ruby><rt>the</rt></ruby><rt>T-NPN</rt></RUBY> <RUBY><ruby><ruby>ῥήματά<rt>ῥῆμα</rt></ruby><rt>words</rt></ruby><rt>N-NPN</rt></RUBY> <RUBY><ruby><ruby>μου<rt>ἐγώ</rt></ruby><rt>of Me</rt></ruby><rt>P-1GS</rt></RUBY> <RUBY><ruby><ruby>ἐν<rt>ἐν</rt></ruby><rt>in</rt></ruby><rt>PREP</rt></RUBY> <RUBY><ruby><ruby>ὑμῖν<rt>σύ</rt></ruby><rt>you</rt></ruby><rt>P-2DP</rt></RUBY> ((<RUBY><ruby><ruby><strong>μείνῃ ,</strong><rt>μένω</rt></ruby><rt>abide</rt></ruby><rt>V-AAS-3S</rt></RUBY>)P)P <RUBY><ruby><ruby>ὃ<rt>ὅς, ἥ</rt></ruby><rt>whatever</rt></ruby><rt>R-ASN</rt></RUBY> <RUBY><ruby><ruby>ἐὰν<rt>ἐάν</rt></ruby><rt>if</rt></ruby><rt>PRT</rt></RUBY> ((<RUBY><ruby><ruby><strong>θέλητε</strong><rt>θέλω</rt></ruby><rt>you wish</rt></ruby><rt>V-PAS-2P</rt></RUBY>)P)P ((<RUBY><ruby><ruby><strong>αἰτήσασθε ,</strong><rt>αἰτέω</rt></ruby><rt>you shall ask</rt></ruby><rt>V-AMM-2P</rt></RUBY>)P)P
|
|
||||||
- <RUBY><ruby><ruby>καὶ<rt>καί</rt></ruby><rt>and</rt></ruby><rt>CONJ</rt></RUBY> ((<RUBY><ruby><ruby><strong>γενήσεται</strong><rt>γίνομαι</rt></ruby><rt>it will come to pass</rt></ruby><rt>V-FDI-3S</rt></RUBY>)P)P <RUBY><ruby><ruby>ὑμῖν .<rt>σύ</rt></ruby><rt>to you</rt></ruby><rt>P-2DP</rt></RUBY>
|
|
||||||
- 15:8 <RUBY><ruby><ruby>ἐν<rt>ἐν</rt></ruby><rt>In</rt></ruby><rt>PREP</rt></RUBY> <RUBY><ruby><ruby>τούτῳ<rt>οὗτος</rt></ruby><rt>this</rt></ruby><rt>D-DSN</rt></RUBY> ((<RUBY><ruby><ruby><strong>ἐδοξάσθη</strong><rt>δοξάζω</rt></ruby><rt>is glorified</rt></ruby><rt>V-API-3S</rt></RUBY>)P)P <RUBY><ruby><ruby>ὁ<rt>ὁ</rt></ruby><rt>the</rt></ruby><rt>T-NSM</rt></RUBY> <RUBY><ruby><ruby>Πατήρ<rt>πατήρ</rt></ruby><rt>Father</rt></ruby><rt>N-NSM</rt></RUBY> <RUBY><ruby><ruby>μου ,<rt>ἐγώ</rt></ruby><rt>of Me</rt></ruby><rt>P-1GS</rt></RUBY>
|
|
||||||
- <RUBY><ruby><ruby>ἵνα<rt>ἵνα</rt></ruby><rt>that</rt></ruby><rt>CONJ</rt></RUBY> <RUBY><ruby><ruby>καρπὸν<rt>καρπός</rt></ruby><rt>fruit</rt></ruby><rt>N-ASM</rt></RUBY> <RUBY><ruby><ruby>πολὺν<rt>πολύς</rt></ruby><rt>much</rt></ruby><rt>A-ASM</rt></RUBY> ((<RUBY><ruby><ruby><strong>φέρητε</strong><rt>φέρω</rt></ruby><rt>you should bear</rt></ruby><rt>V-PAS-2P</rt></RUBY>)P)P
|
|
||||||
- <RUBY><ruby><ruby>καὶ<rt>καί</rt></ruby><rt>and</rt></ruby><rt>CONJ</rt></RUBY> (<RUBY><ruby><ruby><strong>γένησθε</strong><rt>γίνομαι</rt></ruby><rt>you shall be</rt></ruby><rt>V-2ADS-2P</rt></RUBY>)P <RUBY><ruby><ruby>ἐμοὶ<rt>ἐμός</rt></ruby><rt>to Me</rt></ruby><rt>S-1SNPM</rt></RUBY> <RUBY><ruby><ruby>μαθηταί . ¶<rt>μαθητής</rt></ruby><rt>disciples</rt></ruby><rt>N-NPM</rt></RUBY></br></br></br>
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue