Fix Issue 9731 - Ddoc should output per-paragraph macro instead of $(…

…DDOC_BLANKLINE)
dlang · Jul 4, 2017 · f197169 · f197169
1 parent d1173e3
commit f197169
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 26 deletions.
diff --git a/src/ddmd/doc.d b/src/ddmd/doc.d
@@ -2177,10 +2177,10 @@ extern (C++) void highlightText(Scope* sc, Dsymbols* a, OutBuffer* buf, size_t o
                 // inserted lazily at the close quote, meaning the rest of the
                 // text is already OK.
             }
-            if (!sc._module.isDocFile && !inCode && i == iLineStart && i + 1 < buf.offset) // if "\n\n"
+            if (!inCode && i == iLineStart && i + 1 < buf.offset) // if "\n\n"
             {
-                immutable blankline = "$(DDOC_BLANKLINE)\n";
-                i = buf.insert(i, blankline);
+                static immutable blankline = "$(DDOC_BLANKLINE)";
+                i = buf.insert(i, blankline.ptr, blankline.length);
             }
             leadingBlank = 1;
             iLineStart = i + 1;

diff --git a/test/compilable/extra-files/ddoc2.html b/test/compilable/extra-files/ddoc2.html
@@ -476,10 +476,8 @@ <h4>Discussion</h4>
   <p class="para">
     Description1
 <br><br>
-
  Description2
 <br><br>
-
  Description3
 
 
@@ -490,7 +488,6 @@ <h4>See Also</h4>
   <p class="para">
     Things to see also.
 <br><br>
-
 	And more things.
   </p>
 </div>

diff --git a/test/compilable/extra-files/ddoc3.html b/test/compilable/extra-files/ddoc3.html
@@ -476,10 +476,8 @@ <h4>Discussion</h4>
   <p class="para">
     Description1
 <br><br>
-
  Description2
 <br><br>
-
  Description3
 
 
@@ -490,23 +488,19 @@ <h4>See Also</h4>
   <p class="para">
     Things to see also.
 <br><br>
-
 	And more things <br>
 	'arg1, arg2, arg3' : arg1, arg2, arg3. <br>
 	'arg2, arg3' : arg2, arg3. <br>
 	'arg1' : arg1. <br>
 	'arg2' : arg2. <br>
 	'arg3' : arg3. <br>
 <br><br>
-
 	Things to see also world.
 <br><br>
-
 	<table>	<tr><td>1</td> <td>2</td> <td>3</td> </tr>
 	<tr><td>4</td> <td>5</td> <td>6</td> </tr>
 	</table>
 <br><br>
-
 
 <section class="code_listing">
   <div class="code_sample">

diff --git a/test/compilable/extra-files/ddoc7555.html b/test/compilable/extra-files/ddoc7555.html
@@ -502,39 +502,30 @@ <h4>Discussion</h4>
       DelimitedString
   TokenString
 <br><br>
-
   DelimitedString
   TokenString
 <br><br>
-
 HexString
 HexString
 <br><br>
-
 HexString
 HexString
 <br><br>
-
 HexString
 HexString
 <br><br>
-
 HexString
 HexString
 <br><br>
-
 HexString
 HexString
 <br><br>
-
 HexString
 HexString
 <br><br>
-
 HexString
 HexString
 <br><br>
-
 HexString
 HexString
 

diff --git a/test/compilable/extra-files/ddoc9155.html b/test/compilable/extra-files/ddoc9155.html
@@ -532,7 +532,6 @@ <h4>Declaration</h4>
 </section>
 <br><br>
 
-
 <section class="code_listing">
   <div class="code_sample">
     <div class="dlang">
@@ -577,7 +576,6 @@ <h4>Declaration</h4>
 </section>
 <br><br>
 
-
 <section class="code_listing">
   <div class="code_sample">
     <div class="dlang">
@@ -592,7 +590,6 @@ <h4>Declaration</h4>
 </section>
 <br><br>
 
-
 <section class="code_listing">
   <div class="code_sample">
     <div class="dlang">

diff --git a/test/compilable/extra-files/ddoc9764.html b/test/compilable/extra-files/ddoc9764.html
@@ -464,8 +464,8 @@
     <div class="content_wrapper">
       <article class="module">
         <h1 class="module_name">ddoc9764</h1>
-        <section id="module_content">
-
+        <section id="module_content"><br><br>
+<br><br>
 Check ddoc9764 document.
 
 <section class="code_listing">