From 600d5859d7bcb94b08ef656fd427914766ae9afe Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 3 Jan 2015 15:28:43 +0100 Subject: Bug 742230 - @todo paragraphs incorrectly placed in rtf output Start a new paragraph, in case not yet a new paragraph has been started. --- src/rtfdocvisitor.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp index a11e42f..20fbf53 100644 --- a/src/rtfdocvisitor.cpp +++ b/src/rtfdocvisitor.cpp @@ -1414,6 +1414,11 @@ void RTFDocVisitor::visitPre(DocXRefItem *x) if (x->title().isEmpty()) return; bool anonymousEnum = x->file()=="@"; DBG_RTF("{\\comment RTFDocVisitor::visitPre(DocXRefItem)}\n"); + if (!m_lastIsPara) + { + m_t << "\\par" << endl; + m_lastIsPara=TRUE; + } m_t << "{"; // start param list //m_t << "{\\b "; // start bold m_t << "{" << rtf_Style["Heading5"]->reference << endl; -- cgit v0.12 From 8090675790ad9265bcffdf07ab4d48fc8c037276 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 3 Jan 2015 19:18:23 +0100 Subject: Fortran: code color GOTO as flow keyword. --- src/fortrancode.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fortrancode.l b/src/fortrancode.l index 51934cd..17a28c3 100644 --- a/src/fortrancode.l +++ b/src/fortrancode.l @@ -724,7 +724,7 @@ ATTR_SPEC (IMPLICIT|ALLOCATABLE|DIMENSION{ARGS}|EXTERNAL|{INTENT_SPEC}|INTRINSIC ACCESS_SPEC (PROTECTED|PRIVATE|PUBLIC) /* Assume that attribute statements are almost the same as attributes. */ ATTR_STMT {ATTR_SPEC}|DIMENSION -FLOW (DO|SELECT|CASE|SELECT{BS}(CASE|TYPE)|WHERE|IF|THEN|ELSE|WHILE|FORALL|ELSEWHERE|ELSEIF|RETURN|CONTINUE|EXIT) +FLOW (DO|SELECT|CASE|SELECT{BS}(CASE|TYPE)|WHERE|IF|THEN|ELSE|WHILE|FORALL|ELSEWHERE|ELSEIF|RETURN|CONTINUE|EXIT|GO{BS}TO) COMMANDS (FORMAT|CONTAINS|MODULE{BS_}PROCEDURE|WRITE|READ|ALLOCATE|ALLOCATED|ASSOCIATED|PRESENT|DEALLOCATE|NULLIFY|SIZE|INQUIRE|OPEN|CLOSE|FLUSH|DATA|COMMON) IGNORE (CALL) PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|IMPURE|PURE|ELEMENTAL)? -- cgit v0.12