diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2015-01-03 18:40:00 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-01-03 18:40:00 (GMT) |
| commit | 70afeb96108b77cb68de746b3037cc775b00a45b (patch) | |
| tree | be0d8f89970b8e8b5c2904e068748947fee790aa | |
| parent | bc8e705cf90cecdff8a247264c249ffed1d2af4a (diff) | |
| parent | 7067e0972c20214c3a7c5b9768497a24de16f4d6 (diff) | |
| download | Doxygen-70afeb96108b77cb68de746b3037cc775b00a45b.zip Doxygen-70afeb96108b77cb68de746b3037cc775b00a45b.tar.gz Doxygen-70afeb96108b77cb68de746b3037cc775b00a45b.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
| -rw-r--r-- | src/fortrancode.l | 2 | ||||
| -rw-r--r-- | src/rtfdocvisitor.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
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)? 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; |