copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[sgala]Do not depend on docutils if we don't use rst xhtml generator. See #316

Browse source
This commit is contained in:
Yann Leboulanger 2006-10-04 11:53:03 +00:00
parent d55e56f0b9
commit 53f8b119bc
3 changed files with 84 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/chat_control.py
View file

@ -547,7 +547,7 @@ class ChatControlBase(MessageControl):
end = True end = True
textview.print_conversation_line(text, jid, kind, name, tim, textview.print_conversation_line(text, jid, kind, name, tim,
other_tags_for_name, other_tags_for_time, other_tags_for_text, other_tags_for_name, other_tags_for_time, other_tags_for_text,
subject, old_kind, xhtml) subject, old_kind, xhtml = xhtml)
if not count_as_new: if not count_as_new:
return return
@ -1254,7 +1254,9 @@ class ChatControl(ChatControlBase):
kind = 'outgoing' kind = 'outgoing'
name = gajim.nicks[self.account] name = gajim.nicks[self.account]
if not xhtml and not encrypted and gajim.config.get('rst_formatting_outgoing_messages'): if not xhtml and not encrypted and gajim.config.get('rst_formatting_outgoing_messages'):
xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, create_xhtml(text)) xhtml = create_xhtml(text)
if xhtml:
xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml)
ChatControlBase.print_conversation_line(self, text, kind, name, tim, ChatControlBase.print_conversation_line(self, text, kind, name, tim,
subject = subject, old_kind = self.old_msg_kind, xhtml = xhtml) subject = subject, old_kind = self.old_msg_kind, xhtml = xhtml)
if text.startswith('/me ') or text.startswith('/me\n'): if text.startswith('/me ') or text.startswith('/me\n'):

2
src/common/connection.py
View file

@ -678,7 +678,7 @@ class Connection(ConnectionHandlers):
user_nick = None, xhtml = None): user_nick = None, xhtml = None):
if not self.connection: if not self.connection:
return return
if not xhtml and gajim.config.get('rst_formatting_outgoing_messages'): if msg and not xhtml and gajim.config.get('rst_formatting_outgoing_messages'):
xhtml = create_xhtml(msg) xhtml = create_xhtml(msg)
if not msg and chatstate is None: if not msg and chatstate is None:
return return

26
src/rst_xhtml_generator.py
View file

@ -14,10 +14,16 @@
## GNU General Public License for more details. ## GNU General Public License for more details.
## ##
try:
from docutils import io from docutils import io
from docutils.core import Publisher from docutils.core import Publisher
from docutils.parsers.rst import roles from docutils.parsers.rst import roles
from docutils import nodes,utils
from docutils.parsers.rst.roles import set_classes
except:
def create_xhtml(text):
return None
else:
def jep_reference_role(role, rawtext, text, lineno, inliner, def jep_reference_role(role, rawtext, text, lineno, inliner,
options={}, content=[]): options={}, content=[]):
'''Role to make handy references to Jabber Enhancement Proposals (JEP). '''Role to make handy references to Jabber Enhancement Proposals (JEP).
@ -25,8 +31,6 @@ def jep_reference_role(role, rawtext, text, lineno, inliner,
Use as :JEP:`71` (or jep, or jep-reference). Use as :JEP:`71` (or jep, or jep-reference).
Modeled after the sample in docutils documentation. Modeled after the sample in docutils documentation.
''' '''
from docutils import nodes,utils
from docutils.parsers.rst.roles import set_classes
jep_base_url = 'http://www.jabber.org/jeps/' jep_base_url = 'http://www.jabber.org/jeps/'
jep_url = 'jep-%04d.html' jep_url = 'jep-%04d.html'
@ -68,12 +72,15 @@ class HTMLGenerator:
self.pub.set_components(reader_name='standalone', self.pub.set_components(reader_name='standalone',
parser_name='restructuredtext', parser_name='restructuredtext',
writer_name='html') writer_name='html')
#hack: JEP-0071 does not allow HTML char entities, so we hack our way out of it. # hack: JEP-0071 does not allow HTML char entities, so we hack our way
# out of it.
# &mdash; == u"\u2014" # &mdash; == u"\u2014"
# a setting to only emit charater entities in the writer would be nice # a setting to only emit charater entities in the writer would be nice
# FIXME: several &nbsp; are emitted, and they are explicitly forbidden in the JEP # FIXME: several &nbsp; are emitted, and they are explicitly forbidden
# in the JEP
# &nbsp; == u"\u00a0" # &nbsp; == u"\u00a0"
self.pub.writer.translator_class.attribution_formats['dash'] = (u'\u2014', '') self.pub.writer.translator_class.attribution_formats['dash'] = (
u'\u2014', '')
self.pub.process_programmatic_settings(settings_spec, self.pub.process_programmatic_settings(settings_spec,
settings_overrides, settings_overrides,
config_section) config_section)
@ -89,14 +96,17 @@ class HTMLGenerator:
self.pub.set_source(text, None) self.pub.set_source(text, None)
self.pub.set_destination(destination, destination_path) self.pub.set_destination(destination, destination_path)
output = self.pub.publish(enable_exit_status=enable_exit_status) output = self.pub.publish(enable_exit_status=enable_exit_status)
#kludge until we can get docutils to stop generating (rare) &nbsp; entities # kludge until we can get docutils to stop generating (rare) &nbsp;
return u'\u00a0'.join(self.pub.writer.parts['fragment'].strip().split('&nbsp;')) # entities
return u'\u00a0'.join(self.pub.writer.parts['fragment'].strip().split(
'&nbsp;'))
Generator = HTMLGenerator() Generator = HTMLGenerator()
def create_xhtml(text): def create_xhtml(text):
return Generator.create_xhtml(text) return Generator.create_xhtml(text)
if __name__ == '__main__': if __name__ == '__main__':
print Generator.create_xhtml(''' print Generator.create_xhtml('''
test:: test::