From dc438879c6bb1475add244b381cb6671316c850c Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 13 Jan 2019 11:03:12 +0100
Subject: Merge: moved example from 081 to 084, improved check if last char is
 newline

---
 src/markdown.cpp                        |  2 +-
 testing/081/081__markdown__pre_8f90.xml | 51 ---------------------------------
 testing/081_brief_lists.h               |  0
 testing/081_markdown_pre.f90            | 18 ------------
 testing/084/084__markdown__pre_8f90.xml | 51 +++++++++++++++++++++++++++++++++
 testing/084_markdown_pre.f90            | 18 ++++++++++++
 6 files changed, 70 insertions(+), 70 deletions(-)
 delete mode 100755 testing/081/081__markdown__pre_8f90.xml
 mode change 100755 => 100644 testing/081_brief_lists.h
 delete mode 100755 testing/081_markdown_pre.f90
 create mode 100755 testing/084/084__markdown__pre_8f90.xml
 create mode 100644 testing/084_markdown_pre.f90

diff --git a/src/markdown.cpp b/src/markdown.cpp
index 181b01a..74492ea 100644
--- a/src/markdown.cpp
+++ b/src/markdown.cpp
@@ -2536,7 +2536,7 @@ QCString processMarkdown(const QCString &fileName,const int lineNr,Entry *e,cons
   int refIndent;
   // for replace tabs by spaces
   QCString s = input;
-  if (s.find('\n',s.length()-1) == -1) s += "\n";
+  if (s.at(s.length()-1)!='\n') s += "\n"; // see PR #6766
   s = detab(s,refIndent);
   //printf("======== DeTab =========\n---- output -----\n%s\n---------\n",s.data());
   // then process quotation blocks (as these may contain other blocks)
diff --git a/testing/081/081__markdown__pre_8f90.xml b/testing/081/081__markdown__pre_8f90.xml
deleted file mode 100755
index 7c713cf..0000000
--- a/testing/081/081__markdown__pre_8f90.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
-  <compounddef id="081__markdown__pre_8f90" kind="file" language="Fortran">
-    <compoundname>081_markdown_pre.f90</compoundname>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="081__markdown__pre_8f90_1aae79d7941f2dce9b2d61fc852f3031d1" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type>subroutine</type>
-        <definition>subroutine subr1</definition>
-        <argsstring>()</argsstring>
-        <name>subr1</name>
-        <briefdescription>
-          <para>subr1 </para>
-        </briefdescription>
-        <detaileddescription>
-          <para>
-            <preformatted>
-                     ___________________________
-</preformatted>
-          </para>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="081_markdown_pre.f90" line="9" column="1" bodyfile="081_markdown_pre.f90" bodystart="10" bodyend="9"/>
-      </memberdef>
-      <memberdef kind="function" id="081__markdown__pre_8f90_1a799d06e535f6b6e83331907261cef116" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type>subroutine</type>
-        <definition>subroutine subr2</definition>
-        <argsstring>()</argsstring>
-        <name>subr2</name>
-        <briefdescription>
-          <para>subr2 </para>
-        </briefdescription>
-        <detaileddescription>
-          <para>
-            <preformatted>
-                     ___________________________
-</preformatted>
-          </para>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="081_markdown_pre.f90" line="17" column="1" bodyfile="081_markdown_pre.f90" bodystart="18" bodyend="17"/>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="081_markdown_pre.f90"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/081_brief_lists.h b/testing/081_brief_lists.h
old mode 100755
new mode 100644
diff --git a/testing/081_markdown_pre.f90 b/testing/081_markdown_pre.f90
deleted file mode 100755
index 590bbbf..0000000
--- a/testing/081_markdown_pre.f90
+++ /dev/null
@@ -1,18 +0,0 @@
-! // objective: test <pre> in Fortran, no translation of markdown
-! // check: 081__markdown__pre_8f90.xml
-!> \file
-
-!> subr1
-!><pre>
-!>                     ___________________________
-!></pre>
-subroutine subr1()
-end subroutine
-
-!> subr2
-!><pre>
-!>                     ___________________________
-!></pre>
-!>
-subroutine subr2()
-end subroutine
diff --git a/testing/084/084__markdown__pre_8f90.xml b/testing/084/084__markdown__pre_8f90.xml
new file mode 100755
index 0000000..8a59bd9
--- /dev/null
+++ b/testing/084/084__markdown__pre_8f90.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="084__markdown__pre_8f90" kind="file" language="Fortran">
+    <compoundname>084_markdown_pre.f90</compoundname>
+    <sectiondef kind="func">
+      <memberdef kind="function" id="084__markdown__pre_8f90_1aae79d7941f2dce9b2d61fc852f3031d1" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>subroutine</type>
+        <definition>subroutine subr1</definition>
+        <argsstring>()</argsstring>
+        <name>subr1</name>
+        <briefdescription>
+          <para>subr1 </para>
+        </briefdescription>
+        <detaileddescription>
+          <para>
+            <preformatted>
+                     ___________________________
+</preformatted>
+          </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="084_markdown_pre.f90" line="9" column="1" bodyfile="084_markdown_pre.f90" bodystart="10" bodyend="9"/>
+      </memberdef>
+      <memberdef kind="function" id="084__markdown__pre_8f90_1a799d06e535f6b6e83331907261cef116" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>subroutine</type>
+        <definition>subroutine subr2</definition>
+        <argsstring>()</argsstring>
+        <name>subr2</name>
+        <briefdescription>
+          <para>subr2 </para>
+        </briefdescription>
+        <detaileddescription>
+          <para>
+            <preformatted>
+                     ___________________________
+</preformatted>
+          </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="084_markdown_pre.f90" line="17" column="1" bodyfile="084_markdown_pre.f90" bodystart="18" bodyend="17"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+    </detaileddescription>
+    <location file="084_markdown_pre.f90"/>
+  </compounddef>
+</doxygen>
diff --git a/testing/084_markdown_pre.f90 b/testing/084_markdown_pre.f90
new file mode 100644
index 0000000..1760b67
--- /dev/null
+++ b/testing/084_markdown_pre.f90
@@ -0,0 +1,18 @@
+! // objective: test <pre> in Fortran, no translation of markdown
+! // check: 084__markdown__pre_8f90.xml
+!> \file
+
+!> subr1
+!><pre>
+!>                     ___________________________
+!></pre>
+subroutine subr1()
+end subroutine
+
+!> subr2
+!><pre>
+!>                     ___________________________
+!></pre>
+!>
+subroutine subr2()
+end subroutine
-- 
cgit v0.12