vault backup: 2021-12-11 09:29:30

Affected files: .gitignore .obs/app.json .obs/appearance.json .obs/hotkeys.json .obs/workspace .obsidian/app.json .obsidian/appearance.json .obsidian/community-plugins.json .obsidian/config .obsidian/core-plugins.json .obsidian/graph.json .obsidian/hotkeys.json .obsidian/hotkeys_ANDLEY-T470P_十二月-02-140442-2021_Conflict.json .obsidian/plugins/cm-show-whitespace-obsidian/data.json .obsidian/plugins/cm-show-whitespace-obsidian/main.js .obsidian/plugins/cm-show-whitespace-obsidian/manifest.json .obsidian/plugins/cm-show-whitespace-obsidian/styles.css .obsidian/plugins/obsidian-git/data.json .obsidian/plugins/obsidian-git/data[衝突].json .obsidian/plugins/obsidian-git/main.js .obsidian/plugins/obsidian-git/manifest.json .obsidian/plugins/obsidian-git/styles.css .obsidian/plugins/obsidian-hider/data.json .obsidian/plugins/obsidian-hider/main.js .obsidian/plugins/obsidian-hider/manifest.json .obsidian/plugins/obsidian-hider/styles.css .obsidian/plugins/wikilinks-to-mdlinks-obsidian/main.js .obsidian/plugins/wikilinks-to-mdlinks-obsidian/manifest.json .obsidian/rtl.json .obsidian/snippets/default.css .obsidian/snippets/margin-narrow.css .obsidian/snippets/margin-wide.css .obsidian/starred.json .obsidian/templates.json .obsidian/workspace .obsidian/workspaces.json 62-1John/1John-Notes.md
2021-12-11 09:29:30 +08:00 · 2021-12-11 09:29:30 +08:00 · da79f9760e
parent 2a8d5f3129
commit da79f9760e
37 changed files with 11622 additions and 103 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1 @@
 # to exclude Obsidian workspace settings (including plugin and hotkey configurations)
