raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handling for some extra characters.

This commit is contained in:
Mattias Põldaru 2012-06-25 11:08:53 +03:00
parent 25dc4fe36c
commit bfeef67048
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
openlp/plugins/songs/lib/__init__.py
View File

@ -441,7 +441,13 @@ class StripRtf():
SPECIALCHARS = { SPECIALCHARS = {
u'par': u'\n', u'par': u'\n',
u'sect': u'\n\n', u'sect': u'\n\n',
# Required page and column break.
# Would be good if we could split verse into subverses here.
u'page': u'\n\n', u'page': u'\n\n',
u'column': u'\n\n',
# Soft breaks.
u'softpage': u'[---]',
u'softcol': u'[---]',
u'line': u'\n', u'line': u'\n',
u'tab': u'\t', u'tab': u'\t',
u'emdash': u'\u2014', u'emdash': u'\u2014',
@ -453,7 +459,11 @@ class StripRtf():
u'lquote': u'\u2018', u'lquote': u'\u2018',
u'rquote': u'\u2019', u'rquote': u'\u2019',
u'ldblquote': u'\u201C', u'ldblquote': u'\u201C',
u'rdblquote': u'\u201D'} u'rdblquote': u'\u201D',
u'ltrmark': u'\u200E',
u'rtlmark': u'\u200F',
u'zwj': u'\u200D',
u'zwnj': u'\u200C'}
CHARSET_MAPPING = { CHARSET_MAPPING = {
u'fcharset0': u'cp1252', u'fcharset0': u'cp1252',
u'fcharset1': None, u'fcharset1': None,
@ -506,12 +516,14 @@ class StripRtf():
# \x (not a letter) # \x (not a letter)
elif char: elif char:
curskip = 0 curskip = 0
if char == u'~': if char == u'~' and not ignorable:
if not ignorable: out.append(u'\xA0')
out.append(u'\xA0') elif char in u'{}\\' and not ignorable:
elif char in u'{}\\': out.append(char)
if not ignorable: elif char == u'-' and not ignorable:
out.append(char) out.append(u'\u00AD')
elif char == u'_' and not ignorable:
out.append(u'\u2011')
elif char == u'*': elif char == u'*':
ignorable = True ignorable = True
# \command # \command
@ -546,6 +558,7 @@ class StripRtf():
u"dictionary in " u"dictionary in "
u"openlp/plugins/songs/lib/__init__.py" u"openlp/plugins/songs/lib/__init__.py"
% charset_reference) % charset_reference)
# This makes ansicpg always override fcharset if present.
if font not in font_table: if font not in font_table:
font_table[font] = charset font_table[font] = charset
# \'xx # \'xx