Merge branch 'master' of https://github.com/dindom999/geeknote into 2.0.14

Author: jeffkowalski

geeknote/config.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-ALWAYS_USE_YINXIANG = False  # for 印象笔记 (Yìnxiàng bǐjì), set to True
+ALWAYS_USE_YINXIANG = True
 
 # !!! DO NOT EDIT !!! >>>
 if ALWAYS_USE_YINXIANG or os.getenv("GEEKNOTE_BASE") == "yinxiang":

geeknote/editor.py

@@ -32,7 +32,8 @@ class Editor(object):
     @staticmethod
     def getHtmlEscapeTable():
         return {'"': """,
-                "'": "'"}
+                "'": "'",
+                '\n': "<br />"}
 
     @staticmethod
     def getHtmlUnescapeTable():
@@ -223,6 +224,10 @@ def textToENML(content, raise_ex=False, format='markdown', rawmd=False):
                 storage = Storage()
                 extras = storage.getUserprop('markdown2_extras')
 
+                if not rawmd:
+                storage = Storage()
+                extras = storage.getUserprop('markdown2_extras')
+
                 if not rawmd:
                     content = Editor.HTMLEscapeTag(content)