-.obsidian/
-.trash/
--- a/.obs/app.json
+++ b/.obs/app.json
@ -1 +0,0 @@
-{}
--- a/.obs/appearance.json
+++ b/.obs/appearance.json
@ -1,3 +0,0 @@
-{
-  "baseFontSize": 16
-}
--- a/.obs/hotkeys.json
+++ b/.obs/hotkeys.json
@ -1 +0,0 @@
-{}
--- a/.obs/workspace
+++ b/.obs/workspace
@ -1,87 +0,0 @@
-{
-  "main": {
-    "id": "0c93035612dd65e9",
-    "type": "split",
-    "children": [
-      {
-        "id": "fc2a6127b34e8b21",
-        "type": "leaf",
-        "state": {
-          "type": "empty",
-          "state": {}
-        }
-      }
-    ],
-    "direction": "vertical"
-  },
-  "left": {
-    "id": "e56aa958f3472cb1",
-    "type": "split",
-    "children": [
-      {
-        "id": "5b032df4f5800b76",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "195d99a4bc0d0a96",
-            "type": "leaf",
-            "state": {
-              "type": "file-explorer",
-              "state": {}
-            }
-          },
-          {
-            "id": "f0be83dd56dc3125",
-            "type": "leaf",
-            "state": {
-              "type": "search",
-              "state": {
-                "query": "",
-                "matchingCase": false,
-                "explainSearch": false,
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical"
-              }
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 300
-  },
-  "right": {
-    "id": "68bb1a6263787677",
-    "type": "split",
-    "children": [
-      {
-        "id": "88705fcc46c12ffa",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "f96ee4b609f79ac3",
-            "type": "leaf",
-            "state": {
-              "type": "backlink",
-              "state": {
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical",
-                "showSearch": false,
-                "searchQuery": "",
-                "backlinkCollapsed": false,
-                "unlinkedCollapsed": true
-              }
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 300,
-    "collapsed": true
-  },
-  "active": "fc2a6127b34e8b21",
-  "lastOpenFiles": []
-}
--- a/.obsidian/app.json
+++ b/.obsidian/app.json
@ -0,0 +1,14 @@
+{
+  "foldHeading": true,
+  "foldIndent": true,
+  "defaultViewMode": "preview",
+  "newFileLocation": "current",
+  "newLinkFormat": "relative",
+  "attachmentFolderPath": "images",
+  "pdfExportSettings": {
+    "pageSize": "A4",
+    "landscape": false,
+    "margin": "0",
+    "downscalePercent": 100
+  }
+}
--- a/.obsidian/appearance.json
+++ b/.obsidian/appearance.json
@ -0,0 +1,10 @@
+{
+  "baseFontSize": 16,
+  "enabledCssSnippets": [
+    "BG4E",
+    "font",
+    "default",
+    "margin-wide"
+  ],
+  "theme": "obsidian"
+}
--- a/.obsidian/community-plugins.json
+++ b/.obsidian/community-plugins.json
@ -0,0 +1,6 @@
+[
+  "obsidian-hider",
+  "obsidian-git",
+  "cm-show-whitespace-obsidian",
+  "wikilinks-to-mdlinks-obsidian"
+]
--- a/.obsidian/config
+++ b/.obsidian/config
@ -0,0 +1 @@
+{"baseFontSize":16,"enabledPlugins":[],"pluginEnabledStatus":{"file-explorer":true,"global-search":true,"switcher":true,"graph":true,"backlink":true,"page-preview":true,"command-palette":true,"markdown-importer":true,"word-count":true,"open-with-default-app":true,"file-recovery":true},"enabledCssSnippets":["BG4E"]}
--- a/.obsidian/core-plugins.json
+++ b/.obsidian/core-plugins.json
@ -2,13 +2,12 @@
  "file-explorer",
  "global-search",
  "switcher",
-  "graph",
-  "backlink",
+  "tag-pane",
  "page-preview",
-  "note-composer",
  "command-palette",
-  "markdown-importer",
-  "word-count",
+  "starred",
+  "outline",
  "open-with-default-app",
+  "workspaces",
  "file-recovery"
 ]
--- a/.obsidian/graph.json
+++ b/.obsidian/graph.json
@ -0,0 +1,22 @@
+{
+  "collapse-filter": true,
+  "search": "",
+  "showTags": false,
+  "showAttachments": false,
+  "hideUnresolved": false,
+  "showOrphans": true,
+  "collapse-color-groups": true,
+  "colorGroups": [],
+  "collapse-display": true,
+  "showArrow": false,
+  "textFadeMultiplier": 0,
+  "nodeSizeMultiplier": 1,
+  "lineSizeMultiplier": 1,
+  "collapse-forces": true,
+  "centerStrength": 0.518713248970312,
+  "repelStrength": 10,
+  "linkStrength": 1,
+  "linkDistance": 250,
+  "scale": 1,
+  "close": false
+}
--- a/.obsidian/hotkeys.json
+++ b/.obsidian/hotkeys.json
@ -0,0 +1,127 @@
+{
+  "workspace:close": [],
+  "command-palette:open": [
+    {
+      "modifiers": [
+        "Mod",
+        "Shift"
+      ],
+      "key": "P"
+    }
+  ],
+  "workspace:edit-file-title": [],
+  "workspace:export-pdf": [
+    {
+      "modifiers": [
+        "Mod"
+      ],
+      "key": "P"
+    }
+  ],
+  "editor:follow-link": [],
+  "graph:open": [],
+  "obsidian-hider:toggle-app-ribbon": [
+    {
+      "modifiers": [
+        "Alt"
+      ],
+      "key": "A"
+    }
+  ],
+  "app:go-forward": [
+    {
+      "modifiers": [
+        "Alt"
+      ],
+      "key": "ArrowRight"
+    }
+  ],
+  "obsidian-git:push": [
+    {
+      "modifiers": [
+        "Mod"
+      ],
+      "key": "G"
+    }
+  ],
+  "obsidian-git:commit-push-specified-message": [
+    {
+      "modifiers": [
+        "Mod",
+        "Shift"
+      ],
+      "key": "G"
+    }
+  ],
+  "editor:open-link-in-new-leaf": [],
+  "app:open-settings": [],
+  "switcher:open": [],
+  "workspace:split-vertical": [
+    {
+      "modifiers": [
+        "Alt"
+      ],
+      "key": "V"
+    }
+  ],
+  "workspace:split-horizontal": [
+    {
+      "modifiers": [
+        "Alt"
+      ],
+      "key": "H"
+    }
+  ],
+  "editor:swap-line-down": [
+    {
+      "modifiers": [
+        "Mod"
+      ],
+      "key": "D"
+    }
+  ],
+  "editor:swap-line-up": [
+    {
+      "modifiers": [
+        "Mod"
+      ],
+      "key": "U"
+    }
+  ],
+  "editor:toggle-checklist-status": [],
+  "editor:toggle-comments": [],
+  "app:toggle-left-sidebar": [
+    {
+      "modifiers": [
+        "Alt"
+      ],
+      "key": "L"
+    }
+  ],
+  "app:toggle-right-sidebar": [
+    {
+      "modifiers": [
+        "Alt"
+      ],
+      "key": "R"
+    }
+  ],
+  "workspace:undo-close-pane": [],
+  "wikilinks-to-mdlinks-obsidian:toggle-wiki-md-links": [
+    {
+      "modifiers": [
+        "Mod"
+      ],
+      "key": "L"
+    }
+  ],
+  "editor:delete-paragraph": [],
+  "app:go-back": [
+    {
+      "modifiers": [
+        "Alt"
+      ],
+      "key": "ArrowLeft"
+    }
+  ]
+}
--- a/.obsidian/hotkeys_ANDLEY-T470P_十二月-02-140442-2021_Conflict.json
+++ b/.obsidian/hotkeys_ANDLEY-T470P_十二月-02-140442-2021_Conflict.json
@ -0,0 +1,167 @@
+{
+  "workspace:split-vertical": [
+    {
+      "modifiers": [
+        "Alt"
+      ],
+      "key": "v"
+    }
+  ],
+  "workspace:split-horizontal": [
+    {
+      "modifiers": [
+        "Alt"
+      ],
+      "key": "h"
+    }
+  ],
+  "app:toggle-left-sidebar": [
+    {
+      "modifiers": [
+        "Alt"
+      ],
+      "key": "l"
+    }
+  ],
+  "app:toggle-right-sidebar": [
+    {
+      "modifiers": [
+        "Alt"
+      ],
+      "key": "r"
+    }
+  ],
+  "editor:save-file": [
+    {
+      "modifiers": [
+        "Mod"
+      ],
+      "key": "S"
+    }
+  ],
+  "editor:swap-line-down": [
+    {
+      "modifiers": [
+        "Mod"
+      ],
+      "key": "D"
+    }
+  ],
+  "editor:swap-line-up": [
+    {
+      "modifiers": [
+        "Mod"
+      ],
+      "key": "U"
+    }
+  ],
+  "editor:toggle-fold": [
+    {
+      "modifiers": [
+        "Mod"
+      ],
+      "key": "F"
+    }
+  ],
+  "editor:toggle-highlight": [],
+  "workspace:close": [],
+  "editor:delete-paragraph": [],
+  "editor:insert-link": [],
+  "app:go-back": [
+    {
+      "modifiers": [
+        "Alt"
+      ],
+      "key": "ArrowLeft"
+    }
+  ],
+  "app:go-forward": [
+    {
+      "modifiers": [
+        "Alt"
+      ],
+      "key": "ArrowRight"
+    }
+  ],
+  "switcher:open": [
+    {
+      "modifiers": [
+        "Mod"
+      ],
+      "key": "Q"
+    }
+  ],
+  "obsidian-hider:toggle-hider-status": [
+    {
+      "modifiers": [
+        "Alt"
+      ],
+      "key": "S"
+    }
+  ],
+  "obsidian-hider:toggle-app-ribbon": [
+    {
+      "modifiers": [
+        "Alt"
+      ],
+      "key": "A"
+    }
+  ],
+  "command-palette:open": [
+    {
+      "modifiers": [
+        "Mod",
+        "Shift"
+      ],
+      "key": "P"
+    }
+  ],
+  "editor:open-link-in-new-leaf": [],
+  "app:open-settings": [],
+  "editor:toggle-checklist-status": [],
+  "workspace:export-pdf": [
+    {
+      "modifiers": [
+        "Mod"
+      ],
+      "key": "P"
+    }
+  ],
+  "workspace:edit-file-title": [],
+  "editor:follow-link": [],
+  "obsidian-git:push": [
+    {
+      "modifiers": [
+        "Mod"
+      ],
+      "key": "G"
+    }
+  ],
+  "graph:open": [],
+  "editor:unfold-all": [
+    {
+      "modifiers": [
+        "Alt",
+        "Mod"
+      ],
+      "key": "F"
+    }
+  ],
+  "wikilinks-to-mdlinks-obsidian:toggle-wiki-md-links": [
+    {
+      "modifiers": [
+        "Mod"
+      ],
+      "key": "L"
+    }
+  ],
+  "editor:open-search": [],
+  "obsidian-kanban:toggle-kanban-view": [
+    {
+      "modifiers": [
+        "Alt"
+      ],
+      "key": "K"
+    }
+  ]
+}
--- a/.obsidian/plugins/cm-show-whitespace-obsidian/data.json
+++ b/.obsidian/plugins/cm-show-whitespace-obsidian/data.json
@ -0,0 +1,9 @@
+{
+  "enabled": true,
+  "showNewline": true,
+  "showTab": true,
+  "showSpace": true,
+  "showSingleSpace": true,
+  "showTrailingSpace": true,
+  "showStrictLineBreak": false
+}
--- a/.obsidian/plugins/cm-show-whitespace-obsidian/main.js
+++ b/.obsidian/plugins/cm-show-whitespace-obsidian/main.js
--- a/.obsidian/plugins/cm-show-whitespace-obsidian/manifest.json
+++ b/.obsidian/plugins/cm-show-whitespace-obsidian/manifest.json
@ -0,0 +1,10 @@
+{
+  "id": "cm-show-whitespace-obsidian",
+  "name": "Show Whitespace",
+  "author": "death_au",
+  "authorUrl": "https://github.com/deathau",
+  "description": "Show whitespace in the editor",
+  "isDesktopOnly": false,
+  "version": "0.3.1",
+  "minAppVersion": "0.10.0"
+}
--- a/.obsidian/plugins/cm-show-whitespace-obsidian/styles.css
+++ b/.obsidian/plugins/cm-show-whitespace-obsidian/styles.css
@ -0,0 +1,122 @@
+@charset "UTF-8";
+.plugin-cm-show-whitespace-settings .plugin-cm-show-whitespace-disabled {
+  opacity: 0.6;
+}
+.plugin-cm-show-whitespace-settings .plugin-cm-show-whitespace-disabled .checkbox-container {
+  cursor: not-allowed;
+  pointer-events: none;
+}
+
+body.plugin-cm-show-whitespace {
+  /* feel free to override these characters if you want ◽ */
+  --spaceChar: "°";
+  --trailingSpaceChar: "·";
+  --singleSpaceChar: var(--spaceChar);
+  --tabChar: "→";
+  --newlineChar: "¬";
+  --strictLineBreakChar: var(--newlineChar);
+}
+body.plugin-cm-show-whitespace.plugin-cm-show-whitespace-hide-space {
+  --spaceChar: "";
+}
+body.plugin-cm-show-whitespace.plugin-cm-show-whitespace-hide-tab {
+  --tabChar: "";
+}
+body.plugin-cm-show-whitespace.plugin-cm-show-whitespace-hide-newline {
+  --newlineChar: "";
+}
+body.plugin-cm-show-whitespace.plugin-cm-show-whitespace-hide-single-space {
+  --singleSpaceChar: "";
+}
+body.plugin-cm-show-whitespace.plugin-cm-show-whitespace-hide-trailing-space {
+  --trailingSpaceChar: "";
+}
+body.plugin-cm-show-whitespace.plugin-cm-show-whitespace-show-strict-line-break {
+  --strictLineBreakChar: "↲";
+}
+body.plugin-cm-show-whitespace .cm-whitespace::before,
+body.plugin-cm-show-whitespace .cm-tab::before,
+body.plugin-cm-show-whitespace .CodeMirror-code > div > pre > span > :last-child:after,
+body.plugin-cm-show-whitespace .CodeMirror-line > span > :last-child::after,
+body.plugin-cm-show-whitespace [class*=cm-trailing-space] + [class*=cm-trailing-space]:last-child::after {
+  pointer-events: none;
+  color: var(--text-tag);
+  font-weight: bolder;
+}
+body.plugin-cm-show-whitespace [class*=cm-trailing-space]::before {
+  content: var(--trailingSpaceChar);
+}
+body.plugin-cm-show-whitespace .cm-tab::before {
+  content: var(--tabChar);
+}
+body.plugin-cm-show-whitespace .CodeMirror-code > div > pre > span > :last-child:after,
+body.plugin-cm-show-whitespace .CodeMirror-line > span > :last-child::after {
+  content: var(--newlineChar);
+  position: unset;
+}
+body.plugin-cm-show-whitespace [class*=cm-trailing-space] + [class*=cm-trailing-space]:last-child::after {
+  content: var(--strictLineBreakChar);
+  position: unset;
+}
+body.plugin-cm-show-whitespace .cm-whitespace::before,
+body.plugin-cm-show-whitespace .cm-tab::before {
+  position: absolute;
+}
+body.plugin-cm-show-whitespace .cm-s-obsidian span.cm-inline-code.cm-whitespace::before {
+  line-height: 2em;
+}
+body.plugin-cm-show-whitespace .CodeMirror-code > div:last-child > pre > span::after,
+body.plugin-cm-show-whitespace .CodeMirror-code > pre:last-child > span::after {
+  display: none;
+}
+body.plugin-cm-show-whitespace .CodeMirror .cm-whitespace-1:not([class*=cm-trailing-space-])::before {
+  content: var(--singleSpaceChar);
+}
+body.plugin-cm-show-whitespace .CodeMirror .cm-whitespace-2:not([class*=cm-trailing-space-])::before {
+  content: var(--spaceChar) var(--spaceChar);
+}
+body.plugin-cm-show-whitespace .CodeMirror .cm-whitespace-3:not([class*=cm-trailing-space-])::before {
+  content: var(--spaceChar) var(--spaceChar) var(--spaceChar);
+}
+body.plugin-cm-show-whitespace .CodeMirror .cm-whitespace-4:not([class*=cm-trailing-space-])::before {
+  content: var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar);
+}
+body.plugin-cm-show-whitespace .CodeMirror .cm-whitespace-5:not([class*=cm-trailing-space-])::before {
+  content: var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar);
+}
+body.plugin-cm-show-whitespace .CodeMirror .cm-whitespace-6:not([class*=cm-trailing-space-])::before {
+  content: var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar);
+}
+body.plugin-cm-show-whitespace .CodeMirror .cm-whitespace-7:not([class*=cm-trailing-space-])::before {
+  content: var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar);
+}
+body.plugin-cm-show-whitespace .CodeMirror .cm-whitespace-8:not([class*=cm-trailing-space-])::before {
+  content: var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar);
+}
+body.plugin-cm-show-whitespace .CodeMirror .cm-whitespace-9:not([class*=cm-trailing-space-])::before {
+  content: var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar);
+}
+body.plugin-cm-show-whitespace .CodeMirror .cm-whitespace-10:not([class*=cm-trailing-space-])::before {
+  content: var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar);
+}
+body.plugin-cm-show-whitespace .CodeMirror .cm-whitespace-11:not([class*=cm-trailing-space-])::before {
+  content: var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar);
+}
+body.plugin-cm-show-whitespace .CodeMirror .cm-whitespace-12:not([class*=cm-trailing-space-])::before {
+  content: var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar);
+}
+body.plugin-cm-show-whitespace .CodeMirror .cm-whitespace-13:not([class*=cm-trailing-space-])::before {
+  content: var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar);
+}
+body.plugin-cm-show-whitespace .CodeMirror .cm-whitespace-14:not([class*=cm-trailing-space-])::before {
+  content: var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar);
+}
+body.plugin-cm-show-whitespace .CodeMirror .cm-whitespace-15:not([class*=cm-trailing-space-])::before {
+  content: var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar);
+}
+body.plugin-cm-show-whitespace .CodeMirror .cm-whitespace-16:not([class*=cm-trailing-space-])::before {
+  content: var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar) var(--spaceChar);
+}
+body.plugin-cm-show-whitespace .CodeMirror .cm-whitespace-1:last-of-type::before {
+  content: var(--trailingSpaceChar);
+}
--- a/.obsidian/plugins/obsidian-git/data.json
+++ b/.obsidian/plugins/obsidian-git/data.json
@ -0,0 +1,18 @@
+{
+  "commitMessage": "vault backup: {{date}}",
+  "commitDateFormat": "YYYY-MM-DD HH:mm:ss",
+  "autoSaveInterval": 30,
+  "autoPullInterval": 0,
+  "autoPullOnBoot": false,
+  "disablePush": false,
+  "pullBeforePush": false,
+  "disablePopups": false,
+  "listChangedFilesInMessageBody": true,
+  "showStatusBar": true,
+  "updateSubmodules": false,
+  "gitPath": "",
+  "customMessageOnAutoBackup": false,
+  "autoBackupAfterFileChange": true,
+  "currentBranch": "main",
+  "remote": "origin"
+}
--- a/.obsidian/plugins/obsidian-git/data[衝突].json
+++ b/.obsidian/plugins/obsidian-git/data[衝突].json
@ -0,0 +1,14 @@
+{
+  "commitMessage": "vault backup: {{date}}",
+  "commitDateFormat": "YYYY-MM-DD HH:mm:ss",
+  "autoSaveInterval": 30,
+  "autoPullInterval": 0,
+  "autoPullOnBoot": false,
+  "disablePush": false,
+  "pullBeforePush": false,
+  "disablePopups": false,
+  "listChangedFilesInMessageBody": false,
+  "showStatusBar": true,
+  "currentBranch": "main",
+  "remote": "origin"
+}
--- a/.obsidian/plugins/obsidian-git/main.js
+++ b/.obsidian/plugins/obsidian-git/main.js
--- a/.obsidian/plugins/obsidian-git/manifest.json
+++ b/.obsidian/plugins/obsidian-git/manifest.json
@ -0,0 +1,8 @@
+{
+    "id": "obsidian-git",
+    "name": "Obsidian Git",
+    "description": "Backup your vault with git.",
+    "isDesktopOnly": true,
+    "js": "main.js",
+    "version": "1.17.0"
+}
--- a/.obsidian/plugins/obsidian-git/styles.css
+++ b/.obsidian/plugins/obsidian-git/styles.css
@ -0,0 +1,24 @@
+@keyframes loading {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+.loading > svg {
+  animation: 2s linear infinite loading;
+  transform-origin: 50% 50%;
+  display: inline-block;
+}
+.center{
+  margin: auto;
+  width: 50%;
+}
+.tooltip.mod-left {
+  overflow-wrap: break-word;
+}
+.tooltip.mod-right {
+  overflow-wrap: break-word;
+}
--- a/.obsidian/plugins/obsidian-hider/data.json
+++ b/.obsidian/plugins/obsidian-hider/data.json
@ -0,0 +1,10 @@
+{
+  "frameless": false,
+  "hideRibbon": false,
+  "hideStatus": true,
+  "hideScroll": true,
+  "hideTooltips": true,
+  "hideSearchSuggestions": false,
+  "hideInstructions": true,
+  "hideMeta": true
+}
--- a/.obsidian/plugins/obsidian-hider/main.js
+++ b/.obsidian/plugins/obsidian-hider/main.js
--- a/.obsidian/plugins/obsidian-hider/manifest.json
+++ b/.obsidian/plugins/obsidian-hider/manifest.json
@ -0,0 +1,10 @@
+{
+	"id": "obsidian-hider",
+	"name": "Hider",
+	"version": "1.1.0",
+	"minAppVersion": "0.12.2",
+	"description": "Hide UI elements such as tooltips, status, titlebar and more",
+	"author": "@kepano",
+	"authorUrl": "https://www.twitter.com/kepano",
+	"isDesktopOnly": false
+}
--- a/.obsidian/plugins/obsidian-hider/styles.css
+++ b/.obsidian/plugins/obsidian-hider/styles.css
@ -0,0 +1,62 @@
+/* Hide ribbon */
+.hider-ribbon .workspace-ribbon.mod-left {
+  display:none;
+}
+.hider-ribbon .workspace-ribbon.mod-right {
+  visibility:hidden;
+  position:absolute;
+}
+.hider-ribbon .workspace-split.mod-right-split {
+  margin-right:0;
+}
+.hider-ribbon .workspace-split.mod-left-split {
+  margin-left:0;
+}
+
+/* Frameless */
+.hider-frameless .titlebar-button-container {
+  display:none;
+}
+.hider-frameless .titlebar,
+.hider-frameless .titlebar-inner {
+  position:fixed;
+  top:0;
+  height:12px;
+  background:transparent;
+}
+.hider-frameless {
+  padding-top:0 !important;
+}
+.hider-frameless .workspace-split.mod-left-split > .workspace-tabs {
+  padding-top:18px;
+}
+
+/* Hide meta */
+.hider-meta .frontmatter-container {
+  display:none;
+}
+
+/* Hide scrollbars */
+.hider-scroll ::-webkit-scrollbar {
+  display:none;
+}
+
+/* Hide status */
+.hider-status .status-bar {
+  display:none;
+}
+
+/* Hide tooltips */
+.hider-tooltips .tooltip {
+  display:none;
+}
+
+/* Hide search suggestions */
+.hider-search-suggestions .suggestion-container.mod-search-suggestion {
+  display: none;
+}
+
+/* Hide instructions */
+.hider-instructions .prompt-instructions {
+  display:none;
+}
--- a/.obsidian/plugins/wikilinks-to-mdlinks-obsidian/main.js
+++ b/.obsidian/plugins/wikilinks-to-mdlinks-obsidian/main.js
--- a/.obsidian/plugins/wikilinks-to-mdlinks-obsidian/manifest.json
+++ b/.obsidian/plugins/wikilinks-to-mdlinks-obsidian/manifest.json
@ -0,0 +1,10 @@
+{
+	"id": "wikilinks-to-mdlinks-obsidian",
+	"name": "Wikilinks to MDLinks",
+	"version": "0.0.12",
+	"minAppVersion": "0.9.12",
+	"description": "A plugin that converts wikilinks to markdown links and vice versa",
+	"author": "Agatha Uy",
+	"authorUrl": "https://github.com/agathauy",
+	"isDesktopOnly": false
+}
--- a/.obsidian/rtl.json
+++ b/.obsidian/rtl.json
@ -0,0 +1 @@
+{"fileDirections":{"講道筆記.md":"ltr"},"defaultDirection":"ltr","rememberPerFile":true}
--- a/.obsidian/snippets/default.css
+++ b/.obsidian/snippets/default.css
@ -0,0 +1,227 @@
+/* ============= 設定字型 ================== */
+@font-face {
+  font-family: AndleyFont;
+  unicode-range: U+0370-03FF, U+1F00-1FFF; /* Greek UNICODE */
+  src: local("SBL BibLit");
+}
+@font-face {
+  font-family: AndleyFont;
+  unicode-range: U+0590-05FF, U+FB10-FB4F; /* Hebrew UNICODE */
+  src: local("SBL BibLit");
+}
+@font-face {
+  font-family: AndleyFont;
+  unicode-range: U+00-024F; /* English UNICODE */
+  src: local("Noto Sans");
+}
+@font-face {
+  font-family: AndleyFont;
+  unicode-range: U+4E00-9FFF; /* 中文 UNICODE */
+  src: local("Noto Sans CJK TC");
+}
+/* ============= 設定字型 ================== */
+@font-face {
+  font-family: InterlinearFont;
+  unicode-range: U+0370-03FF, U+1F00-1FFF; /* Greek UNICODE */
+  src: local("SBL BibLit");
+}
+@font-face {
+  font-family: InterlinearFont;
+  unicode-range: U+0590-05FF, U+FB10-FB4F; /* Hebrew UNICODE */
+  src: local("SBL BibLit");
+}
+@font-face {
+  font-family: InterlinearFont;
+  unicode-range: U+00-024F; /* English UNICODE */
+  src: local("Arial Narrow");
+}
+@font-face {
+  font-family: InterlinearFont;
+  unicode-range: U+4E00-9FFF; /* 中文 UNICODE */
+  src: local("新細明體");
+}
+
+
+/* ============= 銀幕顯示 設定 ============= */
+/* Obsidian 介面 */
+.theme-dark {
+  --text-tag: #3b7da8;
+  --text-muted: #D3D3D3;
+  --text-faint: gold;
+  --text-selection: DarkSlateBlue;
+  --text-accent: greenyellow;
+  --text-link: #a3be8c;
+  --color1:#ea4335;
+  --color2:#4285f4;
+  --color3:#34a853;
+  --color4:#ff8a00;
+  --background-primary: black;
+
+}
+.theme-light {
+  --text-tag: rgb(128, 136, 240);
+  --text-normal:black;
+  --text-faint: blue;
+  --text-accent: red;
+  --background-primary: white;
+  --color1:darkred;
+  --color2:darkblue;
+  --color3:darkgreen;
+  --color4:darkmagenta;
+}
+
+
+/* 標題顏色 */
+.titlebar-inner {
+  color: var(--text-faint);;
+  background-color: darkslategrey;
+}
+
+.workspace-leaf.mod-active .view-header-title {
+  color: var(--text-accent);
+}
+
+/* 粗體、斜體 in preview and editor */
+
+strong, .cm-strong {
+  color: var(--text-accent);
+  font-weight: bolder;
+}
+em, .cm-em {
+  color: var(--text-faint);
+  font-weight: bold;
+}
+a {
+  color: var(--text-link);
+}
+
+
+/* tags in preview and editor */
+.cm-s-obsidian span.cm-tag {
+  color: var(--text-tag);
+}
+
+/* 標題 */
+.cm-header-1, .markdown-preview-view h1 {
+  color: var(--color1);
+  font-size:26px; /* 20pt 字體大小*/
+  text-align: center;
+  border-bottom: 4px double ;
+  font-family: "Noto Sans Black", "Noto Sans CJK TC Black";
+}
+.cm-header-2,.markdown-preview-view h2 {
+  color: var(--color2);
+  font-size:24px; /* 18pt 字體大小*/
+  text-align: center;
+  font-family: "Noto Sans Black", "Noto Sans CJK TC Black";
+}
+.cm-header-3,.markdown-preview-view h3 {
+  color: var(--color3);
+  font-size:22px; /* 16pt 字體大小*/
+  font-family: "Noto Sans Black", "Noto Sans CJK TC Black";
+}
+.cm-header-4,.markdown-preview-view h4 {
+  color: var(--color4);
+  font-size:19px; /* 14pt 字體大小*/
+  text-indent: 10px;
+  font-family: "Noto Sans Black", "Noto Sans CJK TC Black";
+}
+.cm-header-5,.markdown-preview-view h5 {
+  color: var(--color5);
+  font-size:16px; /* 12pt 字體大小*/
+  text-indent: 20px;
+  font-family: "Noto Sans Black", "Noto Sans CJK TC Black";
+}
+.cm-header-6,.markdown-preview-view h6 {
+  color: var(--color6);
+  font-size:16px; /* 12pt 字體大小*/
+  font-family: "Noto Sans Black", "Noto Sans CJK TC Black";
+}
+
+/***************************************/
+/*                 Table               */
+/***************************************/
+.markdown-preview-view th {
+  border: 1px solid;
+  border-bottom: 4px double;
+  font-weight: 800;
+  padding: 5px 5px;
+}
+
+.markdown-preview-view td {
+  border: 1px solid;
+  padding: 3px 5px;
+}
+
+/***************************************/
+/*           Ruby Interlinear          */
+/***************************************/
+  /* -------- 銀幕 Interlinear 經文段落---------- */
+  ruby {
+    display: inline-flex;
+    flex-direction: column-reverse ;
+    align-items: center;
+    font-size: 16px ; /* 12pt 字體大小*/
+    line-height: 14px ;
+    padding-bottom: 10px ;
+    font-family: AndleyFont;
+  }
+  rt {
+    font-size: 13px ; /* 10pt 字體大小*/
+    line-height: 13px ;
+    font-family: InterlinearFont;
+  }
+
+  ul ruby {
+    padding-bottom: 5px !important;
+
+  }
+  
+  body {
+    font-family: AndleyFont;
+  }
+
+.nav-file-title, .nav-folder-title {
+  display: flex;
+  border: 1px solid transparent;
+  border-radius: 3px;
+  cursor: pointer;
+  color: var(--text-muted);
+  font-size: 13px;
+  line-height: 14px;
+  padding: 1px 10px 0 26px;
+  white-space: nowrap;
+  width: max-content;
+  min-width: 100%;
+}
+
+.cm-hmd-list-indent .cm-tab, ul ul { position: relative; }
+.cm-hmd-list-indent .cm-tab::before, ul ul::before {
+ content:'';
+ border-left: 1px solid grey;
+ position: absolute;
+}
+.cm-hmd-list-indent .cm-tab::before { left: 0; top: -5px; bottom: -4px; 
+}
+ul ul::before { left: -15px; top: 0; bottom: 0; 
+} 
+
+/* cursor */
+.CodeMirror-cursor { 
+  border-left-width: 0.12em;
+  opacity: 1;
+} 
+
+.markdown-source-view, .CodeMirror-selected, .markdown-preview-view {
+  max-width: 850px;
+  margin: auto;
+  }
+
+.markdown-preview-view code {
+    color: #c7254e;
+    font-weight: 800;
+    background-color: lightgrey;
+    border-radius: 4px;
+    padding: 1px 4px;
+}
+
--- a/.obsidian/snippets/margin-narrow.css
+++ b/.obsidian/snippets/margin-narrow.css
@ -0,0 +1,24 @@
+/* ============= 列印 PDF 設定 ============= */
+@page {
+  size: A4 portrait;
+  margin-top: 1cm;
+  margin-bottom: 1cm;
+  margin-left: 0cm;
+  margin-right: -0.5cm;
+}
+
+@media print {
+  /* -------- 列印強調 ---------- */
+  h1, h2, h3, h4, h5, h6 {
+    color: black !important;
+  }
+  /*a {
+    color: green !important;
+  }*/
+  strong {
+    color: red !important;
+  }
+  em {
+    color: blue !important;
+  }
+}
--- a/.obsidian/snippets/margin-wide.css
+++ b/.obsidian/snippets/margin-wide.css
@ -0,0 +1,24 @@
+/* ============= 列印 PDF 設定 ============= */
+@page {
+  size: A4 portrait;
+  margin-top: 2cm;
+  margin-bottom: 2cm;
+  margin-left: 2cm;
+  margin-right: 2cm;
+}
+
+@media print {
+  /* -------- 列印強調 ---------- */
+  h1, h2, h3, h4, h5, h6 {
+    color: black !important;
+  }
+  a {
+    color: green !important;
+  }
+  strong {
+    color: red !important;
+  }
+  em {
+    color: blue !important;
+  }
+}
--- a/.obsidian/starred.json
+++ b/.obsidian/starred.json
@ -0,0 +1,29 @@
+{
+  "items": [
+    {
+      "type": "file",
+      "title": "cheatsheet",
+      "path": "cheatsheet.md"
+    },
+    {
+      "type": "file",
+      "title": "§0",
+      "path": "Syntax/BG4E-Syntax.md"
+    },
+    {
+      "type": "file",
+      "title": "GGBB",
+      "path": "GGBB/GGBB.md"
+    },
+    {
+      "type": "file",
+      "title": "IGNT",
+      "path": "IGNT/IGNT.md"
+    },
+    {
+      "type": "file",
+      "title": "Phrasing-Signs",
+      "path": "50-Philippians/Phrasing-Signs.md"
+    }
+  ]
+}
--- a/.obsidian/templates.json
+++ b/.obsidian/templates.json
@ -0,0 +1 @@
+{"folder":"template/"}
--- a/.obsidian/workspace
+++ b/.obsidian/workspace
@ -0,0 +1,114 @@
+{
+  "main": {
+    "id": "7f95a67d9bc40b3d",
+    "type": "split",
+    "children": [
+      {
+        "id": "1bc549648d22455f",
+        "type": "leaf",
+        "state": {
+          "type": "markdown",
+          "state": {
+            "file": "62-1John/1John-Notes.md",
+            "mode": "preview"
+          }
+        }
+      }
+    ],
+    "direction": "vertical"
+  },
+  "left": {
+    "id": "7b563e12ae0cae53",
+    "type": "split",
+    "children": [
+      {
+        "id": "c98538fa04898bd1",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "034ea96b33b01929",
+            "type": "leaf",
+            "state": {
+              "type": "file-explorer",
+              "state": {}
+            }
+          },
+          {
+            "id": "ec1a8d74544268f0",
+            "type": "leaf",
+            "state": {
+              "type": "search",
+              "state": {
+                "query": "",
+                "matchingCase": false,
+                "explainSearch": false,
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical"
+              }
+            }
+          },
+          {
+            "id": "0de4355dac87d789",
+            "type": "leaf",
+            "state": {
+              "type": "starred",
+              "state": {}
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "horizontal",
+    "width": 241.99999809265137
+  },
+  "right": {
+    "id": "2ebe4ede22a17df3",
+    "type": "split",
+    "children": [
+      {
+        "id": "10b4dacb7f572639",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "90e8417d3d35b228",
+            "type": "leaf",
+            "state": {
+              "type": "tag",
+              "state": {
+                "sortOrder": "frequency",
+                "useHierarchy": true
+              }
+            }
+          },
+          {
+            "id": "a5739e966aa3079b",
+            "type": "leaf",
+            "state": {
+              "type": "outline",
+              "state": {
+                "file": "62-1John/1John-Notes.md"
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "horizontal",
+    "width": 300,
+    "collapsed": true
+  },
+  "active": "1bc549648d22455f",
+  "lastOpenFiles": [
+    "62-1John/1John-Notes.md",
+    "README.md",
+    "Memorize.md",
+    "50-Philippians/Philippians-TC-Interlinear.md",
+    "50-Philippians/Philippians-Notes.md",
+    "50-Philippians/Philippians-Interlinear.md",
+    "50-Philippians/Php.3.12-16.md",
+    "50-Philippians/Php.3.1-11.md",
+    "50-Philippians/Phrasing-Signs.md",
+    "64-3John/3John-Notes.md"
+  ]
+}
--- a/.obsidian/workspaces.json
+++ b/.obsidian/workspaces.json
@ -0,0 +1,261 @@
+{
+  "workspaces": {
+    "2Sync": {
+      "main": {
+        "id": "3969f3923e6cfedb",
+        "type": "split",
+        "children": [
+          {
+            "id": "1a81d9f000627cca",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "62-1John/1Jo.3.19–24.md",
+                "mode": "source"
+              }
+            },
+            "group": "98d95b26b4414933"
+          },
+          {
+            "id": "e4c58faa39706a81",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "62-1John/1Jo.3.19–24.md",
+                "mode": "preview"
+              }
+            },
+            "group": "98d95b26b4414933"
+          }
+        ],
+        "direction": "vertical"
+      },
+      "left": {
+        "id": "2b1e149eb78e8515",
+        "type": "split",
+        "children": [
+          {
+            "id": "fb89deb39da52857",
+            "type": "tabs",
+            "children": [
+              {
+                "id": "75b75d906b38f1fb",
+                "type": "leaf",
+                "state": {
+                  "type": "file-explorer",
+                  "state": {}
+                }
+              },
+              {
+                "id": "8b1314860610141a",
+                "type": "leaf",
+                "state": {
+                  "type": "search",
+                  "state": {
+                    "query": "",
+                    "matchingCase": false,
+                    "explainSearch": false,
+                    "collapseAll": false,
+                    "extraContext": false,
+                    "sortOrder": "alphabetical"
+                  }
+                }
+              },
+              {
+                "id": "47f03e690283089d",
+                "type": "leaf",
+                "state": {
+                  "type": "starred",
+                  "state": {}
+                }
+              }
+            ]
+          }
+        ],
+        "direction": "horizontal",
+        "width": 267
+      },
+      "right": {
+        "id": "1464b72f66019d33",
+        "type": "split",
+        "children": [
+          {
+            "id": "d0f62b3dd05030d0",
+            "type": "tabs",
+            "children": [
+              {
+                "id": "8c60c8158acd8037",
+                "type": "leaf",
+                "state": {
+                  "type": "outline",
+                  "state": {
+                    "file": "62-1John/1Jo.3.19–24.md"
+                  }
+                }
+              }
+            ]
+          }
+        ],
+        "direction": "horizontal",
+        "width": 183.0555419921875,
+        "collapsed": true
+      },
+      "active": "e4c58faa39706a81"
+    },
+    "3Sync": {
+      "main": {
+        "id": "f4afcf6a714c05fb",
+        "type": "split",
+        "children": [
+          {
+            "id": "1c93e914d62e8f8c",
+            "type": "split",
+            "dimension": 53.70030581039755,
+            "children": [
+              {
+                "id": "97520d08ae64c5d1",
+                "type": "leaf",
+                "dimension": 51.3235294117647,
+                "state": {
+                  "type": "markdown",
+                  "state": {
+                    "file": "50-Philippians/Php.1.3–11.md",
+                    "mode": "source"
+                  }
+                },
+                "group": "b296ff829cc1189d"
+              },
+              {
+                "id": "a3fe0d61e678dae7",
+                "type": "leaf",
+                "dimension": 48.67647058823529,
+                "state": {
+                  "type": "markdown",
+                  "state": {
+                    "file": "50-Philippians/Php.1.3–11.md",
+                    "mode": "source"
+                  }
+                }
+              }
+            ],
+            "direction": "horizontal"
+          },
+          {
+            "id": "ca98a89fbf86f418",
+            "type": "leaf",
+            "dimension": 46.29969418960245,
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "50-Philippians/Php.1.3–11.md",
+                "mode": "preview"
+              }
+            },
+            "group": "b296ff829cc1189d"
+          }
+        ],
+        "direction": "vertical"
+      },
+      "left": {
+        "id": "2b1e149eb78e8515",
+        "type": "split",
+        "children": [
+          {
+            "id": "fb89deb39da52857",
+            "type": "tabs",
+            "children": [
+              {
+                "id": "75b75d906b38f1fb",
+                "type": "leaf",
+                "state": {
+                  "type": "file-explorer",
+                  "state": {}
+                }
+              },
+              {
+                "id": "8b1314860610141a",
+                "type": "leaf",
+                "state": {
+                  "type": "search",
+                  "state": {
+                    "query": "",
+                    "matchingCase": false,
+                    "explainSearch": false,
+                    "collapseAll": false,
+                    "extraContext": false,
+                    "sortOrder": "alphabetical"
+                  }
+                }
+              },
+              {
+                "id": "47f03e690283089d",
+                "type": "leaf",
+                "state": {
+                  "type": "starred",
+                  "state": {}
+                }
+              }
+            ]
+          }
+        ],
+        "direction": "horizontal",
+        "width": 267,
+        "collapsed": true
+      },
+      "right": {
+        "id": "1464b72f66019d33",
+        "type": "split",
+        "children": [
+          {
+            "id": "d0f62b3dd05030d0",
+            "type": "tabs",
+            "children": [
+              {
+                "id": "fc461d726b9ae279",
+                "type": "leaf",
+                "state": {
+                  "type": "empty",
+                  "state": {}
+                }
+              },
+              {
+                "id": "cf8452731348166c",
+                "type": "leaf",
+                "state": {
+                  "type": "empty",
+                  "state": {}
+                }
+              },
+              {
+                "id": "cbd6c34411c8328e",
+                "type": "leaf",
+                "state": {
+                  "type": "empty",
+                  "state": {}
+                }
+              },
+              {
+                "id": "8c60c8158acd8037",
+                "type": "leaf",
+                "state": {
+                  "type": "outline",
+                  "state": {
+                    "file": "50-Philippians/Php.1.3–11.md"
+                  }
+                }
+              }
+            ],
+            "currentTab": 3
+          }
+        ],
+        "direction": "horizontal",
+        "width": 183.0555419921875,
+        "collapsed": true
+      },
+      "active": "97520d08ae64c5d1"
+    }
+  },
+  "active": "2Sync"
+}
--- a/62-1John/1John-Notes.md
+++ b/62-1John/1John-Notes.md
@ -6,8 +6,7 @@
 Interlinear 經文出自 [STEP Bible](http://www.stepbible.org/) 的 [TAGNT (Translators Amalgamated Greek NT)](https://github.com/STEPBible/STEPBible-Data)


- [約翰一書 Interlinear)](1John-Interlinear.md)
- [約翰一書 Interlinear (DOCX 格式)](1John.docx)
+- [約翰一書 Interlinear](1John-Interlinear.md)


 ### 原文特色
@ -52,8 +51,8 @@ Interlinear 經文出自 [STEP Bible](http://www.stepbible.org/) 的 [TAGNT (Tra

 |  縮寫  | 出處                                                                                                                                                                                                                                   |
 |:------:| -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| W ‖ 華 | Wallace, Daniel B. <em>Greek Grammar Beyond the Basics</em>. Grand Rapids: Zondervan, 1996. = 華勒斯(Daniel B. Wallace)。《中級希臘文文法》。吳存仁譯。台北市：中華福音神學院，2011。                                                         |
-| P ‖ 波 | Porter, Stanley E. <em>Idioms of the Greek New Testament</em>. Second edition with corrections. Sheffield, U.K.: Sheffield Academic, 1994. = 斯丹利‧波特(Stanley E. Porter)。《新約希臘文的慣用語》。葉雅蓮譯。台北市：中華福音神學院，2013。 |
+| W</br>華 | Wallace, Daniel B. <em>Greek Grammar Beyond the Basics</em>. Grand Rapids: Zondervan, 1996. = 華勒斯(Daniel B. Wallace)。《中級希臘文文法》。吳存仁譯。台北市：中華福音神學院，2011。                                                         |
+| P</br>波 | Porter, Stanley E. <em>Idioms of the Greek New Testament</em>. Second edition with corrections. Sheffield, U.K.: Sheffield Academic, 1994. = 斯丹利‧波特(Stanley E. Porter)。《新約希臘文的慣用語》。葉雅蓮譯。台北市：中華福音神學院，2013。 |
 |   M    | Mathewson, David L., and Elodie Ballantine Emig. <em>Intermediate Greek Grammar: Syntax for Students of the New Testament</em>. Grand Rapids, MI: Baker Academic, 2016.                                                                       |
 |   R    | Runge, Steven E. <em>Discourse Grammar of the Greek New Testament: A Practical Introduction for Teaching and Exegesis</em>. Peabody, MA.: Hendrickson, 2010.                                                                                  |
				`@ -0,0 +1 @@`
				`{"baseFontSize":16,"enabledPlugins":[],"pluginEnabledStatus":{"file-explorer":true,"global-search":true,"switcher":true,"graph":true,"backlink":true,"page-preview":true,"command-palette":true,"markdown-importer":true,"word-count":true,"open-with-default-app":true,"file-recovery":true},"enabledCssSnippets":["BG4E"]}`
				`@ -0,0 +1 @@`
				`{"fileDirections":{"講道筆記.md":"ltr"},"defaultDirection":"ltr","rememberPerFile":true}`