From: <mi...@us...> - 2013-08-21 21:49:17
|
Revision: 7715 http://sourceforge.net/p/docutils/code/7715 Author: milde Date: 2013-08-21 21:49:14 +0000 (Wed, 21 Aug 2013) Log Message: ----------- Simplify visit_inline code. Modified Paths: -------------- trunk/docutils/docutils/writers/latex2e/__init__.py trunk/docutils/test/functional/expected/standalone_rst_latex.tex trunk/docutils/test/functional/expected/standalone_rst_xetex.tex Modified: trunk/docutils/docutils/writers/latex2e/__init__.py =================================================================== --- trunk/docutils/docutils/writers/latex2e/__init__.py 2013-08-04 09:12:16 UTC (rev 7714) +++ trunk/docutils/docutils/writers/latex2e/__init__.py 2013-08-21 21:49:14 UTC (rev 7715) @@ -2339,27 +2339,18 @@ self.out += self.ids_to_labels(node) + ['\n'] def visit_inline(self, node): # <span>, i.e. custom roles - # Make a copy to keep ``node['classes']`` True if a - # language argument is popped (used in conditional calls of - # depart_inline()): - classes = node['classes'][:] - self.context.append('}' * len(classes)) - # handle language specification: - language_tags = [cls for cls in classes - if cls.startswith('language-')] - if language_tags: - language = self.babel.language_name(language_tags[0][9:]) - if language: - self.babel.otherlanguages[language] = True - self.out.append(r'\foreignlanguage{%s}{' % language) - classes.pop(classes.index(language_tags[0])) - if not classes: - return - # mark up for styling with custom macros - if 'align-center' in classes: - self.fallbacks['align-center'] = PreambleCmds.align_center - self.fallbacks['inline'] = PreambleCmds.inline - self.out += [r'\DUrole{%s}{' % cls for cls in classes] + self.context.append('}' * len(node['classes'])) + for cls in node['classes']: + if cls == 'align-center': + self.fallbacks['align-center'] = PreambleCmds.align_center + if cls.startswith('language-'): + language = self.babel.language_name(cls[9:]) + if language: + self.babel.otherlanguages[language] = True + self.out.append(r'\foreignlanguage{%s}{' % language) + else: + self.fallbacks['inline'] = PreambleCmds.inline + self.out.append(r'\DUrole{%s}{' % cls) def depart_inline(self, node): self.out.append(self.context.pop()) Modified: trunk/docutils/test/functional/expected/standalone_rst_latex.tex =================================================================== --- trunk/docutils/test/functional/expected/standalone_rst_latex.tex 2013-08-04 09:12:16 UTC (rev 7714) +++ trunk/docutils/test/functional/expected/standalone_rst_latex.tex 2013-08-21 21:49:14 UTC (rev 7715) @@ -1532,7 +1532,7 @@ } \end{quote} -\foreignlanguage{british}{\DUrole{green}{\DUrole{sc}{British colourful text in small-caps}}}. +\DUrole{green}{\DUrole{sc}{\foreignlanguage{british}{British colourful text in small-caps}}}. \end{itemize} Modified: trunk/docutils/test/functional/expected/standalone_rst_xetex.tex =================================================================== --- trunk/docutils/test/functional/expected/standalone_rst_xetex.tex 2013-08-04 09:12:16 UTC (rev 7714) +++ trunk/docutils/test/functional/expected/standalone_rst_xetex.tex 2013-08-21 21:49:14 UTC (rev 7715) @@ -1531,7 +1531,7 @@ } \end{quote} -\foreignlanguage{british}{\DUrole{green}{\DUrole{sc}{British colourful text in small-caps}}}. +\DUrole{green}{\DUrole{sc}{\foreignlanguage{british}{British colourful text in small-caps}}}. \end{itemize} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |