diff --git a/yomi_base/reader_util.py b/yomi_base/reader_util.py index 813d73e..014263f 100644 --- a/yomi_base/reader_util.py +++ b/yomi_base/reader_util.py @@ -172,27 +172,27 @@ def buildEmpty(): def buildVocabDef(definition, index, query): reading = unicode() if definition['reading']: - reading = u'[{0}]
'.format(definition['reading']) + reading = u'[{0}]
'.format(definition['reading']) rules = unicode() if definition.get('rules'): rules = ' < '.join(definition['rules']) - rules = '({0})
'.format(rules) + rules = '({0})
'.format(rules) - links = ''.format(index) + links = ''.format(index) if query is not None: if query('vocab', markupVocabExp(definition)): - links += ''.format(index) + links += ''.format(index) if query('vocab', markupVocabReading(definition)): - links += ''.format(index) + links += ''.format(index) html = u""" - {0} - {1}
+ {0} + {1}
{2} - {3}
+ {3}
{4} -
""".format(links, definition['expression'], reading, definition['glossary'], rules) +
""".format(links, definition['expression'], reading, definition['glossary'], rules) return html @@ -209,17 +209,17 @@ def buildVocabDefs(definitions, query): def buildKanjiDef(definition, index, query): - links = ''.format(index) + links = ''.format(index) if query is not None and query('kanji', markupKanji(definition)): - links += ''.format(index) + links += ''.format(index) readings = ', '.join([definition['kunyomi'], definition['onyomi']]) html = u""" - {0} - {1}
- [{2}]
- {3}
-
""".format(links, definition['character'], readings, definition['glossary']) + {0} + {1}
+ [{2}]
+ {3}
+
""".format(links, definition['character'], readings, definition['glossary']) return html