From a83c378a886af18638a39b8c1a711e044aa7fdb8 Mon Sep 17 00:00:00 2001 From: grubert Date: Mon, 25 Apr 2011 11:34:38 +0000 Subject: [PATCH] more BUG 1830380 (falling back on english rolenames) messages git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@7015 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- docutils/parsers/rst/directives/misc.py | 2 ++ docutils/parsers/rst/states.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docutils/parsers/rst/directives/misc.py b/docutils/parsers/rst/directives/misc.py index b074ff8f1..b94d6a73e 100644 --- a/docutils/parsers/rst/directives/misc.py +++ b/docutils/parsers/rst/directives/misc.py @@ -225,6 +225,8 @@ class Replace(Directive): element = nodes.Element(text) self.state.nested_parse(self.content, self.content_offset, element) + # BUG 1830380 : element might contain [paragraph] + system_message(s) + # BUG 1830380 : could skip embedded messages, but then we loose them if ( len(element) != 1 or not isinstance(element[0], nodes.paragraph)): messages = [] diff --git a/docutils/parsers/rst/states.py b/docutils/parsers/rst/states.py index 3f1ea0018..3396784d4 100644 --- a/docutils/parsers/rst/states.py +++ b/docutils/parsers/rst/states.py @@ -2641,11 +2641,13 @@ class Text(RSTState): def blank(self, match, context, next_state): """End of paragraph.""" + # BUG 1830380: self.paragraph returns [ node, system_message(s) ], literalnext paragraph, literalnext = self.paragraph( context, self.state_machine.abs_line_number() - 1) self.parent += paragraph if literalnext: self.parent += self.literal_block() + # BUG 1830380: parent might contain now: [ node-paragraph, system_messages(s), literal_block ] return [], 'Body', [] def eof(self, context): -- 2.11.4.GIT