Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finished WYSIWYG editing notes

Browse Source 
svn: r19699
This commit is contained in:
Doug Blank 2012-05-29 15:54:56 +00:00
parent a1b06272e2
commit 554e925944
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/webapp/utils.py
View File

@ -772,7 +772,7 @@ class StyledNoteFormatter(object):
if not text: if not text:
return '' return ''
s_tags = styledtext.get_tags() s_tags = styledtext.get_tags()
markuptext = self._backend.add_markup_from_styled(text, s_tags, split='\n').replace("\n\n", "<p/>").replace("\n", "<br/>") markuptext = self._backend.add_markup_from_styled(text, s_tags, split='\n').replace("\n\n", "<p></p>").replace("\n", "<br/>")
return markuptext return markuptext
def build_link(self, prop, handle, obj_class): def build_link(self, prop, handle, obj_class):
@ -820,10 +820,24 @@ class WebAppParser(HTMLParser):
return self.__stack.pop() return self.__stack.pop()
def handle_starttag(self, tag, attrs): def handle_starttag(self, tag, attrs):
if tag == "br":
self.__text += "\n"
return
self.push(len(self.__text), tag.lower(), attrs) self.push(len(self.__text), tag.lower(), attrs)
def handle_startstoptag(self, tag, attrs):
if tag == "br":
self.__text += "\n"
return
elif tag == "p":
self.__text += "\n\n"
return
else:
print "Unhandled start/stop tag '%s'" % tag
def handle_endtag(self, tag): def handle_endtag(self, tag):
tag = tag.lower() tag = tag.lower()
if tag in ["br"]: return
(start_pos, start_tag, attrs) = self.pop() (start_pos, start_tag, attrs) = self.pop()
attrs = {x[0]: x[1] for x in attrs} attrs = {x[0]: x[1] for x in attrs}
if tag != start_tag: return # skip <i><b></i></b> formats if tag != start_tag: return # skip <i><b></i></b> formats
@ -867,14 +881,11 @@ class WebAppParser(HTMLParser):
tagtype = self.UNDERLINE tagtype = self.UNDERLINE
elif tag == "sup": elif tag == "sup":
tagtype = self.SUPERSCRIPT tagtype = self.SUPERSCRIPT
elif tag == "br":
self.__text += "\n"
return
elif tag == "p": elif tag == "p":
self.__text += "\n\n" self.__text += "\n\n"
return return
elif tag == "div": elif tag == "div":
self.__text += "\n\n" self.__text += "\n"
return return
elif tag == "a": elif tag == "a":
tagtype = self.LINK tagtype = self.LINK