diff --git a/include/mrdocs/Support/String.hpp b/include/mrdocs/Support/String.hpp
index b5a4767752..4aa9233e55 100644
--- a/include/mrdocs/Support/String.hpp
+++ b/include/mrdocs/Support/String.hpp
@@ -45,8 +45,10 @@ rtrim(std::string_view s) noexcept
 {
     auto it = s.end() - 1;
     while(it > s.begin() && std::isspace(*it))
+    {
         --it;
-    return s.substr(0, it - s.begin());
+    }
+    return s.substr(0, it - s.begin() + 1);
 }
 
 /** Return the substring without leading and trailing horizontal whitespace.
diff --git a/src/lib/AST/ASTVisitor.cpp b/src/lib/AST/ASTVisitor.cpp
index 45e23cdf94..ed19f09405 100644
--- a/src/lib/AST/ASTVisitor.cpp
+++ b/src/lib/AST/ASTVisitor.cpp
@@ -1754,13 +1754,6 @@ generateJavadoc(
     {
         return false;
     }
-    // KRYSTIAN FIXME: clang ignores documentation comments
-    // when there is a preprocessor directive between the end
-    // of the comment and the declaration location. there are two
-    // ways to fix this: either set the declaration begin location
-    // to be before and preprocessor directives, or submit a patch
-    // which disables this behavior (it's not entirely clear why
-    // this check occurs anyways, so some investigation is needed)
     parseJavadoc(javadoc, FC, D, config_, diags_);
     return true;
 }
diff --git a/src/lib/AST/ParseJavadoc.cpp b/src/lib/AST/ParseJavadoc.cpp
index 6a79506c99..8cc75a2740 100644
--- a/src/lib/AST/ParseJavadoc.cpp
+++ b/src/lib/AST/ParseJavadoc.cpp
@@ -16,6 +16,7 @@
 #include <mrdocs/Support/Error.hpp>
 #include <mrdocs/Support/Path.hpp>
 #include <mrdocs/Support/String.hpp>
+#include <mrdocs/Support/ScopeExit.hpp>
 #include <clang/AST/CommentCommandTraits.h>
 #include <clang/AST/ASTContext.h>
 #include <clang/AST/RawCommentList.h>
@@ -397,22 +398,183 @@ ensureUTF8(
     return s;
 }
 
+/*  Parse the inline content of a text
+
+    This function takes a string from a comment
+    and parses it into a sequence of styled text
+    nodes.
+
+    The string may contain inline commands that
+    change the style of the text:
+
+    Regular text is stored as a doc::Text.
+    Styled text is stored as a doc::Styled.
+
+    The styles can be one of: mono, bold, or italic.
+
+    The tags "`", "*", and "_" are used to indicate
+    the start and end of styled text. They can be
+    escaped by prefixing them with a backslash.
+
+ */
+doc::List<doc::Text>
+parseStyled(StringRef s)
+{
+    doc::List<doc::Text> result;
+    std::string currentText;
+    doc::Style currentStyle = doc::Style::none;
+    bool escapeNext = false;
+
+    auto isStyleMarker = [](char c) {
+        return c == '`' || c == '*' || c == '_';
+    };
+
+    auto flushCurrentText = [&]() {
+        if (!currentText.empty()) {
+            if (currentStyle == doc::Style::none) {
+                bool const lastIsSame =
+                    !result.empty() &&
+                    result.back()->kind == doc::Kind::text;
+                if (lastIsSame)
+                {
+                    auto& lastText = static_cast<doc::Text&>(*result.back());
+                    lastText.string.append(currentText);
+                }
+                else
+                {
+                    result.emplace_back(std::make_unique<doc::Text>(std::move(currentText)));
+                }
+            } else {
+                bool const lastIsSame =
+                    !result.empty() &&
+                    result.back()->kind == doc::Kind::styled &&
+                    static_cast<doc::Styled&>(*result.back()).style == currentStyle;
+                if (lastIsSame)
+                {
+                    auto& lastStyled = static_cast<doc::Styled&>(*result.back());
+                    lastStyled.string.append(currentText);
+                }
+                else
+                {
+                    result.emplace_back(std::make_unique<doc::Styled>(std::move(currentText), currentStyle));
+                }
+            }
+            currentText.clear();
+        }
+    };
+
+    auto isPunctuationOrSpace = [](char c) {
+        return std::isspace(c) || std::ispunct(c);
+    };
+
+    for (std::size_t i = 0; i < s.size(); ++i) {
+        char c = s[i];
+        if (escapeNext) {
+            currentText.push_back(c);
+            escapeNext = false;
+        } else if (c == '\\') {
+            escapeNext = true;
+        } else if (isStyleMarker(c)) {
+            bool const atWordBoundary =
+                (currentStyle == doc::Style::none && ((i == 0) || isPunctuationOrSpace(s[i - 1]))) ||
+                (currentStyle != doc::Style::none && ((i == s.size() - 1) || isPunctuationOrSpace(s[i + 1])));
+            if (atWordBoundary) {
+                flushCurrentText();
+                if (c == '`') {
+                    currentStyle = (currentStyle == doc::Style::mono) ? doc::Style::none : doc::Style::mono;
+                } else if (c == '*') {
+                    currentStyle = (currentStyle == doc::Style::bold) ? doc::Style::none : doc::Style::bold;
+                } else if (c == '_') {
+                    currentStyle = (currentStyle == doc::Style::italic) ? doc::Style::none : doc::Style::italic;
+                }
+            } else {
+                currentText.push_back(c);
+            }
+        } else {
+            currentText.push_back(c);
+        }
+    }
+
+    // Whatever style we started, we should end it because
+    // we reached the end of the string without a closing
+    // marker.
+    currentStyle = doc::Style::none;
+    flushCurrentText();
+
+    return result;
+}
+
 void
 JavadocVisitor::
 visitChildren(
     Comment const* C)
 {
-    auto const it0 = it_;
-    auto const end0 = end_;
-    it_ = C->child_begin();
-    end_ = C->child_end();
+    ScopeExitRestore s1(it_, C->child_begin());
+    ScopeExitRestore s2(end_, C->child_end());
     while(it_ != end_)
     {
         visit(*it_);
         ++it_; // must happen after
     }
-    it_ = it0;
-    end_ = end0;
+
+    if (!block_)
+    {
+        return;
+    }
+
+    bool const isVerbatim = block_->kind == doc::Kind::code;
+    if (isVerbatim)
+    {
+        return;
+    }
+
+    // Merge consecutive plain text nodes in the current block
+    auto it = block_->children.begin();
+    while(it != block_->children.end())
+    {
+        auto& child = *it;
+        if (child.get()->kind == doc::Kind::text)
+        {
+            auto* text = dynamic_cast<doc::Text*>(child.get());
+            MRDOCS_ASSERT(text);
+            auto next = std::next(it);
+            if(next != block_->children.end())
+            {
+                if(next->get()->kind == doc::Kind::text)
+                {
+                    auto* next_text = dynamic_cast<doc::Text*>(next->get());
+                    MRDOCS_ASSERT(next_text);
+                    text->string.append(next_text->string);
+                    it = block_->children.erase(next);
+                    continue;
+                }
+            }
+        }
+        ++it;
+    }
+
+    // Parse any Text nodes for styled text
+    for (auto it = block_->children.begin(); it != block_->children.end();)
+    {
+        MRDOCS_ASSERT(it->get());
+        if (it->get()->kind == doc::Kind::text)
+        {
+            auto* text = dynamic_cast<doc::Text*>(it->get());
+            auto styledText = parseStyled(text->string);
+            std::size_t const offset = std::distance(block_->children.begin(), it);
+            std::size_t const n = styledText.size();
+            block_->children.erase(it);
+            block_->children.insert(
+                block_->children.begin() + offset,
+                std::make_move_iterator(styledText.begin()),
+                std::make_move_iterator(styledText.end()));
+            it = block_->children.begin() + offset + n;
+        }
+        else
+        {
+            ++it;
+        }
+    }
 }
 
 //------------------------------------------------
@@ -462,16 +624,18 @@ visitTextComment(
     // If this is the first text comment in the
     // paragraph then remove all the leading space.
     // Otherwise, just remove the trailing space.
-    if(block_->children.empty())
+    if (block_->children.empty())
+    {
         s = s.ltrim();
-    else
-        s = s.rtrim();
+    }
 
     // Only insert non-empty text nodes
     if(! s.empty())
+    {
         emplaceText<doc::Text>(
             C->hasTrailingNewline(),
             ensureUTF8(s.str()));
+    }
 }
 
 Expected<JavadocVisitor::TagComponents>
diff --git a/src/lib/Gen/adoc/DocVisitor.cpp b/src/lib/Gen/adoc/DocVisitor.cpp
index 082edd30e6..12c1335553 100644
--- a/src/lib/Gen/adoc/DocVisitor.cpp
+++ b/src/lib/Gen/adoc/DocVisitor.cpp
@@ -18,6 +18,7 @@
 #include <llvm/Support/raw_ostream.h>
 #include <mrdocs/Support/RangeFor.hpp>
 #include <mrdocs/Support/String.hpp>
+#include <ranges>
 
 namespace clang::mrdocs::adoc {
 
@@ -65,7 +66,7 @@ operator()(
         doc::visit(*it.value,
             [&]<class T>(T const& text)
             {
-                if constexpr(std::is_same_v<T, doc::Text>)
+                if constexpr(std::derived_from<T, doc::Text>)
                 {
                     if(! text.string.empty())
                     {
@@ -89,7 +90,7 @@ DocVisitor::
 operator()(
     doc::Heading const& I) const
 {
-    fmt::format_to(ins_, "\n=== {}\n", AdocEscape(I.string));
+    fmt::format_to(ins_, "\n=== {}\n\n", AdocEscape(I.string));
 }
 
 // Also handles doc::Brief
@@ -103,15 +104,23 @@ operator()(
     {
         return;
     }
-    bool non_empty = write(*children.front(), *this);
-    for(auto const& child : children.subspan(1))
+
+    std::size_t i = 0;
+    for (auto it = children.begin(); it != children.end(); ++it)
     {
-        if (non_empty)
+        auto& child = *it;
+        if (i == 0)
         {
-            dest_.push_back('\n');
+            child->string = ltrim(child->string);
         }
-        non_empty = write(*child, *this);
+        if (i == children.size() - 1)
+        {
+            child->string = rtrim(child->string);
+        }
+        write(*child, *this);
+        i = i + 1;
     }
+
     dest_.push_back('\n');
     dest_.push_back('\n');
 }
@@ -188,37 +197,32 @@ void
 DocVisitor::
 operator()(doc::Text const& I) const
 {
-    // Asciidoc text must not have leading
-    // else they can be rendered up as code.
-    std::string_view s = trim(I.string);
-    // Render empty lines as paragraph delimiters.
-    if (s.empty())
+    if (I.string.empty())
+    {
+        dest_.append("\n\n");
+    } else
     {
-        s = "\n";
+        dest_.append(AdocEscape(I.string));
     }
-    dest_.append(AdocEscape(s));
 }
 
 void
 DocVisitor::
 operator()(doc::Styled const& I) const
 {
-    // VFALCO We need to apply Asciidoc escaping
-    // depending on the contents of the string.
-    std::string_view s = trim(I.string);
     switch(I.style)
     {
     case doc::Style::none:
-        dest_.append(s);
+        dest_.append(AdocEscape(I.string));
         break;
     case doc::Style::bold:
-        fmt::format_to(std::back_inserter(dest_), "*{}*", s);
+        fmt::format_to(std::back_inserter(dest_), "*{}*", AdocEscape(I.string));
         break;
     case doc::Style::mono:
-        fmt::format_to(std::back_inserter(dest_), "`{}`", s);
+        fmt::format_to(std::back_inserter(dest_), "`{}`", AdocEscape(I.string));
         break;
     case doc::Style::italic:
-        fmt::format_to(std::back_inserter(dest_), "_{}_", s);
+        fmt::format_to(std::back_inserter(dest_), "_{}_", AdocEscape(I.string));
         break;
     default:
         MRDOCS_UNREACHABLE();
diff --git a/src/lib/Gen/html/DocVisitor.cpp b/src/lib/Gen/html/DocVisitor.cpp
index fedce22901..fed73952ee 100644
--- a/src/lib/Gen/html/DocVisitor.cpp
+++ b/src/lib/Gen/html/DocVisitor.cpp
@@ -12,6 +12,7 @@
 
 #include "DocVisitor.hpp"
 #include "lib/Support/Radix.hpp"
+#include "mrdocs/Support/Handlebars.hpp"
 #include <iterator>
 #include <fmt/format.h>
 #include <llvm/Support/raw_ostream.h>
@@ -99,25 +100,38 @@ DocVisitor::
 operator()(
     doc::Paragraph const& I) const
 {
+    if (I.children.empty())
+    {
+        return;
+    }
+
     dest_.append("<p>");
-    for(auto const& it : RangeFor(I.children))
+    std::size_t i = 0;
+    for (auto it = I.children.begin(); it != I.children.end(); ++it)
     {
-        auto const n = dest_.size();
-        doc::visit(*it.value, *this);
-        // detect empty text blocks
-        if(! it.last && dest_.size() > n)
+        auto& child = *it;
+        if (i == 0)
         {
-            // wrap past 80 cols
-            if (dest_.size() < 80)
+            child->string = ltrim(child->string);
+        }
+        else if (auto prevIt = std::prev(it);
+            !(*prevIt)->string.empty() && !child->string.empty())
+        {
+            char const pc = (*(prevIt))->string.back();
+            char const cc = child->string.front();
+            if (!std::isspace(pc) && !std::isspace(cc))
             {
                 dest_.push_back(' ');
-            } else
-            {
-                dest_.push_back('\n');
             }
         }
+        if (i == I.children.size() - 1)
+        {
+            child->string = rtrim(child->string);
+        }
+        write(*child, *this);
+        i = i + 1;
     }
-    dest_.append("</p>\n\n");
+    dest_.append("</p>\n");
 }
 
 void
@@ -202,28 +216,26 @@ void
 DocVisitor::
 operator()(doc::Text const& I) const
 {
-    std::string_view s = trim(I.string);
-    fmt::format_to(std::back_inserter(dest_), "<span>{}</span>", s);
+    fmt::format_to(std::back_inserter(dest_), "<span>{}</span>", HTMLEscape(I.string));
 }
 
 void
 DocVisitor::
 operator()(doc::Styled const& I) const
 {
-    std::string_view s = trim(I.string);
     switch(I.style)
     {
     case doc::Style::none:
-        dest_.append(s);
+        dest_.append(I.string);
         break;
     case doc::Style::bold:
-        fmt::format_to(std::back_inserter(dest_), "<b>{}</b>", s);
+        fmt::format_to(std::back_inserter(dest_), "<b>{}</b>", HTMLEscape(I.string));
         break;
     case doc::Style::mono:
-        fmt::format_to(std::back_inserter(dest_), "<code>{}</code>", s);
+        fmt::format_to(std::back_inserter(dest_), "<code>{}</code>", HTMLEscape(I.string));
         break;
     case doc::Style::italic:
-        fmt::format_to(std::back_inserter(dest_), "<i>{}</i>", s);
+        fmt::format_to(std::back_inserter(dest_), "<i>{}</i>", HTMLEscape(I.string));
         break;
     default:
         MRDOCS_UNREACHABLE();
diff --git a/test-files/golden-tests/core/libcxx.adoc b/test-files/golden-tests/core/libcxx.adoc
index 101521c2b4..f92d2fa4e9 100644
--- a/test-files/golden-tests/core/libcxx.adoc
+++ b/test-files/golden-tests/core/libcxx.adoc
@@ -54,8 +54,7 @@ sqrt(T value);
 === Description
 
 
-This function calculates the square root of a
-given integral value using bit manipulation&period;
+This function calculates the square root of a    given integral value using bit manipulation&period;
 
 
 
diff --git a/test-files/golden-tests/core/libcxx.html b/test-files/golden-tests/core/libcxx.html
index 24a9912e0b..1ed03ad8bf 100644
--- a/test-files/golden-tests/core/libcxx.html
+++ b/test-files/golden-tests/core/libcxx.html
@@ -32,7 +32,6 @@ <h2>Functions</h2>
 <tr>
 <td><a href="#sqrt"><code>sqrt</code></a> </td><td><p><span>Computes the square root of an integral value.</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -49,7 +48,6 @@ <h2 id="sqrt">sqrt</h2>
 <p><span>Computes the square root of an integral value.</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -66,8 +64,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>This function calculates the square root of a</span> <span>given integral value using bit manipulation.</span></p>
-
+<p><span>This function calculates the square root of a    given integral value using bit manipulation.</span></p>
 
 
 </div>
@@ -84,7 +81,6 @@ <h3>Exceptions</h3>
 <tr>
 <td><code>if</code></td>
 <td><p><span>the input value is negative.</span></p>
-
 </td>
 </tr>
 </tbody>
@@ -94,7 +90,6 @@ <h3>Exceptions</h3>
 <h3>Return Value</h3>
 <p><span>The square root of the input value.</span></p>
 
-
 </div>
 <div>
 <h3>Template Parameters</h3>
@@ -109,7 +104,6 @@ <h3>Template Parameters</h3>
 <tr>
 <td><strong>T</strong></td>
 <td><p><span>The type of the input value. Must be an integral type.</span></p>
-
 </td>
 </tr>
 </tbody>
@@ -128,7 +122,6 @@ <h3>Parameters</h3>
 <tr>
 <td><strong>value</strong></td>
 <td><p><span>The integral value to compute the square root of.</span></p>
-
 </td>
 </tr>
 </tbody>
diff --git a/test-files/golden-tests/core/libcxx.xml b/test-files/golden-tests/core/libcxx.xml
index 9f6332e65d..10a6d96959 100644
--- a/test-files/golden-tests/core/libcxx.xml
+++ b/test-files/golden-tests/core/libcxx.xml
@@ -19,17 +19,16 @@
           <text>Computes the square root of an integral value.</text>
         </para>
         <para>
-          <text>This function calculates the square root of a</text>
-          <text>    given integral value using bit manipulation.</text>
+          <text>This function calculates the square root of a    given integral value using bit manipulation.</text>
         </para>
         <throws>
           <text>the input value is negative.</text>
         </throws>
         <tparam name="T">
-          <text>The type of the input value. Must be an integral type.</text>
+          <text>The type of the input value. Must be an integral type.    </text>
         </tparam>
         <param name="value">
-          <text>The integral value to compute the square root of.</text>
+          <text>The integral value to compute the square root of.    </text>
         </param>
         <returns>
           <text>The square root of the input value.</text>
diff --git a/test-files/golden-tests/filters/symbol-name/extraction-mode.adoc b/test-files/golden-tests/filters/symbol-name/extraction-mode.adoc
index 9ee98b3f6b..a5c96028c8 100644
--- a/test-files/golden-tests/filters/symbol-name/extraction-mode.adoc
+++ b/test-files/golden-tests/filters/symbol-name/extraction-mode.adoc
@@ -260,9 +260,7 @@ struct see&lowbar;below { /* see-below */ };
 === Description
 
 
-A symbol that passes the filters and the see&hyphen;below filter&period;
-The symbol should have a page as usual but, because it&apos;s a scope
-and not a namespace, the members should not be listed on that page&period;
+A symbol that passes the filters and the see&hyphen;below filter&period; The symbol should have a page as usual but, because it&apos;s a scope and not a namespace, the members should not be listed on that page&period;
 
 
 
@@ -288,8 +286,7 @@ get&lowbar;dependency();
 === Description
 
 
-When used in a function, only the symbol name should be shown&period;
-No links should be generated for this symbol&period;
+When used in a function, only the symbol name should be shown&period; No links should be generated for this symbol&period;
 
 
 
@@ -315,11 +312,9 @@ get&lowbar;implementation&lowbar;defined();
 === Description
 
 
-When used in a function, the implementation&hyphen;defined
-comment should replace the real type&period;
+When used in a function, the implementation&hyphen;defined comment should replace the real type&period;
 
-It&apos;s the responsibility of the function documentation
-to explain the implementation&hyphen;defined symbol&period;
+It&apos;s the responsibility of the function documentation to explain the implementation&hyphen;defined symbol&period;
 
 
 
@@ -345,8 +340,7 @@ get&lowbar;regular();
 === Description
 
 
-When used in a function, the symbol should be shown as usual
-with a link to the page&period;
+When used in a function, the symbol should be shown as usual with a link to the page&period;
 
 
 
@@ -372,11 +366,7 @@ get&lowbar;see&lowbar;below();
 === Description
 
 
-When used in a function, the symbol name should be shown as usual&period;
-The page for this symbol is what should be different because
-the synopsis should say &quot;See below&quot; and the members are not
-listed unless it&apos;s a namespace or the symbol has been explicitly
-used as a dependency elsewhere&period;
+When used in a function, the symbol name should be shown as usual&period; The page for this symbol is what should be different because the synopsis should say &quot;See below&quot; and the members are not listed unless it&apos;s a namespace or the symbol has been explicitly used as a dependency elsewhere&period;
 
 
 
@@ -426,11 +416,9 @@ A see&hyphen;below namespace
 === Description
 
 
-All member symbols should become see&hyphen;below&period; All members are
-traversed as see&hyphen;below&period;
+All member symbols should become see&hyphen;below&period; All members are traversed as see&hyphen;below&period;
 
-The documentation page for these symbols should include
-the see&hyphen;below comment&period;
+The documentation page for these symbols should include the see&hyphen;below comment&period;
 
 
 
@@ -458,8 +446,7 @@ struct regular { /* see-below */ };
 === Description
 
 
-The symbol becomes see&hyphen;below because the whole namespace
-is see&hyphen;below&period;
+The symbol becomes see&hyphen;below because the whole namespace is see&hyphen;below&period;
 
 
 
@@ -487,8 +474,7 @@ struct see&lowbar;below { /* see-below */ };
 === Description
 
 
-The symbol becomes see&hyphen;below because the whole namespace
-is see&hyphen;below and because it&apos;s explicitly marked as see&hyphen;below&period;
+The symbol becomes see&hyphen;below because the whole namespace is see&hyphen;below and because it&apos;s explicitly marked as see&hyphen;below&period;
 
 
 
@@ -514,12 +500,9 @@ get&lowbar;dependency();
 === Description
 
 
-The symbol should be extracted as a dependency because the
-exclude filter has precedence over the see&hyphen;below filter&period;
-Only included symbols can be promoted to see&hyphen;below&period;
+The symbol should be extracted as a dependency because the exclude filter has precedence over the see&hyphen;below filter&period; Only included symbols can be promoted to see&hyphen;below&period;
 
-It&apos;s the responsibility of the function documentation
-to explain the dependency&period;
+It&apos;s the responsibility of the function documentation to explain the dependency&period;
 
 
 
@@ -545,11 +528,9 @@ get&lowbar;implementation&lowbar;defined();
 === Description
 
 
-When used in a function, the implementation&hyphen;defined
-comment should replace the real type&period;
+When used in a function, the implementation&hyphen;defined comment should replace the real type&period;
 
-It&apos;s the responsibility of the function documentation
-to explain the implementation&hyphen;defined symbol&period;
+It&apos;s the responsibility of the function documentation to explain the implementation&hyphen;defined symbol&period;
 
 
 
@@ -671,8 +652,7 @@ struct see&lowbar;below { /* see-below */ };
 === Description
 
 
-This symbol should have a page as usual but, because it&apos;s a scope
-and not a namespace, the members should not be listed on that page&period;
+This symbol should have a page as usual but, because it&apos;s a scope and not a namespace, the members should not be listed on that page&period;
 
 The synopsis should say &quot;See below&quot;&period;
 
@@ -700,8 +680,7 @@ get&lowbar;dependency();
 === Description
 
 
-The symbol should be extracted as a dependency but its
-members should not be traversed&period;
+The symbol should be extracted as a dependency but its members should not be traversed&period;
 
 
 
@@ -727,11 +706,9 @@ get&lowbar;implementation&lowbar;defined();
 === Description
 
 
-When used in a function, the implementation&hyphen;defined
-comment should replace the real type&period;
+When used in a function, the implementation&hyphen;defined comment should replace the real type&period;
 
-It&apos;s the responsibility of the function documentation
-to explain the implementation&hyphen;defined symbol&period;
+It&apos;s the responsibility of the function documentation to explain the implementation&hyphen;defined symbol&period;
 
 
 
@@ -757,8 +734,7 @@ get&lowbar;regular();
 === Description
 
 
-When used in a function, the symbol should be shown as usual
-with a link to the page&period;
+When used in a function, the symbol should be shown as usual with a link to the page&period;
 
 
 
@@ -784,11 +760,7 @@ get&lowbar;see&lowbar;below();
 === Description
 
 
-When used in a function, the symbol name should be shown as usual&period;
-The page for this symbol is what should be different because
-the synopsis should say &quot;See below&quot; and the members are not
-listed unless it&apos;s a namespace or the symbol has been explicitly
-used as a dependency elsewhere&period;
+When used in a function, the symbol name should be shown as usual&period; The page for this symbol is what should be different because the synopsis should say &quot;See below&quot; and the members are not listed unless it&apos;s a namespace or the symbol has been explicitly used as a dependency elsewhere&period;
 
 
 
@@ -849,8 +821,7 @@ namespace see&lowbar;below&lowbar;ns&lowbar;alias = <<see_below_ns,see&lowbar;be
 === Description
 
 
-The alias should be linked as usual and, because it&apos;s a namespace,
-the members should be listed on the page&period;
+The alias should be linked as usual and, because it&apos;s a namespace, the members should be listed on the page&period;
 
 
 
diff --git a/test-files/golden-tests/filters/symbol-name/extraction-mode.html b/test-files/golden-tests/filters/symbol-name/extraction-mode.html
index 3140034920..082ee49ad3 100644
--- a/test-files/golden-tests/filters/symbol-name/extraction-mode.html
+++ b/test-files/golden-tests/filters/symbol-name/extraction-mode.html
@@ -20,11 +20,9 @@ <h2>Namespaces</h2>
 <tr>
 <td><a href="#regular_ns"><code>regular_ns</code></a> </td><td><p><span>A regular namespace with different filters for members</span></p>
 
-
 </td></tr><tr>
 <td><a href="#see_below_ns"><code>see_below_ns</code></a> </td><td><p><span>A see-below namespace</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -39,15 +37,12 @@ <h2>Namespace Aliases</h2>
 <tr>
 <td><a href="#dependency_ns_alias"><code>dependency_ns_alias</code></a> </td><td><p><span>Namespace alias to form the dependency on dependency_ns</span></p>
 
-
 </td></tr><tr>
 <td><a href="#implementation_defined_ns_alias"><code>implementation_defined_ns_alias</code></a> </td><td><p><span>Namespace alias to form a dependency on the implementation-defined namespace</span></p>
 
-
 </td></tr><tr>
 <td><a href="#see_below_ns_alias"><code>see_below_ns_alias</code></a> </td><td><p><span>Namespace alias to form a dependency on the see-below namespace</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -62,11 +57,9 @@ <h2>Types</h2>
 <tr>
 <td><a href="#regular"><code>regular</code></a> </td><td><p><span>A regular symbol in the global namespace</span></p>
 
-
 </td></tr><tr>
 <td><a href="#see_below"><code>see_below</code></a> </td><td><p><span>A see-below symbol in the global namespace</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -81,19 +74,15 @@ <h2>Functions</h2>
 <tr>
 <td><a href="#get_dependency"><code>get_dependency</code></a> </td><td><p><span>A function to get a dependency symbol on the global namespace</span></p>
 
-
 </td></tr><tr>
 <td><a href="#get_implementation_defined"><code>get_implementation_defined</code></a> </td><td><p><span>A function to get an implementation-defined symbol in the global namespace</span></p>
 
-
 </td></tr><tr>
 <td><a href="#get_regular"><code>get_regular</code></a> </td><td><p><span>A function to get a regular symbol in the global namespace</span></p>
 
-
 </td></tr><tr>
 <td><a href="#get_see_below"><code>get_see_below</code></a> </td><td><p><span>A function to get a see-below symbol in the global namespace</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -105,7 +94,6 @@ <h2 id="regular_ns">regular_ns</h2>
 <p><span>A regular namespace with different filters for members</span></p>
 
 
-
 </div>
 </div>
 <h2>Types</h2>
@@ -119,11 +107,9 @@ <h2>Types</h2>
 <tr>
 <td><a href="#regular_ns-regular"><code>regular</code></a> </td><td><p><span>A symbol that passes the filters</span></p>
 
-
 </td></tr><tr>
 <td><a href="#regular_ns-see_below"><code>see_below</code></a> </td><td><p><span>A symbol that passes the see-below filter</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -138,19 +124,15 @@ <h2>Functions</h2>
 <tr>
 <td><a href="#regular_ns-get_dependency"><code>get_dependency</code></a> </td><td><p><span>A function to get an excluded symbol</span></p>
 
-
 </td></tr><tr>
 <td><a href="#regular_ns-get_implementation_defined"><code>get_implementation_defined</code></a> </td><td><p><span>A function to get an implementation-defined symbol</span></p>
 
-
 </td></tr><tr>
 <td><a href="#regular_ns-get_regular"><code>get_regular</code></a> </td><td><p><span>A function to get a regular symbol</span></p>
 
-
 </td></tr><tr>
 <td><a href="#regular_ns-get_see_below"><code>get_see_below</code></a> </td><td><p><span>A function to get a see-below symbol</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -162,7 +144,6 @@ <h2 id="regular_ns-regular"><a href="#regular_ns">regular_ns</a>::regular</h2>
 <p><span>A symbol that passes the filters</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -186,7 +167,6 @@ <h2>Types</h2>
 <tr>
 <td><a href="#regular_ns-regular-also_regular"><code>also_regular</code></a> </td><td><p><span>Child of a regular symbol extracted as regular</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -197,7 +177,6 @@ <h3>Description</h3>
 <p><span>The symbol should have a page as usual</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -207,7 +186,6 @@ <h2 id="regular_ns-regular-also_regular"><a href="#regular_ns">regular_ns</a>::<
 <p><span>Child of a regular symbol extracted as regular</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -231,7 +209,6 @@ <h2>Types</h2>
 <tr>
 <td><a href="#regular_ns-regular-also_regular-regular_as_well"><code>regular_as_well</code></a> </td><td><p><span>Grandchild of a regular symbol extracted as regular</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -245,7 +222,6 @@ <h2 id="regular_ns-regular-also_regular-regular_as_well"><a href="#regular_ns">r
 <p><span>Grandchild of a regular symbol extracted as regular</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -268,7 +244,6 @@ <h2 id="regular_ns-see_below"><a href="#regular_ns">regular_ns</a>::see_below</h
 <p><span>A symbol that passes the see-below filter</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -285,9 +260,7 @@ <h3>Synopsis</h3>
 
 <div>
 <h3>Description</h3>
-<p><span>A symbol that passes the filters and the see-below filter.</span> <span>The symbol should have a page as usual but, because it's a scope</span>
-<span>and not a namespace, the members should not be listed on that page.</span></p>
-
+<p><span>A symbol that passes the filters and the see-below filter. The symbol should have a page as usual but, because it&#x27;s a scope</span><span> and not a namespace, the members should not be listed on that page.</span></p>
 
 
 </div>
@@ -299,7 +272,6 @@ <h2 id="regular_ns-get_dependency"><a href="#regular_ns">regular_ns</a>::get_dep
 <p><span>A function to get an excluded symbol</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -315,8 +287,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>When used in a function, only the symbol name should be shown.</span> <span>No links should be generated for this symbol.</span></p>
-
+<p><span>When used in a function, only the symbol name should be shown. No links should be generated for this symbol.</span></p>
 
 
 </div>
@@ -328,7 +299,6 @@ <h2 id="regular_ns-get_implementation_defined"><a href="#regular_ns">regular_ns<
 <p><span>A function to get an implementation-defined symbol</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -344,10 +314,8 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>When used in a function, the implementation-defined</span> <span>comment should replace the real type.</span></p>
-
-<p><span>It's the responsibility of the function documentation</span> <span>to explain the implementation-defined symbol.</span></p>
-
+<p><span>When used in a function, the implementation-defined comment should replace the real type.</span></p>
+<p><span>It&#x27;s the responsibility of the function documentation to explain the implementation-defined symbol.</span></p>
 
 
 </div>
@@ -359,7 +327,6 @@ <h2 id="regular_ns-get_regular"><a href="#regular_ns">regular_ns</a>::get_regula
 <p><span>A function to get a regular symbol</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -375,8 +342,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>When used in a function, the symbol should be shown as usual</span> <span>with a link to the page.</span></p>
-
+<p><span>When used in a function, the symbol should be shown as usual with a link to the page.</span></p>
 
 
 </div>
@@ -388,7 +354,6 @@ <h2 id="regular_ns-get_see_below"><a href="#regular_ns">regular_ns</a>::get_see_
 <p><span>A function to get a see-below symbol</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -404,12 +369,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>When used in a function, the symbol name should be shown as usual.</span>
-<span>The page for this symbol is what should be different because</span>
-<span>the synopsis should say "See below" and the members are not</span>
-<span>listed unless it's a namespace or the symbol has been explicitly</span>
-<span>used as a dependency elsewhere.</span></p>
-
+<p><span>When used in a function, the symbol name should be shown as usual. The page for this symbol is what should be different because</span><span> the synopsis should say &quot;See below&quot; and the members are not listed unless it&#x27;s a namespace or the symbol has been explicitly</span><span> used as a dependency elsewhere.</span></p>
 
 
 </div>
@@ -421,7 +381,6 @@ <h2 id="see_below_ns">see_below_ns</h2>
 <p><span>A see-below namespace</span></p>
 
 
-
 </div>
 </div>
 <h2>Types</h2>
@@ -435,11 +394,9 @@ <h2>Types</h2>
 <tr>
 <td><a href="#see_below_ns-regular"><code>regular</code></a> </td><td><p><span>Regular symbol in a see-below namespace</span></p>
 
-
 </td></tr><tr>
 <td><a href="#see_below_ns-see_below"><code>see_below</code></a> </td><td><p><span>See-below symbol in a see-below namespace</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -454,20 +411,16 @@ <h2>Functions</h2>
 <tr>
 <td><a href="#see_below_ns-get_dependency"><code>get_dependency</code></a> </td><td><p><span>A function to get a dependency symbol in a see-below namespace</span></p>
 
-
 </td></tr><tr>
 <td><a href="#see_below_ns-get_implementation_defined"><code>get_implementation_defined</code></a> </td><td><p><span>A function to get an implementation-defined symbol in a see-below namespace</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
 <div>
 <h3>Description</h3>
-<p><span>All member symbols should become see-below. All members are</span> <span>traversed as see-below.</span></p>
-
-<p><span>The documentation page for these symbols should include</span> <span>the see-below comment.</span></p>
-
+<p><span>All member symbols should become see-below. All members are traversed as see-below.</span></p>
+<p><span>The documentation page for these symbols should include the see-below comment.</span></p>
 
 
 </div>
@@ -479,7 +432,6 @@ <h2 id="see_below_ns-regular"><a href="#see_below_ns">see_below_ns</a>::regular<
 <p><span>Regular symbol in a see-below namespace</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -496,8 +448,7 @@ <h3>Synopsis</h3>
 
 <div>
 <h3>Description</h3>
-<p><span>The symbol becomes see-below because the whole namespace</span> <span>is see-below.</span></p>
-
+<p><span>The symbol becomes see-below because the whole namespace is see-below.</span></p>
 
 
 </div>
@@ -509,7 +460,6 @@ <h2 id="see_below_ns-see_below"><a href="#see_below_ns">see_below_ns</a>::see_be
 <p><span>See-below symbol in a see-below namespace</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -526,8 +476,7 @@ <h3>Synopsis</h3>
 
 <div>
 <h3>Description</h3>
-<p><span>The symbol becomes see-below because the whole namespace</span> <span>is see-below and because it's explicitly marked as see-below.</span></p>
-
+<p><span>The symbol becomes see-below because the whole namespace is see-below and because it&#x27;s explicitly marked as see-below.</span></p>
 
 
 </div>
@@ -539,7 +488,6 @@ <h2 id="see_below_ns-get_dependency"><a href="#see_below_ns">see_below_ns</a>::g
 <p><span>A function to get a dependency symbol in a see-below namespace</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -555,11 +503,8 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>The symbol should be extracted as a dependency because the</span> <span>exclude filter has precedence over the see-below filter.</span>
-<span>Only included symbols can be promoted to see-below.</span></p>
-
-<p><span>It's the responsibility of the function documentation</span> <span>to explain the dependency.</span></p>
-
+<p><span>The symbol should be extracted as a dependency because the exclude filter has precedence over the see-below filter.</span><span> Only included symbols can be promoted to see-below.</span></p>
+<p><span>It&#x27;s the responsibility of the function documentation to explain the dependency.</span></p>
 
 
 </div>
@@ -571,7 +516,6 @@ <h2 id="see_below_ns-get_implementation_defined"><a href="#see_below_ns">see_bel
 <p><span>A function to get an implementation-defined symbol in a see-below namespace</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -587,10 +531,8 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>When used in a function, the implementation-defined</span> <span>comment should replace the real type.</span></p>
-
-<p><span>It's the responsibility of the function documentation</span> <span>to explain the implementation-defined symbol.</span></p>
-
+<p><span>When used in a function, the implementation-defined comment should replace the real type.</span></p>
+<p><span>It&#x27;s the responsibility of the function documentation to explain the implementation-defined symbol.</span></p>
 
 
 </div>
@@ -602,7 +544,6 @@ <h2 id="regular">regular</h2>
 <p><span>A regular symbol in the global namespace</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -626,7 +567,6 @@ <h2>Types</h2>
 <tr>
 <td><a href="#regular-also_regular"><code>also_regular</code></a> </td><td><p><span>Child of a regular symbol: should be traversed as usual</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -637,7 +577,6 @@ <h3>Description</h3>
 <p><span>This symbol should have a page as usual.</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -647,7 +586,6 @@ <h2 id="regular-also_regular"><a href="#regular">regular</a>::also_regular</h2>
 <p><span>Child of a regular symbol: should be traversed as usual</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -671,7 +609,6 @@ <h2>Types</h2>
 <tr>
 <td><a href="#regular-also_regular-regular_as_well"><code>regular_as_well</code></a> </td><td><p><span>Grandchild of a regular symbol: should be traversed as usual</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -685,7 +622,6 @@ <h2 id="regular-also_regular-regular_as_well"><a href="#regular">regular</a>::<a
 <p><span>Grandchild of a regular symbol: should be traversed as usual</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -708,7 +644,6 @@ <h2 id="see_below">see_below</h2>
 <p><span>A see-below symbol in the global namespace</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -725,11 +660,8 @@ <h3>Synopsis</h3>
 
 <div>
 <h3>Description</h3>
-<p><span>This symbol should have a page as usual but, because it's a scope</span>
-<span>and not a namespace, the members should not be listed on that page.</span></p>
-
-<p><span>The synopsis should say "See below".</span></p>
-
+<p><span>This symbol should have a page as usual but, because it&#x27;s a scope and not a namespace, the members should not be listed on that page.</span></p>
+<p><span>The synopsis should say &quot;See below&quot;.</span></p>
 
 
 </div>
@@ -741,7 +673,6 @@ <h2 id="get_dependency">get_dependency</h2>
 <p><span>A function to get a dependency symbol on the global namespace</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -757,8 +688,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>The symbol should be extracted as a dependency but its</span> <span>members should not be traversed.</span></p>
-
+<p><span>The symbol should be extracted as a dependency but its members should not be traversed.</span></p>
 
 
 </div>
@@ -770,7 +700,6 @@ <h2 id="get_implementation_defined">get_implementation_defined</h2>
 <p><span>A function to get an implementation-defined symbol in the global namespace</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -786,10 +715,8 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>When used in a function, the implementation-defined</span> <span>comment should replace the real type.</span></p>
-
-<p><span>It's the responsibility of the function documentation</span> <span>to explain the implementation-defined symbol.</span></p>
-
+<p><span>When used in a function, the implementation-defined comment should replace the real type.</span></p>
+<p><span>It&#x27;s the responsibility of the function documentation to explain the implementation-defined symbol.</span></p>
 
 
 </div>
@@ -801,7 +728,6 @@ <h2 id="get_regular">get_regular</h2>
 <p><span>A function to get a regular symbol in the global namespace</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -817,8 +743,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>When used in a function, the symbol should be shown as usual</span> <span>with a link to the page.</span></p>
-
+<p><span>When used in a function, the symbol should be shown as usual with a link to the page.</span></p>
 
 
 </div>
@@ -830,7 +755,6 @@ <h2 id="get_see_below">get_see_below</h2>
 <p><span>A function to get a see-below symbol in the global namespace</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -846,12 +770,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>When used in a function, the symbol name should be shown as usual.</span>
-<span>The page for this symbol is what should be different because</span>
-<span>the synopsis should say "See below" and the members are not</span>
-<span>listed unless it's a namespace or the symbol has been explicitly</span>
-<span>used as a dependency elsewhere.</span></p>
-
+<p><span>When used in a function, the symbol name should be shown as usual. The page for this symbol is what should be different because</span><span> the synopsis should say &quot;See below&quot; and the members are not listed unless it&#x27;s a namespace or the symbol has been explicitly</span><span> used as a dependency elsewhere.</span></p>
 
 
 </div>
@@ -863,7 +782,6 @@ <h2 id="dependency_ns_alias">dependency_ns_alias</h2>
 <p><span>Namespace alias to form the dependency on dependency_ns</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -884,7 +802,6 @@ <h2 id="implementation_defined_ns_alias">implementation_defined_ns_alias</h2>
 <p><span>Namespace alias to form a dependency on the implementation-defined namespace</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -905,7 +822,6 @@ <h2 id="see_below_ns_alias">see_below_ns_alias</h2>
 <p><span>Namespace alias to form a dependency on the see-below namespace</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -920,9 +836,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>The alias should be linked as usual and, because it's a namespace,</span>
-<span>the members should be listed on the page.</span></p>
-
+<p><span>The alias should be linked as usual and, because it&#x27;s a namespace, the members should be listed on the page.</span></p>
 
 
 </div>
diff --git a/test-files/golden-tests/filters/symbol-name/extraction-mode.xml b/test-files/golden-tests/filters/symbol-name/extraction-mode.xml
index 3076c6d5ba..a85814e5f2 100644
--- a/test-files/golden-tests/filters/symbol-name/extraction-mode.xml
+++ b/test-files/golden-tests/filters/symbol-name/extraction-mode.xml
@@ -45,8 +45,7 @@
           <text>A function to get a regular symbol</text>
         </para>
         <para>
-          <text>When used in a function, the symbol should be shown as usual</text>
-          <text> with a link to the page.</text>
+          <text>When used in a function, the symbol should be shown as usual with a link to the page.</text>
         </para>
       </doc>
     </function>
@@ -57,8 +56,7 @@
           <text>A symbol that passes the see-below filter</text>
         </para>
         <para>
-          <text>A symbol that passes the filters and the see-below filter.</text>
-          <text> The symbol should have a page as usual but, because it&apos;s a scope</text>
+          <text>A symbol that passes the filters and the see-below filter. The symbol should have a page as usual but, because it&apos;s a scope</text>
           <text> and not a namespace, the members should not be listed on that page.</text>
         </para>
       </doc>
@@ -73,10 +71,8 @@
           <text>A function to get a see-below symbol</text>
         </para>
         <para>
-          <text>When used in a function, the symbol name should be shown as usual.</text>
-          <text> The page for this symbol is what should be different because</text>
-          <text> the synopsis should say &quot;See below&quot; and the members are not</text>
-          <text> listed unless it&apos;s a namespace or the symbol has been explicitly</text>
+          <text>When used in a function, the symbol name should be shown as usual. The page for this symbol is what should be different because</text>
+          <text> the synopsis should say &quot;See below&quot; and the members are not listed unless it&apos;s a namespace or the symbol has been explicitly</text>
           <text> used as a dependency elsewhere.</text>
         </para>
       </doc>
@@ -88,10 +84,8 @@
           <text>A symbol that passes the implementation-defined filter</text>
         </para>
         <para>
-          <text>A symbol that passes the filters and the implementation-defined filter</text>
-          <text> The symbol is implementation defined and should not have a page.</text>
-          <text> Members of an implementation-defined scope should not be traversed.</text>
-          <text> If they are traversed for some other reason, they should also become</text>
+          <text>A symbol that passes the filters and the implementation-defined filter The symbol is implementation defined and should not have a page.</text>
+          <text> Members of an implementation-defined scope should not be traversed. If they are traversed for some other reason, they should also become</text>
           <text> implementation-defined.</text>
         </para>
       </doc>
@@ -106,12 +100,10 @@
           <text>A function to get an implementation-defined symbol</text>
         </para>
         <para>
-          <text>When used in a function, the implementation-defined</text>
-          <text> comment should replace the real type.</text>
+          <text>When used in a function, the implementation-defined comment should replace the real type.</text>
         </para>
         <para>
-          <text>It&apos;s the responsibility of the function documentation</text>
-          <text> to explain the implementation-defined symbol.</text>
+          <text>It&apos;s the responsibility of the function documentation to explain the implementation-defined symbol.</text>
         </para>
       </doc>
     </function>
@@ -122,8 +114,7 @@
           <text>An excluded symbol used as a dependency by a regular symbol</text>
         </para>
         <para>
-          <text>A symbol excluded by filters but is used as a dependency</text>
-          <text> The symbol should be extracted as a dependency but its</text>
+          <text>A symbol excluded by filters but is used as a dependency The symbol should be extracted as a dependency but its</text>
           <text> members should not be traversed.</text>
         </para>
       </doc>
@@ -138,8 +129,7 @@
           <text>A function to get an excluded symbol</text>
         </para>
         <para>
-          <text>When used in a function, only the symbol name should be shown.</text>
-          <text> No links should be generated for this symbol.</text>
+          <text>When used in a function, only the symbol name should be shown. No links should be generated for this symbol.</text>
         </para>
       </doc>
     </function>
@@ -150,12 +140,10 @@
         <text>A see-below namespace</text>
       </para>
       <para>
-        <text>All member symbols should become see-below. All members are</text>
-        <text> traversed as see-below.</text>
+        <text>All member symbols should become see-below. All members are traversed as see-below.</text>
       </para>
       <para>
-        <text>The documentation page for these symbols should include</text>
-        <text> the see-below comment.</text>
+        <text>The documentation page for these symbols should include the see-below comment.</text>
       </para>
     </doc>
     <struct name="regular" id="oCi9GhACSlMlNqMEp/8CzrcvYUc=">
@@ -165,8 +153,7 @@
           <text>Regular symbol in a see-below namespace</text>
         </para>
         <para>
-          <text>The symbol becomes see-below because the whole namespace</text>
-          <text> is see-below.</text>
+          <text>The symbol becomes see-below because the whole namespace is see-below.</text>
         </para>
       </doc>
     </struct>
@@ -177,8 +164,7 @@
           <text>See-below symbol in a see-below namespace</text>
         </para>
         <para>
-          <text>The symbol becomes see-below because the whole namespace</text>
-          <text> is see-below and because it&apos;s explicitly marked as see-below.</text>
+          <text>The symbol becomes see-below because the whole namespace is see-below and because it&apos;s explicitly marked as see-below.</text>
         </para>
       </doc>
     </struct>
@@ -189,13 +175,11 @@
           <text>Implementation-defined symbol in a see-below namespace</text>
         </para>
         <para>
-          <text>The symbol does not become see-below because the</text>
-          <text> the implentation-defined filter has precedence over the</text>
+          <text>The symbol does not become see-below because the the implentation-defined filter has precedence over the</text>
           <text> see-below filter.</text>
         </para>
         <para>
-          <text>Functions using this symbol should explain the implementation-defined</text>
-          <text> nature of the symbol.</text>
+          <text>Functions using this symbol should explain the implementation-defined nature of the symbol.</text>
         </para>
       </doc>
     </struct>
@@ -209,12 +193,10 @@
           <text>A function to get an implementation-defined symbol in a see-below namespace</text>
         </para>
         <para>
-          <text>When used in a function, the implementation-defined</text>
-          <text> comment should replace the real type.</text>
+          <text>When used in a function, the implementation-defined comment should replace the real type.</text>
         </para>
         <para>
-          <text>It&apos;s the responsibility of the function documentation</text>
-          <text> to explain the implementation-defined symbol.</text>
+          <text>It&apos;s the responsibility of the function documentation to explain the implementation-defined symbol.</text>
         </para>
       </doc>
     </function>
@@ -225,13 +207,11 @@
           <text>A dependency symbol in a see-below namespace</text>
         </para>
         <para>
-          <text>The symbol should be extracted as a dependency because the</text>
-          <text> exclude filter has precedence over the see-below filter.</text>
+          <text>The symbol should be extracted as a dependency because the exclude filter has precedence over the see-below filter.</text>
           <text> Only included symbols can be promoted to see-below.</text>
         </para>
         <para>
-          <text>This will not have a page and functions using this symbol</text>
-          <text> should explain the dependency.</text>
+          <text>This will not have a page and functions using this symbol should explain the dependency.</text>
         </para>
       </doc>
     </struct>
@@ -245,13 +225,11 @@
           <text>A function to get a dependency symbol in a see-below namespace</text>
         </para>
         <para>
-          <text>The symbol should be extracted as a dependency because the</text>
-          <text> exclude filter has precedence over the see-below filter.</text>
+          <text>The symbol should be extracted as a dependency because the exclude filter has precedence over the see-below filter.</text>
           <text> Only included symbols can be promoted to see-below.</text>
         </para>
         <para>
-          <text>It&apos;s the responsibility of the function documentation</text>
-          <text> to explain the dependency.</text>
+          <text>It&apos;s the responsibility of the function documentation to explain the dependency.</text>
         </para>
       </doc>
     </function>
@@ -263,8 +241,7 @@
         <text>Namespace alias to form a dependency on the see-below namespace</text>
       </para>
       <para>
-        <text>The alias should be linked as usual and, because it&apos;s a namespace,</text>
-        <text> the members should be listed on the page.</text>
+        <text>The alias should be linked as usual and, because it&apos;s a namespace, the members should be listed on the page.</text>
       </para>
     </doc>
     <aliased name="see_below_ns" id="exW9PGqoF7V7OCpvgUIZOhj7WwI="/>
@@ -275,8 +252,7 @@
         <text>An implementation-defined namespace</text>
       </para>
       <para>
-        <text>Members are not traversed and, if traversed for some</text>
-        <text> other reason, they also become implementation-defined.</text>
+        <text>Members are not traversed and, if traversed for some other reason, they also become implementation-defined.</text>
       </para>
     </doc>
   </namespace>
@@ -337,8 +313,7 @@
         <text>A function to get a regular symbol in the global namespace</text>
       </para>
       <para>
-        <text>When used in a function, the symbol should be shown as usual</text>
-        <text> with a link to the page.</text>
+        <text>When used in a function, the symbol should be shown as usual with a link to the page.</text>
       </para>
     </doc>
   </function>
@@ -349,8 +324,7 @@
         <text>A see-below symbol in the global namespace</text>
       </para>
       <para>
-        <text>This symbol should have a page as usual but, because it&apos;s a scope</text>
-        <text> and not a namespace, the members should not be listed on that page.</text>
+        <text>This symbol should have a page as usual but, because it&apos;s a scope and not a namespace, the members should not be listed on that page.</text>
       </para>
       <para>
         <text>The synopsis should say &quot;See below&quot;.</text>
@@ -367,10 +341,8 @@
         <text>A function to get a see-below symbol in the global namespace</text>
       </para>
       <para>
-        <text>When used in a function, the symbol name should be shown as usual.</text>
-        <text> The page for this symbol is what should be different because</text>
-        <text> the synopsis should say &quot;See below&quot; and the members are not</text>
-        <text> listed unless it&apos;s a namespace or the symbol has been explicitly</text>
+        <text>When used in a function, the symbol name should be shown as usual. The page for this symbol is what should be different because</text>
+        <text> the synopsis should say &quot;See below&quot; and the members are not listed unless it&apos;s a namespace or the symbol has been explicitly</text>
         <text> used as a dependency elsewhere.</text>
       </para>
     </doc>
@@ -396,12 +368,10 @@
         <text>A function to get an implementation-defined symbol in the global namespace</text>
       </para>
       <para>
-        <text>When used in a function, the implementation-defined</text>
-        <text> comment should replace the real type.</text>
+        <text>When used in a function, the implementation-defined comment should replace the real type.</text>
       </para>
       <para>
-        <text>It&apos;s the responsibility of the function documentation</text>
-        <text> to explain the implementation-defined symbol.</text>
+        <text>It&apos;s the responsibility of the function documentation to explain the implementation-defined symbol.</text>
       </para>
     </doc>
   </function>
@@ -423,8 +393,7 @@
         <text>A function to get a dependency symbol on the global namespace</text>
       </para>
       <para>
-        <text>The symbol should be extracted as a dependency but its</text>
-        <text> members should not be traversed.</text>
+        <text>The symbol should be extracted as a dependency but its members should not be traversed.</text>
       </para>
     </doc>
   </function>
diff --git a/test-files/golden-tests/javadoc/brief-1.adoc b/test-files/golden-tests/javadoc/brief-1.adoc
index 84c3d1afef..de01d9aa12 100644
--- a/test-files/golden-tests/javadoc/brief-1.adoc
+++ b/test-files/golden-tests/javadoc/brief-1.adoc
@@ -12,10 +12,7 @@
 | Name | Description 
 
 | <<f5,`f5`>> 
-| brief
-*bold*
-it
-continues to the line&period;
+| brief *bold* itcontinues to the line&period;
 
 
 
@@ -30,10 +27,7 @@ continues to the line&period;
 == f5
 
 
-brief
-*bold*
-it
-continues to the line&period;
+brief *bold* itcontinues to the line&period;
 
 
 
@@ -70,10 +64,7 @@ f6();
 === Description
 
 
-many lined
-*bold*
-what will
-happen?
+many lined    *bold*    what will    happen?
 
 
 
diff --git a/test-files/golden-tests/javadoc/brief-1.html b/test-files/golden-tests/javadoc/brief-1.html
index 3b85f9c108..4583438afe 100644
--- a/test-files/golden-tests/javadoc/brief-1.html
+++ b/test-files/golden-tests/javadoc/brief-1.html
@@ -18,13 +18,11 @@ <h2>Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#f5"><code>f5</code></a> </td><td><p><span>brief</span> <b>bold</b> <span>it</span> <span>continues to the line.</span></p>
-
+<td><a href="#f5"><code>f5</code></a> </td><td><p><span>brief </span><b>bold</b><span> itcontinues to the line.</span></p>
 
 </td></tr><tr>
 <td><a href="#f6"><code>f6</code></a> </td><td><p><span>brief</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -33,8 +31,7 @@ <h2>Functions</h2>
 <div>
 <h2 id="f5">f5</h2>
 <div>
-<p><span>brief</span> <b>bold</b> <span>it</span> <span>continues to the line.</span></p>
-
+<p><span>brief </span><b>bold</b><span> itcontinues to the line.</span></p>
 
 
 </div>
@@ -58,7 +55,6 @@ <h2 id="f6">f6</h2>
 <p><span>brief</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -74,8 +70,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>many lined</span> <b>bold</b> <span>what will</span> <span>happen?</span></p>
-
+<p><span>many lined    </span><b>bold</b><span>    what will    happen?</span></p>
 
 
 </div>
diff --git a/test-files/golden-tests/javadoc/brief-1.xml b/test-files/golden-tests/javadoc/brief-1.xml
index a699f06252..f688679262 100644
--- a/test-files/golden-tests/javadoc/brief-1.xml
+++ b/test-files/golden-tests/javadoc/brief-1.xml
@@ -8,8 +8,7 @@
       <para>
         <text>brief </text>
         <bold>bold</bold>
-        <text> it</text>
-        <text>continues to the line.</text>
+        <text> itcontinues to the line.</text>
       </para>
     </doc>
   </function>
@@ -20,10 +19,9 @@
         <text>brief</text>
       </para>
       <para>
-        <text>many lined</text>
+        <text>many lined    </text>
         <bold>bold</bold>
-        <text>    what will</text>
-        <text>    happen?</text>
+        <text>    what will    happen?</text>
       </para>
     </doc>
   </function>
diff --git a/test-files/golden-tests/javadoc/brief-2.adoc b/test-files/golden-tests/javadoc/brief-2.adoc
index a3550452ac..214f42e3c4 100644
--- a/test-files/golden-tests/javadoc/brief-2.adoc
+++ b/test-files/golden-tests/javadoc/brief-2.adoc
@@ -32,14 +32,12 @@
 
 
 | <<f5,`f5`>> 
-| br
-ief
+| brief
 
 
 
 | <<f6,`f6`>> 
-| br
-ief
+| brief
 
 
 
@@ -124,8 +122,7 @@ f4();
 === Description
 
 
-br
-ief
+brief
 
 
 
@@ -133,8 +130,7 @@ ief
 == f5
 
 
-br
-ief
+brief
 
 
 
@@ -153,8 +149,7 @@ f5();
 == f6
 
 
-br
-ief
+brief
 
 
 
diff --git a/test-files/golden-tests/javadoc/brief-2.html b/test-files/golden-tests/javadoc/brief-2.html
index 2a10f9b6f8..78f681b48a 100644
--- a/test-files/golden-tests/javadoc/brief-2.html
+++ b/test-files/golden-tests/javadoc/brief-2.html
@@ -20,26 +20,20 @@ <h2>Functions</h2>
 <tr>
 <td><a href="#f1"><code>f1</code></a> </td><td><p><span>brief</span></p>
 
-
 </td></tr><tr>
 <td><a href="#f2"><code>f2</code></a> </td><td><p><span>brief</span></p>
 
-
 </td></tr><tr>
 <td><a href="#f3"><code>f3</code></a> </td><td><p><span>brief</span></p>
 
-
 </td></tr><tr>
 <td><a href="#f4"><code>f4</code></a> </td><td><p><span>brief                    x</span></p>
 
-
 </td></tr><tr>
-<td><a href="#f5"><code>f5</code></a> </td><td><p><span>br</span> <span>ief</span></p>
-
+<td><a href="#f5"><code>f5</code></a> </td><td><p><span>brief</span></p>
 
 </td></tr><tr>
-<td><a href="#f6"><code>f6</code></a> </td><td><p><span>br</span> <span>ief</span></p>
-
+<td><a href="#f6"><code>f6</code></a> </td><td><p><span>brief</span></p>
 
 </td></tr>
 </tbody>
@@ -52,7 +46,6 @@ <h2 id="f1">f1</h2>
 <p><span>brief</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -74,7 +67,6 @@ <h2 id="f2">f2</h2>
 <p><span>brief</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -96,7 +88,6 @@ <h2 id="f3">f3</h2>
 <p><span>brief</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -118,7 +109,6 @@ <h2 id="f4">f4</h2>
 <p><span>brief                    x</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -134,8 +124,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>br</span> <span>ief</span></p>
-
+<p><span>brief</span></p>
 
 
 </div>
@@ -144,8 +133,7 @@ <h3>Description</h3>
 <div>
 <h2 id="f5">f5</h2>
 <div>
-<p><span>br</span> <span>ief</span></p>
-
+<p><span>brief</span></p>
 
 
 </div>
@@ -166,8 +154,7 @@ <h3>Synopsis</h3>
 <div>
 <h2 id="f6">f6</h2>
 <div>
-<p><span>br</span> <span>ief</span></p>
-
+<p><span>brief</span></p>
 
 
 </div>
@@ -188,7 +175,6 @@ <h3>Description</h3>
 <p><span>desc</span></p>
 
 
-
 </div>
 </div>
 
diff --git a/test-files/golden-tests/javadoc/brief-2.xml b/test-files/golden-tests/javadoc/brief-2.xml
index c0cd24d8ce..749d6333b5 100644
--- a/test-files/golden-tests/javadoc/brief-2.xml
+++ b/test-files/golden-tests/javadoc/brief-2.xml
@@ -34,8 +34,7 @@
         <text>brief                    x</text>
       </para>
       <para>
-        <text>br</text>
-        <text>ief</text>
+        <text>brief</text>
       </para>
     </doc>
   </function>
@@ -43,8 +42,7 @@
     <file path="brief-2.cpp" line="27"/>
     <doc>
       <para>
-        <text>br</text>
-        <text>ief</text>
+        <text>brief</text>
       </para>
     </doc>
   </function>
@@ -52,8 +50,7 @@
     <file path="brief-2.cpp" line="34"/>
     <doc>
       <para>
-        <text>br</text>
-        <text>ief</text>
+        <text>brief</text>
       </para>
       <para>
         <text>desc</text>
diff --git a/test-files/golden-tests/javadoc/code.adoc b/test-files/golden-tests/javadoc/code.adoc
new file mode 100644
index 0000000000..f87e9ec59f
--- /dev/null
+++ b/test-files/golden-tests/javadoc/code.adoc
@@ -0,0 +1,61 @@
+= Reference
+:mrdocs:
+
+[#index]
+== Global namespace
+
+
+=== Functions
+
+[cols=2]
+|===
+| Name | Description 
+
+| <<f,`f`>> 
+| brief
+
+
+
+|===
+
+[#f]
+== f
+
+
+brief
+
+
+
+=== Synopsis
+
+
+Declared in `&lt;code&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+void
+f();
+----
+
+=== Description
+
+
+This description contains code&colon;
+
+[,cpp]
+----
+// code comment
+// code comment
+template < class T >
+auto
+algorithm( T&& v = {} ) ->
+    typename T::result_type
+{
+    return v.result();
+}
+----
+
+
+
+
+[.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/javadoc/code.cpp b/test-files/golden-tests/javadoc/code.cpp
new file mode 100644
index 0000000000..589eb04240
--- /dev/null
+++ b/test-files/golden-tests/javadoc/code.cpp
@@ -0,0 +1,18 @@
+/** brief
+
+    This description contains code:
+
+    @code
+    // code comment
+    // code comment
+    template < class T >
+    auto
+    algorithm( T&& v = {} ) ->
+        typename T::result_type
+    {
+        return v.result();
+    }
+    @endcode
+
+ */
+void f();
\ No newline at end of file
diff --git a/test-files/golden-tests/javadoc/code.html b/test-files/golden-tests/javadoc/code.html
new file mode 100644
index 0000000000..d083b5e781
--- /dev/null
+++ b/test-files/golden-tests/javadoc/code.html
@@ -0,0 +1,71 @@
+<html lang="en">
+<head>
+<title>Reference</title>
+</head>
+<body>
+<div>
+<h1>Reference</h1>
+<div>
+<div>
+<h2 id="index">Global namespace</h2>
+</div>
+<h2>Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th><th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#f"><code>f</code></a> </td><td><p><span>brief</span></p>
+
+</td></tr>
+</tbody>
+</table>
+</div>
+<div>
+<div>
+<h2 id="f">f</h2>
+<div>
+<p><span>brief</span></p>
+
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;code.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">
+void
+f();
+</code>
+</pre>
+</div>
+<div>
+<h3>Description</h3>
+<p><span>This description contains code:</span></p>
+<code>
+// code comment
+// code comment
+template < class T >
+auto
+algorithm( T&& v = {} ) ->
+    typename T::result_type
+{
+    return v.result();
+}
+</code>
+
+
+</div>
+</div>
+
+</div>
+<div>
+<h4>Created with <a href="https://www.mrdocs.com">MrDocs</a></h4>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/test-files/golden-tests/javadoc/code.xml b/test-files/golden-tests/javadoc/code.xml
new file mode 100644
index 0000000000..4a74c0344c
--- /dev/null
+++ b/test-files/golden-tests/javadoc/code.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mrdocs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
+<namespace id="//////////////////////////8=">
+  <function name="f" id="s6nsa+zVhpzzrN+yUVPP5rvdXqs=">
+    <file path="code.cpp" line="18"/>
+    <doc>
+      <para>
+        <text>brief</text>
+      </para>
+      <para>
+        <text>This description contains code:</text>
+      </para>
+      <code>
+        <text>    // code comment</text>
+        <text>    // code comment</text>
+        <text>    template &lt; class T &gt;</text>
+        <text>    auto</text>
+        <text>    algorithm( T&amp;&amp; v = {} ) -&gt;</text>
+        <text>        typename T::result_type</text>
+        <text>    {</text>
+        <text>        return v.result();</text>
+        <text>    }</text>
+      </code>
+    </doc>
+  </function>
+</namespace>
+</mrdocs>
diff --git a/test-files/golden-tests/javadoc/commands.html b/test-files/golden-tests/javadoc/commands.html
index 4f1ee46c00..7ec8dc04b9 100644
--- a/test-files/golden-tests/javadoc/commands.html
+++ b/test-files/golden-tests/javadoc/commands.html
@@ -20,7 +20,6 @@ <h2>Functions</h2>
 <tr>
 <td><a href="#f1"><code>f1</code></a> </td><td><p><span>brief</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -32,7 +31,6 @@ <h2 id="f1">f1</h2>
 <p><span>brief</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -51,7 +49,6 @@ <h3>Description</h3>
 <p><span>mrdocs hello</span></p>
 
 
-
 </div>
 </div>
 
diff --git a/test-files/golden-tests/javadoc/duplicate-jdoc.html b/test-files/golden-tests/javadoc/duplicate-jdoc.html
index e5fa901f4b..00cf3dc642 100644
--- a/test-files/golden-tests/javadoc/duplicate-jdoc.html
+++ b/test-files/golden-tests/javadoc/duplicate-jdoc.html
@@ -20,27 +20,21 @@ <h2>Functions</h2>
 <tr>
 <td><a href="#f0"><code>f0</code></a> </td><td><p><span>f0 brief</span></p>
 
-
 </td></tr><tr>
 <td><a href="#f1"><code>f1</code></a> </td><td><p><span>f1 brief</span></p>
 
-
 </td></tr><tr>
 <td><a href="#g0"><code>g0</code></a> </td><td><p><span>g0 brief</span></p>
 
-
 </td></tr><tr>
 <td><a href="#g1"><code>g1</code></a> </td><td><p><span>g1 brief</span></p>
 
-
 </td></tr><tr>
 <td><a href="#h0"><code>h0</code></a> </td><td><p><span>h0 brief</span></p>
 
-
 </td></tr><tr>
 <td><a href="#h1"><code>h1</code></a> </td><td><p><span>h1 brief</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -52,7 +46,6 @@ <h2 id="f0">f0</h2>
 <p><span>f0 brief</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -70,7 +63,6 @@ <h3>Synopsis</h3>
 <h3>Return Value</h3>
 <p><span>int</span></p>
 
-
 </div>
 </div>
 <div>
@@ -80,7 +72,6 @@ <h2 id="f1">f1</h2>
 <p><span>f1 brief</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -98,7 +89,6 @@ <h3>Synopsis</h3>
 <h3>Return Value</h3>
 <p><span>bool</span></p>
 
-
 </div>
 </div>
 <div>
@@ -108,7 +98,6 @@ <h2 id="g0">g0</h2>
 <p><span>g0 brief</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -135,13 +124,11 @@ <h3>Parameters</h3>
 <tr>
 <td><strong>a</strong></td>
 <td><p><span>one</span></p>
-
 </td>
 </tr>
 <tr>
 <td><strong>a</strong></td>
 <td><p><span>one</span></p>
-
 </td>
 </tr>
 </tbody>
@@ -155,7 +142,6 @@ <h2 id="g1">g1</h2>
 <p><span>g1 brief</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -182,13 +168,11 @@ <h3>Parameters</h3>
 <tr>
 <td><strong>a</strong></td>
 <td><p><span>one</span></p>
-
 </td>
 </tr>
 <tr>
 <td><strong>b</strong></td>
 <td><p><span>two</span></p>
-
 </td>
 </tr>
 </tbody>
@@ -202,7 +186,6 @@ <h2 id="h0">h0</h2>
 <p><span>h0 brief</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -230,13 +213,11 @@ <h3>Template Parameters</h3>
 <tr>
 <td><strong>T</strong></td>
 <td><p><span>one</span></p>
-
 </td>
 </tr>
 <tr>
 <td><strong>T</strong></td>
 <td><p><span>one</span></p>
-
 </td>
 </tr>
 </tbody>
@@ -250,7 +231,6 @@ <h2 id="h1">h1</h2>
 <p><span>h1 brief</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -278,13 +258,11 @@ <h3>Template Parameters</h3>
 <tr>
 <td><strong>T</strong></td>
 <td><p><span>one</span></p>
-
 </td>
 </tr>
 <tr>
 <td><strong>U</strong></td>
 <td><p><span>two</span></p>
-
 </td>
 </tr>
 </tbody>
diff --git a/test-files/golden-tests/javadoc/duplicate-jdoc.xml b/test-files/golden-tests/javadoc/duplicate-jdoc.xml
index cf0b3d8962..7c035402b5 100644
--- a/test-files/golden-tests/javadoc/duplicate-jdoc.xml
+++ b/test-files/golden-tests/javadoc/duplicate-jdoc.xml
@@ -9,10 +9,10 @@
     </return>
     <doc>
       <para>
-        <text>f0 brief</text>
+        <text>f0 brief    </text>
       </para>
       <returns>
-        <text>int</text>
+        <text>int    </text>
       </returns>
       <returns>
         <text>int</text>
@@ -26,10 +26,10 @@
     </return>
     <doc>
       <para>
-        <text>f1 brief</text>
+        <text>f1 brief    </text>
       </para>
       <returns>
-        <text>int</text>
+        <text>int    </text>
       </returns>
       <returns>
         <text>bool</text>
@@ -43,10 +43,10 @@
     </param>
     <doc>
       <para>
-        <text>g0 brief</text>
+        <text>g0 brief    </text>
       </para>
       <param name="a">
-        <text>one</text>
+        <text>one    </text>
       </param>
       <param name="a">
         <text>one</text>
@@ -60,10 +60,10 @@
     </param>
     <doc>
       <para>
-        <text>g1 brief</text>
+        <text>g1 brief    </text>
       </para>
       <param name="a">
-        <text>one</text>
+        <text>one    </text>
       </param>
       <param name="b">
         <text>two</text>
@@ -76,10 +76,10 @@
       <file path="duplicate-jdoc.cpp" line="29" class="def"/>
       <doc>
         <para>
-          <text>h0 brief</text>
+          <text>h0 brief    </text>
         </para>
         <tparam name="T">
-          <text>one</text>
+          <text>one    </text>
         </tparam>
         <tparam name="T">
           <text>one</text>
@@ -93,10 +93,10 @@
       <file path="duplicate-jdoc.cpp" line="36" class="def"/>
       <doc>
         <para>
-          <text>h1 brief</text>
+          <text>h1 brief    </text>
         </para>
         <tparam name="T">
-          <text>one</text>
+          <text>one    </text>
         </tparam>
         <tparam name="U">
           <text>two</text>
diff --git a/test-files/golden-tests/javadoc/para-1.html b/test-files/golden-tests/javadoc/para-1.html
index 853d2c6302..fa68763068 100644
--- a/test-files/golden-tests/javadoc/para-1.html
+++ b/test-files/golden-tests/javadoc/para-1.html
@@ -26,7 +26,6 @@ <h2>Functions</h2>
 </td></tr><tr>
 <td><a href="#f4"><code>f4</code></a> </td><td><p><span>brief</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -86,7 +85,6 @@ <h2 id="f4">f4</h2>
 <p><span>brief</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -103,13 +101,10 @@ <h3>Synopsis</h3>
 <div>
 <h3>Description</h3>
 <p><span>a</span></p>
-
 <p><span>b</span></p>
-
 <p><span>c</span></p>
 
 
-
 </div>
 </div>
 
diff --git a/test-files/golden-tests/javadoc/para-2.adoc b/test-files/golden-tests/javadoc/para-2.adoc
index 9c559d3e02..b026af6f15 100644
--- a/test-files/golden-tests/javadoc/para-2.adoc
+++ b/test-files/golden-tests/javadoc/para-2.adoc
@@ -40,10 +40,7 @@ f1();
 === Description
 
 
-a
-b
-c
-d
+a b  c   d
 
 
 
diff --git a/test-files/golden-tests/javadoc/para-2.html b/test-files/golden-tests/javadoc/para-2.html
index cb06f0f439..4324b692d7 100644
--- a/test-files/golden-tests/javadoc/para-2.html
+++ b/test-files/golden-tests/javadoc/para-2.html
@@ -20,7 +20,6 @@ <h2>Functions</h2>
 <tr>
 <td><a href="#f1"><code>f1</code></a> </td><td><p><span>brief</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -32,7 +31,6 @@ <h2 id="f1">f1</h2>
 <p><span>brief</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -48,8 +46,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>a</span> <span>b</span> <span>c</span> <span>d</span></p>
-
+<p><span>a b</span><span>  c   d</span></p>
 
 
 </div>
diff --git a/test-files/golden-tests/javadoc/para-2.xml b/test-files/golden-tests/javadoc/para-2.xml
index f94d789dc0..267d444304 100644
--- a/test-files/golden-tests/javadoc/para-2.xml
+++ b/test-files/golden-tests/javadoc/para-2.xml
@@ -9,10 +9,8 @@
         <text>brief</text>
       </para>
       <para>
-        <text>a</text>
-        <text> b</text>
-        <text>  c</text>
-        <text>   d</text>
+        <text>a b</text>
+        <text>  c   d</text>
       </para>
     </doc>
   </function>
diff --git a/test-files/golden-tests/javadoc/para-3.adoc b/test-files/golden-tests/javadoc/para-3.adoc
index 9a3dc62204..0b1e3fda62 100644
--- a/test-files/golden-tests/javadoc/para-3.adoc
+++ b/test-files/golden-tests/javadoc/para-3.adoc
@@ -37,16 +37,15 @@ my&lowbar;function();
 
 
 
-=== A heading&period;
-Some text&period;
+=== A heading&period; Some text&period;
 
 More text&period;&period;&period;
 
-Another paragraph
-Next line
+Another paragraph Next line
 
 
 === Exception safety
+
 No&hyphen;throw guarantee&period;
 
 
diff --git a/test-files/golden-tests/javadoc/para-3.html b/test-files/golden-tests/javadoc/para-3.html
index 5e2c35ffb1..38172763fd 100644
--- a/test-files/golden-tests/javadoc/para-3.html
+++ b/test-files/golden-tests/javadoc/para-3.html
@@ -44,18 +44,13 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<h3>A heading.</h3>
-<p><span>Some text.</span></p>
-
+<h3>A heading. Some text.</h3>
 <p><span>More text...</span></p>
-
-<p><span>Another paragraph</span> <span>Next line</span></p>
-
+<p><span>Another paragraph Next line</span></p>
 <h3>Exception safety</h3>
 <p><span>No-throw guarantee.</span></p>
 
 
-
 </div>
 </div>
 
diff --git a/test-files/golden-tests/javadoc/para-3.xml b/test-files/golden-tests/javadoc/para-3.xml
index ade821d40b..8089314a43 100644
--- a/test-files/golden-tests/javadoc/para-3.xml
+++ b/test-files/golden-tests/javadoc/para-3.xml
@@ -8,16 +8,12 @@
       <brief>
         <text>A function</text>
       </brief>
-      <head>A heading.</head>
-      <para>
-        <text> Some text.</text>
-      </para>
+      <head>A heading. Some text.</head>
       <para>
         <text>More text...</text>
       </para>
       <para>
-        <text>Another paragraph</text>
-        <text> Next line</text>
+        <text>Another paragraph Next line</text>
       </para>
       <head>Exception safety</head>
       <para>
diff --git a/test-files/golden-tests/javadoc/param-direction.html b/test-files/golden-tests/javadoc/param-direction.html
index 319163c1d3..eb00372401 100644
--- a/test-files/golden-tests/javadoc/param-direction.html
+++ b/test-files/golden-tests/javadoc/param-direction.html
@@ -68,9 +68,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>x0</strong></td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 </tbody>
 </table>
@@ -105,15 +103,11 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>x1</strong></td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 <tr>
 <td><strong>y1</strong> [in]</td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 </tbody>
 </table>
@@ -148,15 +142,11 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>x2</strong></td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 <tr>
 <td><strong>y2</strong> [out]</td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 </tbody>
 </table>
@@ -191,15 +181,11 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>x3</strong> [in]</td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 <tr>
 <td><strong>y3</strong> [out]</td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 </tbody>
 </table>
@@ -234,15 +220,11 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>x4</strong></td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 <tr>
 <td><strong>y4</strong> [inout]</td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 </tbody>
 </table>
@@ -278,21 +260,15 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>x5</strong> [out]</td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 <tr>
 <td><strong>y5</strong> [in]</td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 <tr>
 <td><strong>z5</strong></td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 </tbody>
 </table>
@@ -329,21 +305,15 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>x6</strong> [out]</td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 <tr>
 <td><strong>y6</strong></td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 <tr>
 <td><strong>z6</strong> [in]</td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 </tbody>
 </table>
@@ -378,15 +348,11 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>x7</strong> [in]</td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 <tr>
 <td><strong>y7</strong> [out]</td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 </tbody>
 </table>
@@ -419,9 +385,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>x8</strong> [in]</td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 </tbody>
 </table>
@@ -454,15 +418,11 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>x9</strong> [in]</td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 <tr>
 <td><strong>x9</strong> [out]</td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 </tbody>
 </table>
diff --git a/test-files/golden-tests/javadoc/param.html b/test-files/golden-tests/javadoc/param.html
index c61b713119..e8e3d0e0b2 100644
--- a/test-files/golden-tests/javadoc/param.html
+++ b/test-files/golden-tests/javadoc/param.html
@@ -56,9 +56,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>x</strong></td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 </tbody>
 </table>
@@ -93,15 +91,11 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>x</strong></td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 <tr>
 <td><strong>y</strong></td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 </tbody>
 </table>
@@ -137,21 +131,15 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>x</strong></td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 <tr>
 <td><strong>y</strong></td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 <tr>
 <td><strong>z</strong></td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 </tbody>
 </table>
@@ -188,27 +176,19 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>w</strong></td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 <tr>
 <td><strong>x</strong></td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 <tr>
 <td><strong>y</strong></td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 <tr>
 <td><strong>z</strong></td>
-<td><p></p>
-
-</td>
+<td></td>
 </tr>
 </tbody>
 </table>
diff --git a/test-files/golden-tests/javadoc/pre-post.html b/test-files/golden-tests/javadoc/pre-post.html
index ea604fd579..17ce2bc2b9 100644
--- a/test-files/golden-tests/javadoc/pre-post.html
+++ b/test-files/golden-tests/javadoc/pre-post.html
@@ -42,10 +42,8 @@ <h3>Synopsis</h3>
 <h3>Preconditions</h3>
 <ul>
 <li><p><span>first precondition</span></p>
-
 </li>
 <li><p><span>second precondition</span></p>
-
 </li>
 </ul>
 </div>
@@ -53,7 +51,6 @@ <h3>Preconditions</h3>
 <h3>Postconditions</h3>
 <ul>
 <li><p><span>first postcondition</span></p>
-
 </li>
 </ul>
 </div>
diff --git a/test-files/golden-tests/javadoc/pre-post.xml b/test-files/golden-tests/javadoc/pre-post.xml
index 46ef514654..7930deff6a 100644
--- a/test-files/golden-tests/javadoc/pre-post.xml
+++ b/test-files/golden-tests/javadoc/pre-post.xml
@@ -6,7 +6,7 @@
     <file path="pre-post.cpp" line="7"/>
     <doc>
       <pre>
-        <text>first precondition</text>
+        <text>first precondition    </text>
       </pre>
       <pre>
         <text>second precondition</text>
diff --git a/test-files/golden-tests/javadoc/ref.adoc b/test-files/golden-tests/javadoc/ref.adoc
index a42d692fd7..3495e731e6 100644
--- a/test-files/golden-tests/javadoc/ref.adoc
+++ b/test-files/golden-tests/javadoc/ref.adoc
@@ -31,14 +31,12 @@
 | 
 
 | <<f5,`f5`>> 
-| See
-xref:#A-f1[A&colon;&colon;f1]
+| See xref:#A-f1[A&colon;&colon;f1]
 
 
 
 | <<f6,`f6`>> 
-| See
-xref:#F-operator_bitnot[F&colon;&colon;operator&tilde;]
+| See xref:#F-operator_bitnot[F&colon;&colon;operator&tilde;]
 
 
 
@@ -55,8 +53,7 @@ xref:#F-operator_bitnot[F&colon;&colon;operator&tilde;]
 | Name | Description 
 
 | <<A-B,`B`>> 
-| See
-xref:#A-f1[f1]
+| See xref:#A-f1[f1]
 
 
 
@@ -74,8 +71,7 @@ xref:#A-f1[f1]
 | Name | Description 
 
 | <<A-f1,`f1`>> 
-| See
-xref:#f0[f0]
+| See xref:#f0[f0]
 
 
 
@@ -85,8 +81,7 @@ xref:#f0[f0]
 == <<A,A>>::B
 
 
-See
-xref:#A-f1[f1]
+See xref:#A-f1[f1]
 
 
 
@@ -115,11 +110,9 @@ struct B;
 === Description
 
 
-See
-xref:#A-f1[A&colon;&colon;f1]
+See xref:#A-f1[A&colon;&colon;f1]
 
-See
-xref:#A-f1[&colon;&colon;A&colon;&colon;f1]
+See xref:#A-f1[&colon;&colon;A&colon;&colon;f1] 
 
 
 
@@ -216,8 +209,7 @@ struct D
 | Name | Description 
 
 | <<A-D-E,`E`>> 
-| See
-xref:#A-C-f3[f3]
+| See xref:#A-C-f3[f3]
 
 
 
@@ -238,8 +230,7 @@ xref:#A-C-f3[f3]
 == <<A,A>>::<<A-D,D>>::E
 
 
-See
-xref:#A-C-f3[f3]
+See xref:#A-C-f3[f3]
 
 
 
@@ -259,11 +250,9 @@ struct E;
 === Description
 
 
-See
-xref:#A-D-f4[f4]
+See xref:#A-D-f4[f4]
 
-See
-xref:#A-C-f4[C&colon;&colon;f4]
+See xref:#A-C-f4[C&colon;&colon;f4] 
 
 
 
@@ -286,8 +275,7 @@ f4();
 == <<A,A>>::f1
 
 
-See
-xref:#f0[f0]
+See xref:#f0[f0]
 
 
 
@@ -305,8 +293,7 @@ f1();
 === Description
 
 
-See
-xref:#f0[&colon;&colon;f0]
+See xref:#f0[&colon;&colon;f0] 
 
 
 
@@ -977,8 +964,7 @@ f0();
 == f5
 
 
-See
-xref:#A-f1[A&colon;&colon;f1]
+See xref:#A-f1[A&colon;&colon;f1]
 
 
 
@@ -996,8 +982,7 @@ f5();
 === Description
 
 
-See
-xref:#A-f1[&colon;&colon;A&colon;&colon;f1]
+See xref:#A-f1[&colon;&colon;A&colon;&colon;f1]
 
 
 
@@ -1005,8 +990,7 @@ xref:#A-f1[&colon;&colon;A&colon;&colon;f1]
 == f6
 
 
-See
-xref:#F-operator_bitnot[F&colon;&colon;operator&tilde;]
+See xref:#F-operator_bitnot[F&colon;&colon;operator&tilde;]
 
 
 
@@ -1024,119 +1008,81 @@ f6();
 === Description
 
 
-See
-xref:#F-operator_comma[F&colon;&colon;operator,]
+See xref:#F-operator_comma[F&colon;&colon;operator,]
 
-See
-xref:#F-operator_call[F&colon;&colon;operator()]
+See xref:#F-operator_call[F&colon;&colon;operator()]
 
-See
-xref:#F-operator_subs[F&colon;&colon;operator&lsqb;&rsqb;]
+See xref:#F-operator_subs[F&colon;&colon;operator&lsqb;&rsqb;]
 
-See
-xref:#F-operator_plus[F&colon;&colon;operator&plus;]
+See xref:#F-operator_plus[F&colon;&colon;operator&plus;]
 
-See
-xref:#F-operator_inc[F&colon;&colon;operator&plus;&plus;]
+See xref:#F-operator_inc[F&colon;&colon;operator&plus;&plus;]
 
-See
-xref:#F-operator_plus_eq[F&colon;&colon;operator&plus;&equals;]
+See xref:#F-operator_plus_eq[F&colon;&colon;operator&plus;&equals;]
 
-See
-xref:#F-operator_bitand[F&colon;&colon;operator&amp;]
+See xref:#F-operator_bitand[F&colon;&colon;operator&amp;]
 
-See
-xref:#F-operator_and[F&colon;&colon;operator&amp;&amp;]
+See xref:#F-operator_and[F&colon;&colon;operator&amp;&amp;]
 
-See
-xref:#F-operator_and_eq[F&colon;&colon;operator&amp;&equals;]
+See xref:#F-operator_and_eq[F&colon;&colon;operator&amp;&equals;]
 
-See
-xref:#F-operator_bitor[F&colon;&colon;operator&verbar;]
+See xref:#F-operator_bitor[F&colon;&colon;operator&verbar;]
 
-See
-xref:#F-operator_or[F&colon;&colon;operator&verbar;&verbar;]
+See xref:#F-operator_or[F&colon;&colon;operator&verbar;&verbar;]
 
-See
-xref:#F-operator_or_eq[F&colon;&colon;operator&verbar;&equals;]
+See xref:#F-operator_or_eq[F&colon;&colon;operator&verbar;&equals;]
 
-See
-xref:#F-operator_minus[F&colon;&colon;operator&hyphen;]
+See xref:#F-operator_minus[F&colon;&colon;operator&hyphen;]
 
-See
-xref:#F-operator_dec[F&colon;&colon;operator&hyphen;&hyphen;]
+See xref:#F-operator_dec[F&colon;&colon;operator&hyphen;&hyphen;]
 
-See
-xref:#F-operator_minus_eq[F&colon;&colon;operator&hyphen;&equals;]
+See xref:#F-operator_minus_eq[F&colon;&colon;operator&hyphen;&equals;]
 
-See
-xref:#F-operator_ptr[F&colon;&colon;operator&hyphen;&gt;]
+See xref:#F-operator_ptr[F&colon;&colon;operator&hyphen;&gt;]
 
-See
-xref:#F-operator_ptrmem[F&colon;&colon;operator&hyphen;&gt;&ast;]
+See xref:#F-operator_ptrmem[F&colon;&colon;operator&hyphen;&gt;&ast;]
 
-See
-xref:#F-operator_lt[F&colon;&colon;operator&lt;]
+See xref:#F-operator_lt[F&colon;&colon;operator&lt;]
 
-See
-xref:#F-operator_lshift[F&colon;&colon;operator&lt;&lt;]
+See xref:#F-operator_lshift[F&colon;&colon;operator&lt;&lt;]
 
-See
-xref:#F-operator_lshift_eq[F&colon;&colon;operator&lt;&lt;&equals;]
+See xref:#F-operator_lshift_eq[F&colon;&colon;operator&lt;&lt;&equals;]
 
-See
-xref:#F-operator_le[F&colon;&colon;operator&lt;&equals;]
+See xref:#F-operator_le[F&colon;&colon;operator&lt;&equals;]
 
-See
-xref:#F-operator_3way[F&colon;&colon;operator&lt;&equals;&gt;]
+See xref:#F-operator_3way[F&colon;&colon;operator&lt;&equals;&gt;]
 
-See
-xref:#F-operator_gt[F&colon;&colon;operator&gt;]
+See xref:#F-operator_gt[F&colon;&colon;operator&gt;]
 
-See
-xref:#F-operator_rshift[F&colon;&colon;operator&gt;&gt;]
+See xref:#F-operator_rshift[F&colon;&colon;operator&gt;&gt;]
 
-See
-xref:#F-operator_rshift_eq[F&colon;&colon;operator&gt;&gt;&equals;]
+See xref:#F-operator_rshift_eq[F&colon;&colon;operator&gt;&gt;&equals;]
 
-See
-xref:#F-operator_ge[F&colon;&colon;operator&gt;&equals;]
+See xref:#F-operator_ge[F&colon;&colon;operator&gt;&equals;]
 
-See
-xref:#F-operator_star[F&colon;&colon;operator&ast;]
+See xref:#F-operator_star[F&colon;&colon;operator&ast;]
 
-See
-xref:#F-operator_star_eq[F&colon;&colon;operator&ast;&equals;]
+See xref:#F-operator_star_eq[F&colon;&colon;operator&ast;&equals;]
 
-See
-xref:#F-operator_mod[F&colon;&colon;operator%]
+See xref:#F-operator_mod[F&colon;&colon;operator%]
 
-See
-xref:#F-operator_mod_eq[F&colon;&colon;operator%&equals;]
+See xref:#F-operator_mod_eq[F&colon;&colon;operator%&equals;]
 
-See
-xref:#F-operator_slash[F&colon;&colon;operator&sol;]
+See xref:#F-operator_slash[F&colon;&colon;operator&sol;]
 
-See
-xref:#F-operator_slash_eq[F&colon;&colon;operator&sol;&equals;]
+See xref:#F-operator_slash_eq[F&colon;&colon;operator&sol;&equals;]
 
-See
-xref:#F-operator_xor[F&colon;&colon;operator&circ;]
+See xref:#F-operator_xor[F&colon;&colon;operator&circ;]
 
-See
-xref:#F-operator_xor_eq[F&colon;&colon;operator&circ;&equals;]
+See xref:#F-operator_xor_eq[F&colon;&colon;operator&circ;&equals;]
 
-See
-xref:#F-operator_assign[F&colon;&colon;operator&equals;]
+See xref:#F-operator_assign[F&colon;&colon;operator&equals;]
 
-See
-xref:#F-operator_eq[F&colon;&colon;operator&equals;&equals;]
+See xref:#F-operator_eq[F&colon;&colon;operator&equals;&equals;]
 
-See
-xref:#F-operator_not[F&colon;&colon;operator!]
+See xref:#F-operator_not[F&colon;&colon;operator!]
 
-See
-xref:#F-operator_not_eq[F&colon;&colon;operator!&equals;]
+See xref:#F-operator_not_eq[F&colon;&colon;operator!&equals;]
 
 
 
diff --git a/test-files/golden-tests/javadoc/ref.html b/test-files/golden-tests/javadoc/ref.html
index f319d5b97b..f75e0582c7 100644
--- a/test-files/golden-tests/javadoc/ref.html
+++ b/test-files/golden-tests/javadoc/ref.html
@@ -44,12 +44,10 @@ <h2>Functions</h2>
 <tr>
 <td><a href="#f0"><code>f0</code></a> </td><td>
 </td></tr><tr>
-<td><a href="#f5"><code>f5</code></a> </td><td><p><span>See</span> <a href="#A-f1">A::f1</a></p>
-
+<td><a href="#f5"><code>f5</code></a> </td><td><p><span>See </span><a href="#A-f1">A::f1</a></p>
 
 </td></tr><tr>
-<td><a href="#f6"><code>f6</code></a> </td><td><p><span>See</span> <a href="#F-operator_bitnot">F::operator~</a></p>
-
+<td><a href="#f6"><code>f6</code></a> </td><td><p><span>See </span><a href="#F-operator_bitnot">F::operator~</a></p>
 
 </td></tr>
 </tbody>
@@ -68,8 +66,7 @@ <h2>Types</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#A-B"><code>B</code></a> </td><td><p><span>See</span> <a href="#A-f1">f1</a></p>
-
+<td><a href="#A-B"><code>B</code></a> </td><td><p><span>See </span><a href="#A-f1">f1</a></p>
 
 </td></tr><tr>
 <td><a href="#A-C"><code>C</code></a> </td><td>
@@ -87,8 +84,7 @@ <h2>Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#A-f1"><code>f1</code></a> </td><td><p><span>See</span> <a href="#f0">f0</a></p>
-
+<td><a href="#A-f1"><code>f1</code></a> </td><td><p><span>See </span><a href="#f0">f0</a></p>
 
 </td></tr>
 </tbody>
@@ -98,8 +94,7 @@ <h2>Functions</h2>
 <div>
 <h2 id="A-B"><a href="#A">A</a>::B</h2>
 <div>
-<p><span>See</span> <a href="#A-f1">f1</a></p>
-
+<p><span>See </span><a href="#A-f1">f1</a></p>
 
 
 </div>
@@ -131,10 +126,8 @@ <h2>Member Functions</h2>
 
 <div>
 <h3>Description</h3>
-<p><span>See</span> <a href="#A-f1">A::f1</a></p>
-
-<p><span>See</span> <a href="#A-f1">::A::f1</a></p>
-
+<p><span>See </span><a href="#A-f1">A::f1</a></p>
+<p><span>See </span><a href="#A-f1">::A::f1</a><span> </span></p>
 
 
 </div>
@@ -241,8 +234,7 @@ <h2>Types</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#A-D-E"><code>E</code></a> </td><td><p><span>See</span> <a href="#A-C-f3">f3</a></p>
-
+<td><a href="#A-D-E"><code>E</code></a> </td><td><p><span>See </span><a href="#A-C-f3">f3</a></p>
 
 </td></tr>
 </tbody>
@@ -267,8 +259,7 @@ <h2>Member Functions</h2>
 <div>
 <h2 id="A-D-E"><a href="#A">A</a>::<a href="#A-D">D</a>::E</h2>
 <div>
-<p><span>See</span> <a href="#A-C-f3">f3</a></p>
-
+<p><span>See </span><a href="#A-C-f3">f3</a></p>
 
 
 </div>
@@ -287,10 +278,8 @@ <h3>Synopsis</h3>
 
 <div>
 <h3>Description</h3>
-<p><span>See</span> <a href="#A-D-f4">f4</a></p>
-
-<p><span>See</span> <a href="#A-C-f4">C::f4</a></p>
-
+<p><span>See </span><a href="#A-D-f4">f4</a></p>
+<p><span>See </span><a href="#A-C-f4">C::f4</a><span> </span></p>
 
 
 </div>
@@ -315,8 +304,7 @@ <h3>Synopsis</h3>
 <div>
 <h2 id="A-f1"><a href="#A">A</a>::f1</h2>
 <div>
-<p><span>See</span> <a href="#f0">f0</a></p>
-
+<p><span>See </span><a href="#f0">f0</a></p>
 
 
 </div>
@@ -334,8 +322,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>See</span> <a href="#f0">::f0</a></p>
-
+<p><span>See </span><a href="#f0">::f0</a><span> </span></p>
 
 
 </div>
@@ -1051,8 +1038,7 @@ <h3>Synopsis</h3>
 <div>
 <h2 id="f5">f5</h2>
 <div>
-<p><span>See</span> <a href="#A-f1">A::f1</a></p>
-
+<p><span>See </span><a href="#A-f1">A::f1</a></p>
 
 
 </div>
@@ -1070,8 +1056,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>See</span> <a href="#A-f1">::A::f1</a></p>
-
+<p><span>See </span><a href="#A-f1">::A::f1</a></p>
 
 
 </div>
@@ -1080,8 +1065,7 @@ <h3>Description</h3>
 <div>
 <h2 id="f6">f6</h2>
 <div>
-<p><span>See</span> <a href="#F-operator_bitnot">F::operator~</a></p>
-
+<p><span>See </span><a href="#F-operator_bitnot">F::operator~</a></p>
 
 
 </div>
@@ -1099,82 +1083,44 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>See</span> <a href="#F-operator_comma">F::operator,</a></p>
-
-<p><span>See</span> <a href="#F-operator_call">F::operator()</a></p>
-
-<p><span>See</span> <a href="#F-operator_subs">F::operator[]</a></p>
-
-<p><span>See</span> <a href="#F-operator_plus">F::operator+</a></p>
-
-<p><span>See</span> <a href="#F-operator_inc">F::operator++</a></p>
-
-<p><span>See</span> <a href="#F-operator_plus_eq">F::operator+=</a></p>
-
-<p><span>See</span> <a href="#F-operator_bitand">F::operator&</a></p>
-
-<p><span>See</span> <a href="#F-operator_and">F::operator&&</a></p>
-
-<p><span>See</span> <a href="#F-operator_and_eq">F::operator&=</a></p>
-
-<p><span>See</span> <a href="#F-operator_bitor">F::operator|</a></p>
-
-<p><span>See</span> <a href="#F-operator_or">F::operator||</a></p>
-
-<p><span>See</span> <a href="#F-operator_or_eq">F::operator|=</a></p>
-
-<p><span>See</span> <a href="#F-operator_minus">F::operator-</a></p>
-
-<p><span>See</span> <a href="#F-operator_dec">F::operator--</a></p>
-
-<p><span>See</span> <a href="#F-operator_minus_eq">F::operator-=</a></p>
-
-<p><span>See</span> <a href="#F-operator_ptr">F::operator-></a></p>
-
-<p><span>See</span> <a href="#F-operator_ptrmem">F::operator->*</a></p>
-
-<p><span>See</span> <a href="#F-operator_lt">F::operator<</a></p>
-
-<p><span>See</span> <a href="#F-operator_lshift">F::operator<<</a></p>
-
-<p><span>See</span> <a href="#F-operator_lshift_eq">F::operator<<=</a></p>
-
-<p><span>See</span> <a href="#F-operator_le">F::operator<=</a></p>
-
-<p><span>See</span> <a href="#F-operator_3way">F::operator<=></a></p>
-
-<p><span>See</span> <a href="#F-operator_gt">F::operator></a></p>
-
-<p><span>See</span> <a href="#F-operator_rshift">F::operator>></a></p>
-
-<p><span>See</span> <a href="#F-operator_rshift_eq">F::operator>>=</a></p>
-
-<p><span>See</span> <a href="#F-operator_ge">F::operator>=</a></p>
-
-<p><span>See</span> <a href="#F-operator_star">F::operator*</a></p>
-
-<p><span>See</span> <a href="#F-operator_star_eq">F::operator*=</a></p>
-
-<p><span>See</span> <a href="#F-operator_mod">F::operator%</a></p>
-
-<p><span>See</span> <a href="#F-operator_mod_eq">F::operator%=</a></p>
-
-<p><span>See</span> <a href="#F-operator_slash">F::operator/</a></p>
-
-<p><span>See</span> <a href="#F-operator_slash_eq">F::operator/=</a></p>
-
-<p><span>See</span> <a href="#F-operator_xor">F::operator^</a></p>
-
-<p><span>See</span> <a href="#F-operator_xor_eq">F::operator^=</a></p>
-
-<p><span>See</span> <a href="#F-operator_assign">F::operator=</a></p>
-
-<p><span>See</span> <a href="#F-operator_eq">F::operator==</a></p>
-
-<p><span>See</span> <a href="#F-operator_not">F::operator!</a></p>
-
-<p><span>See</span> <a href="#F-operator_not_eq">F::operator!=</a></p>
-
+<p><span>See </span><a href="#F-operator_comma">F::operator,</a></p>
+<p><span>See </span><a href="#F-operator_call">F::operator()</a></p>
+<p><span>See </span><a href="#F-operator_subs">F::operator[]</a></p>
+<p><span>See </span><a href="#F-operator_plus">F::operator+</a></p>
+<p><span>See </span><a href="#F-operator_inc">F::operator++</a></p>
+<p><span>See </span><a href="#F-operator_plus_eq">F::operator+=</a></p>
+<p><span>See </span><a href="#F-operator_bitand">F::operator&</a></p>
+<p><span>See </span><a href="#F-operator_and">F::operator&&</a></p>
+<p><span>See </span><a href="#F-operator_and_eq">F::operator&=</a></p>
+<p><span>See </span><a href="#F-operator_bitor">F::operator|</a></p>
+<p><span>See </span><a href="#F-operator_or">F::operator||</a></p>
+<p><span>See </span><a href="#F-operator_or_eq">F::operator|=</a></p>
+<p><span>See </span><a href="#F-operator_minus">F::operator-</a></p>
+<p><span>See </span><a href="#F-operator_dec">F::operator--</a></p>
+<p><span>See </span><a href="#F-operator_minus_eq">F::operator-=</a></p>
+<p><span>See </span><a href="#F-operator_ptr">F::operator-></a></p>
+<p><span>See </span><a href="#F-operator_ptrmem">F::operator->*</a></p>
+<p><span>See </span><a href="#F-operator_lt">F::operator<</a></p>
+<p><span>See </span><a href="#F-operator_lshift">F::operator<<</a></p>
+<p><span>See </span><a href="#F-operator_lshift_eq">F::operator<<=</a></p>
+<p><span>See </span><a href="#F-operator_le">F::operator<=</a></p>
+<p><span>See </span><a href="#F-operator_3way">F::operator<=></a></p>
+<p><span>See </span><a href="#F-operator_gt">F::operator></a></p>
+<p><span>See </span><a href="#F-operator_rshift">F::operator>></a></p>
+<p><span>See </span><a href="#F-operator_rshift_eq">F::operator>>=</a></p>
+<p><span>See </span><a href="#F-operator_ge">F::operator>=</a></p>
+<p><span>See </span><a href="#F-operator_star">F::operator*</a></p>
+<p><span>See </span><a href="#F-operator_star_eq">F::operator*=</a></p>
+<p><span>See </span><a href="#F-operator_mod">F::operator%</a></p>
+<p><span>See </span><a href="#F-operator_mod_eq">F::operator%=</a></p>
+<p><span>See </span><a href="#F-operator_slash">F::operator/</a></p>
+<p><span>See </span><a href="#F-operator_slash_eq">F::operator/=</a></p>
+<p><span>See </span><a href="#F-operator_xor">F::operator^</a></p>
+<p><span>See </span><a href="#F-operator_xor_eq">F::operator^=</a></p>
+<p><span>See </span><a href="#F-operator_assign">F::operator=</a></p>
+<p><span>See </span><a href="#F-operator_eq">F::operator==</a></p>
+<p><span>See </span><a href="#F-operator_not">F::operator!</a></p>
+<p><span>See </span><a href="#F-operator_not_eq">F::operator!=</a></p>
 
 
 </div>
diff --git a/test-files/golden-tests/javadoc/ref.xml b/test-files/golden-tests/javadoc/ref.xml
index e8547848f1..3d8bbe1e41 100644
--- a/test-files/golden-tests/javadoc/ref.xml
+++ b/test-files/golden-tests/javadoc/ref.xml
@@ -16,6 +16,7 @@
         <para>
           <text>See </text>
           <reference id="e1UQQek5v3C9OClW5cGf57XvwQo=">::f0</reference>
+          <text>    </text>
         </para>
       </doc>
     </function>
@@ -35,6 +36,7 @@
           <para>
             <text>See </text>
             <reference id="DXEL7gSsX/52beNneRRW463qzLQ=">::A::f1</reference>
+            <text>    </text>
           </para>
         </doc>
         <function name="f2" id="UrNEyy62P/QaY1BkJmO7NDGZSj4=">
@@ -73,6 +75,7 @@
           <para>
             <text>See </text>
             <reference id="8ScA2YfwRe5KHsj/rEbtJeXWYz8=">C::f4</reference>
+            <text>        </text>
           </para>
         </doc>
       </struct>
diff --git a/test-files/golden-tests/javadoc/styled.adoc b/test-files/golden-tests/javadoc/styled.adoc
new file mode 100644
index 0000000000..32fca814c5
--- /dev/null
+++ b/test-files/golden-tests/javadoc/styled.adoc
@@ -0,0 +1,91 @@
+= Reference
+:mrdocs:
+
+[#index]
+== Global namespace
+
+
+=== Types
+
+[cols=2]
+|===
+| Name | Description 
+
+| <<A,`A`>> 
+| Brief for A
+
+
+
+|===
+
+[#A]
+== A
+
+
+Brief for A
+
+
+
+=== Synopsis
+
+
+Declared in `&lt;styled&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+struct A;
+----
+
+=== Member Functions
+
+[cols=2]
+|===
+| Name | Description 
+
+| <<A-compare,`compare`>> 
+| Compare function
+
+
+
+|===
+
+
+
+=== Description
+
+
+Paragraph with `code`, *bold* text, and _italic_ text&period;
+
+We can also escape these markers&colon; &grave;, &ast;, and &lowbar;&period;
+
+
+
+[#A-compare]
+== <<A,A>>::compare
+
+
+Compare function
+
+
+
+=== Synopsis
+
+
+Declared in `&lt;styled&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+int
+compare(<<A,A>> const& other) const noexcept;
+----
+
+=== Return Value
+
+
+`&hyphen;1` if `&ast;this &lt; other`, `0` if        `this &equals;&equals; other`, and 1 if `this &gt; other`&period;
+
+
+
+
+
+[.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/javadoc/styled.cpp b/test-files/golden-tests/javadoc/styled.cpp
new file mode 100644
index 0000000000..07032ed5d7
--- /dev/null
+++ b/test-files/golden-tests/javadoc/styled.cpp
@@ -0,0 +1,16 @@
+/** Brief for A
+
+    Paragraph with `code`, *bold* text, and _italic_ text.
+
+	We can also escape these markers: \`, \*, and \_.
+
+ */
+struct A {
+    /** Compare function
+
+	    @return `-1` if `*this < other`, `0` if
+        `this == other`, and 1 if `this > other`.
+	 */
+    int compare(A const& other) const noexcept;
+};
+
diff --git a/test-files/golden-tests/javadoc/styled.html b/test-files/golden-tests/javadoc/styled.html
new file mode 100644
index 0000000000..97ce9b64dc
--- /dev/null
+++ b/test-files/golden-tests/javadoc/styled.html
@@ -0,0 +1,102 @@
+<html lang="en">
+<head>
+<title>Reference</title>
+</head>
+<body>
+<div>
+<h1>Reference</h1>
+<div>
+<div>
+<h2 id="index">Global namespace</h2>
+</div>
+<h2>Types</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th><th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#A"><code>A</code></a> </td><td><p><span>Brief for A</span></p>
+
+</td></tr>
+</tbody>
+</table>
+</div>
+<div>
+<div>
+<h2 id="A">A</h2>
+<div>
+<p><span>Brief for A</span></p>
+
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;styled.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">
+struct A;
+</code>
+</pre>
+</div>
+<h2>Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th><th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#A-compare"><code>compare</code></a> </td><td><p><span>Compare function</span></p>
+
+</td></tr>
+</tbody>
+</table>
+
+
+<div>
+<h3>Description</h3>
+<p><span>Paragraph with </span><code>code</code> <span>, </span><b>bold</b><span> text, and </span><i>italic</i><span> text.</span></p>
+<p><span>We can also escape these markers: &#x60;, *, and _.</span></p>
+
+
+</div>
+</div>
+<div>
+<div>
+<h2 id="A-compare"><a href="#A">A</a>::compare</h2>
+<div>
+<p><span>Compare function</span></p>
+
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;styled.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">
+int
+compare(<a href="#A">A</a> const& other) const noexcept;
+</code>
+</pre>
+</div>
+<div>
+<h3>Return Value</h3>
+<p><code>-1</code><span> if </span><code>*this &lt; other</code> <span>, </span><code>0</code><span> if        </span><code>this &#x3D;&#x3D; other</code> <span>, and 1 if </span><code>this &gt; other</code> <span>.</span></p>
+
+</div>
+</div>
+
+</div>
+<div>
+<h4>Created with <a href="https://www.mrdocs.com">MrDocs</a></h4>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/test-files/golden-tests/javadoc/styled.xml b/test-files/golden-tests/javadoc/styled.xml
new file mode 100644
index 0000000000..6d5bab52b9
--- /dev/null
+++ b/test-files/golden-tests/javadoc/styled.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mrdocs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
+<namespace id="//////////////////////////8=">
+  <struct name="A" id="YrPSaKAbmXgzCAX5WByx4eVoqBM=">
+    <file path="styled.cpp" line="8" class="def"/>
+    <doc>
+      <para>
+        <text>Brief for A</text>
+      </para>
+      <para>
+        <text>Paragraph with </text>
+        <mono>code</mono>
+        <text>, </text>
+        <bold>bold</bold>
+        <text> text, and </text>
+        <italic>italic</italic>
+        <text> text.</text>
+      </para>
+      <para>
+        <text>We can also escape these markers: `, *, and _.</text>
+      </para>
+    </doc>
+    <function name="compare" exception-spec="noexcept" id="CKPqawUTt6FNIN9qEFTMcdnvPkI=">
+      <file path="styled.cpp" line="14"/>
+      <attr id="is-const"/>
+      <return>
+        <type name="int"/>
+      </return>
+      <param name="other">
+        <type class="lvalue-reference">
+          <pointee-type id="YrPSaKAbmXgzCAX5WByx4eVoqBM=" name="A" cv-qualifiers="const"/>
+        </type>
+      </param>
+      <doc>
+        <para>
+          <text>Compare function</text>
+        </para>
+        <returns>
+          <mono>-1</mono>
+          <text> if </text>
+          <mono>*this &lt; other</mono>
+          <text>, </text>
+          <mono>0</mono>
+          <text> if        </text>
+          <mono>this == other</mono>
+          <text>, and 1 if </text>
+          <mono>this &gt; other</mono>
+          <text>.</text>
+        </returns>
+      </doc>
+    </function>
+  </struct>
+</namespace>
+</mrdocs>
diff --git a/test-files/golden-tests/metadata/enum.html b/test-files/golden-tests/metadata/enum.html
index c4c03ad6a7..ac3ce2dcc7 100644
--- a/test-files/golden-tests/metadata/enum.html
+++ b/test-files/golden-tests/metadata/enum.html
@@ -20,13 +20,11 @@ <h2>Enums</h2>
 <tr>
 <td><a href="#E0"><code>E0</code></a> </td><td><p><span>E0 brief.</span></p>
 
-
 </td></tr><tr>
 <td><a href="#E1"><code>E1</code></a> </td><td>
 </td></tr><tr>
 <td><a href="#E2"><code>E2</code></a> </td><td><p><span>E2 brief.</span></p>
 
-
 </td></tr><tr>
 <td><a href="#E3"><code>E3</code></a> </td><td>
 </td></tr>
@@ -40,7 +38,6 @@ <h2 id="E0">E0</h2>
 <p><span>E0 brief.</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -66,13 +63,11 @@ <h3>Members</h3>
 <tr>
 <td>e0</td>
 <td><p><span>e0 brief.</span></p>
-
 </td>
 </tr>
 <tr>
 <td>e1</td>
 <td><p><span>e1 brief.</span></p>
-
 </td>
 </tr>
 </tbody>
@@ -83,7 +78,6 @@ <h3>Description</h3>
 <p><span>E0 description.</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -129,7 +123,6 @@ <h2 id="E2">E2</h2>
 <p><span>E2 brief.</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -155,13 +148,11 @@ <h3>Members</h3>
 <tr>
 <td>e4</td>
 <td><p><span>e4 brief.</span></p>
-
 </td>
 </tr>
 <tr>
 <td>e5</td>
 <td><p><span>e5 brief.</span></p>
-
 </td>
 </tr>
 </tbody>
@@ -172,7 +163,6 @@ <h3>Description</h3>
 <p><span>E2 description.</span></p>
 
 
-
 </div>
 </div>
 <div>
diff --git a/test-files/golden-tests/metadata/friend-1.html b/test-files/golden-tests/metadata/friend-1.html
index 91314f00b4..fe295febde 100644
--- a/test-files/golden-tests/metadata/friend-1.html
+++ b/test-files/golden-tests/metadata/friend-1.html
@@ -32,7 +32,6 @@ <h2>Functions</h2>
 <tr>
 <td><a href="#f"><code>f</code></a> </td><td><p><span>f</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -62,7 +61,6 @@ <h2>Friends</h2>
 <tr>
 <td><a href="#T-08friend"><code>f</code></a> </td><td><p><span>f</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -76,7 +74,6 @@ <h2 id="T-08friend">f</h2>
 <p><span>f</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -99,7 +96,6 @@ <h2 id="f">f</h2>
 <p><span>f</span></p>
 
 
-
 </div>
 </div>
 <div>
diff --git a/test-files/golden-tests/metadata/friend-2.html b/test-files/golden-tests/metadata/friend-2.html
index fc769c11be..6960891a38 100644
--- a/test-files/golden-tests/metadata/friend-2.html
+++ b/test-files/golden-tests/metadata/friend-2.html
@@ -32,7 +32,6 @@ <h2>Functions</h2>
 <tr>
 <td><a href="#f"><code>f</code></a> </td><td><p><span>f</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -62,7 +61,6 @@ <h2>Friends</h2>
 <tr>
 <td><a href="#T-08friend"><code>f</code></a> </td><td><p><span>f</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -76,7 +74,6 @@ <h2 id="T-08friend">f</h2>
 <p><span>f</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -99,7 +96,6 @@ <h2 id="f">f</h2>
 <p><span>f</span></p>
 
 
-
 </div>
 </div>
 <div>
diff --git a/test-files/golden-tests/metadata/friend-3.html b/test-files/golden-tests/metadata/friend-3.html
index c4d969f50a..af920d7ea4 100644
--- a/test-files/golden-tests/metadata/friend-3.html
+++ b/test-files/golden-tests/metadata/friend-3.html
@@ -33,7 +33,6 @@ <h2>Functions</h2>
 <tr>
 <td><a href="#f"><code>f</code></a> </td><td><p><span>T::f</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -63,7 +62,6 @@ <h2>Friends</h2>
 <tr>
 <td><a href="#T-08friend"><code>f</code></a> </td><td><p><span>T::f</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -77,7 +75,6 @@ <h2 id="T-08friend">f</h2>
 <p><span>T::f</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -146,7 +143,6 @@ <h2 id="f">f</h2>
 <p><span>T::f</span></p>
 
 
-
 </div>
 </div>
 <div>
diff --git a/test-files/golden-tests/metadata/friend-4.html b/test-files/golden-tests/metadata/friend-4.html
index c3f0f90da6..8699e78050 100644
--- a/test-files/golden-tests/metadata/friend-4.html
+++ b/test-files/golden-tests/metadata/friend-4.html
@@ -33,7 +33,6 @@ <h2>Functions</h2>
 <tr>
 <td><a href="#f"><code>f</code></a> </td><td><p><span>U::f</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -109,7 +108,6 @@ <h2>Friends</h2>
 <tr>
 <td><a href="#U-08friend"><code>f</code></a> </td><td><p><span>U::f</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -123,7 +121,6 @@ <h2 id="U-08friend">f</h2>
 <p><span>U::f</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -146,7 +143,6 @@ <h2 id="f">f</h2>
 <p><span>U::f</span></p>
 
 
-
 </div>
 </div>
 <div>
diff --git a/test-files/golden-tests/metadata/friend-5.html b/test-files/golden-tests/metadata/friend-5.html
index 450f2e15c4..3ca0d29d1e 100644
--- a/test-files/golden-tests/metadata/friend-5.html
+++ b/test-files/golden-tests/metadata/friend-5.html
@@ -33,7 +33,6 @@ <h2>Functions</h2>
 <tr>
 <td><a href="#f"><code>f</code></a> </td><td><p><span>f</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -137,7 +136,6 @@ <h2 id="f">f</h2>
 <p><span>f</span></p>
 
 
-
 </div>
 </div>
 <div>
diff --git a/test-files/golden-tests/metadata/friend-6.html b/test-files/golden-tests/metadata/friend-6.html
index 0fe3956cc4..589f973dc8 100644
--- a/test-files/golden-tests/metadata/friend-6.html
+++ b/test-files/golden-tests/metadata/friend-6.html
@@ -20,15 +20,12 @@ <h2>Types</h2>
 <tr>
 <td><a href="#T"><code>T</code></a> </td><td><p><span>Struct T brief</span></p>
 
-
 </td></tr><tr>
 <td><a href="#U"><code>U</code></a> </td><td><p><span>Struct U brief</span></p>
 
-
 </td></tr><tr>
 <td><a href="#V"><code>V</code></a> </td><td><p><span>Struct V brief</span></p>
 
-
 </td></tr><tr>
 <td><a href="#Z"><code>Z</code></a> </td><td>
 </td></tr>
@@ -42,7 +39,6 @@ <h2 id="T">T</h2>
 <p><span>Struct T brief</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -66,11 +62,9 @@ <h2>Friends</h2>
 <tr>
 <td><a href="#T-08friend-04cb"><code>class Z</code></a> </td><td><p><span>Friend class Z brief</span></p>
 
-
 </td></tr><tr>
 <td><a href="#T-08friend-04ce"><code>int</code></a> </td><td><p><span>Friend int brief</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -84,7 +78,6 @@ <h2 id="T-08friend-04cb"><a href="#Z">Z</a></h2>
 <p><span>Friend class Z brief</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -105,7 +98,6 @@ <h2 id="T-08friend-04ce">int</h2>
 <p><span>Friend int brief</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -126,7 +118,6 @@ <h2 id="U">U</h2>
 <p><span>Struct U brief</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -150,7 +141,6 @@ <h2>Friends</h2>
 <tr>
 <td><a href="#U-08friend"><code>T</code></a> </td><td><p><span>Friend T brief</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -164,7 +154,6 @@ <h2 id="U-08friend"><a href="#T">T</a></h2>
 <p><span>Friend T brief</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -185,7 +174,6 @@ <h2 id="V">V</h2>
 <p><span>Struct V brief</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -209,7 +197,6 @@ <h2>Friends</h2>
 <tr>
 <td><a href="#V-08friend"><code>struct U</code></a> </td><td><p><span>Friend struct U brief</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -223,7 +210,6 @@ <h2 id="V-08friend"><a href="#U">U</a></h2>
 <p><span>Friend struct U brief</span></p>
 
 
-
 </div>
 </div>
 <div>
diff --git a/test-files/golden-tests/metadata/record-1.html b/test-files/golden-tests/metadata/record-1.html
index 9c4a511da0..e595dbcfca 100644
--- a/test-files/golden-tests/metadata/record-1.html
+++ b/test-files/golden-tests/metadata/record-1.html
@@ -75,15 +75,12 @@ <h2>Protected Member Functions</h2>
 <tr>
 <td><a href="#T-g1"><code>g1</code></a> </td><td><p><span>brief-g1</span></p>
 
-
 </td></tr><tr>
 <td><a href="#T-g2"><code>g2</code></a> </td><td><p><span>brief-g2</span></p>
 
-
 </td></tr><tr>
 <td><a href="#T-g3"><code>g3</code></a> </td><td><p><span>brief-g3</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -144,7 +141,6 @@ <h2 id="T-g1"><a href="#T">T</a>::g1</h2>
 <p><span>brief-g1</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -163,7 +159,6 @@ <h3>Description</h3>
 <p><span>desc</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -173,7 +168,6 @@ <h2 id="T-g2"><a href="#T">T</a>::g2</h2>
 <p><span>brief-g2</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -191,7 +185,6 @@ <h3>Synopsis</h3>
 <h3>Return Value</h3>
 <p><span>the number 2</span></p>
 
-
 </div>
 </div>
 <div>
@@ -201,7 +194,6 @@ <h2 id="T-g3"><a href="#T">T</a>::g3</h2>
 <p><span>brief-g3</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -219,7 +211,6 @@ <h3>Synopsis</h3>
 <h3>Return Value</h3>
 <p><span>the separator</span></p>
 
-
 </div>
 <div>
 <h3>Parameters</h3>
@@ -234,7 +225,6 @@ <h3>Parameters</h3>
 <tr>
 <td><strong>x</strong></td>
 <td><p><span>any old number</span></p>
-
 </td>
 </tr>
 </tbody>
diff --git a/test-files/golden-tests/metadata/record-1.xml b/test-files/golden-tests/metadata/record-1.xml
index 354d4bce7e..7902ebbe4d 100644
--- a/test-files/golden-tests/metadata/record-1.xml
+++ b/test-files/golden-tests/metadata/record-1.xml
@@ -65,7 +65,7 @@
           <text>brief-g3</text>
         </para>
         <returns>
-          <text>the separator</text>
+          <text>the separator        </text>
         </returns>
         <param name="x">
           <text>any old number</text>
diff --git a/test-files/golden-tests/snippets/distance.adoc b/test-files/golden-tests/snippets/distance.adoc
index 63d7ea3ef7..8278ee917c 100644
--- a/test-files/golden-tests/snippets/distance.adoc
+++ b/test-files/golden-tests/snippets/distance.adoc
@@ -44,8 +44,7 @@ distance(
 === Description
 
 
-This function returns the distance between two points
-according to the Euclidean distance formula&period;
+This function returns the distance between two points    according to the Euclidean distance formula&period;
 
 
 
diff --git a/test-files/golden-tests/snippets/distance.html b/test-files/golden-tests/snippets/distance.html
index 49195fd99d..6519478515 100644
--- a/test-files/golden-tests/snippets/distance.html
+++ b/test-files/golden-tests/snippets/distance.html
@@ -20,7 +20,6 @@ <h2>Functions</h2>
 <tr>
 <td><a href="#distance"><code>distance</code></a> </td><td><p><span>Return the distance between two points</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -32,7 +31,6 @@ <h2 id="distance">distance</h2>
 <p><span>Return the distance between two points</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -52,8 +50,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>This function returns the distance between two points</span> <span>according to the Euclidean distance formula.</span></p>
-
+<p><span>This function returns the distance between two points    according to the Euclidean distance formula.</span></p>
 
 
 </div>
@@ -61,7 +58,6 @@ <h3>Description</h3>
 <h3>Return Value</h3>
 <p><span>The distance between the two points</span></p>
 
-
 </div>
 <div>
 <h3>Parameters</h3>
@@ -76,25 +72,21 @@ <h3>Parameters</h3>
 <tr>
 <td><strong>x0</strong></td>
 <td><p><span>The x-coordinate of the first point</span></p>
-
 </td>
 </tr>
 <tr>
 <td><strong>y0</strong></td>
 <td><p><span>The y-coordinate of the first point</span></p>
-
 </td>
 </tr>
 <tr>
 <td><strong>x1</strong></td>
 <td><p><span>The x-coordinate of the second point</span></p>
-
 </td>
 </tr>
 <tr>
 <td><strong>y1</strong></td>
 <td><p><span>The y-coordinate of the second point</span></p>
-
 </td>
 </tr>
 </tbody>
diff --git a/test-files/golden-tests/snippets/distance.xml b/test-files/golden-tests/snippets/distance.xml
index d130a2e831..0768e566a7 100644
--- a/test-files/golden-tests/snippets/distance.xml
+++ b/test-files/golden-tests/snippets/distance.xml
@@ -24,20 +24,19 @@
         <text>Return the distance between two points</text>
       </para>
       <para>
-        <text>This function returns the distance between two points</text>
-        <text>    according to the Euclidean distance formula.</text>
+        <text>This function returns the distance between two points    according to the Euclidean distance formula.</text>
       </para>
       <param name="x0">
-        <text>The x-coordinate of the first point</text>
+        <text>The x-coordinate of the first point    </text>
       </param>
       <param name="y0">
-        <text>The y-coordinate of the first point</text>
+        <text>The y-coordinate of the first point    </text>
       </param>
       <param name="x1">
-        <text>The x-coordinate of the second point</text>
+        <text>The x-coordinate of the second point    </text>
       </param>
       <param name="y1">
-        <text>The y-coordinate of the second point</text>
+        <text>The y-coordinate of the second point    </text>
       </param>
       <returns>
         <text>The distance between the two points</text>
diff --git a/test-files/golden-tests/snippets/is_prime.html b/test-files/golden-tests/snippets/is_prime.html
index c9e4e4ec7f..7b47fa30fb 100644
--- a/test-files/golden-tests/snippets/is_prime.html
+++ b/test-files/golden-tests/snippets/is_prime.html
@@ -20,7 +20,6 @@ <h2>Functions</h2>
 <tr>
 <td><a href="#is_prime"><code>is_prime</code></a> </td><td><p><span>Return true if a number is prime.</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -32,7 +31,6 @@ <h2 id="is_prime">is_prime</h2>
 <p><span>Return true if a number is prime.</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -51,13 +49,11 @@ <h3>Description</h3>
 <p><span>Linear in n.</span></p>
 
 
-
 </div>
 <div>
 <h3>Return Value</h3>
 <p><span>Whether or not n is prime.</span></p>
 
-
 </div>
 <div>
 <h3>Parameters</h3>
@@ -72,7 +68,6 @@ <h3>Parameters</h3>
 <tr>
 <td><strong>n</strong></td>
 <td><p><span>The number to test</span></p>
-
 </td>
 </tr>
 </tbody>
diff --git a/test-files/golden-tests/snippets/is_prime.xml b/test-files/golden-tests/snippets/is_prime.xml
index a35fa58c87..cd4d30651e 100644
--- a/test-files/golden-tests/snippets/is_prime.xml
+++ b/test-files/golden-tests/snippets/is_prime.xml
@@ -18,7 +18,7 @@
         <text>Linear in n.</text>
       </para>
       <returns>
-        <text>Whether or not n is prime.</text>
+        <text>Whether or not n is prime.    </text>
       </returns>
       <param name="n">
         <text>The number to test</text>
diff --git a/test-files/golden-tests/snippets/sqrt.adoc b/test-files/golden-tests/snippets/sqrt.adoc
index d2a25dfb38..ab257e8e5c 100644
--- a/test-files/golden-tests/snippets/sqrt.adoc
+++ b/test-files/golden-tests/snippets/sqrt.adoc
@@ -54,8 +54,7 @@ sqrt(T value);
 === Description
 
 
-This function calculates the square root of a
-given integral value using bit manipulation&period;
+This function calculates the square root of a    given integral value using bit manipulation&period;
 
 
 
diff --git a/test-files/golden-tests/snippets/sqrt.html b/test-files/golden-tests/snippets/sqrt.html
index fd35b24788..bea9414900 100644
--- a/test-files/golden-tests/snippets/sqrt.html
+++ b/test-files/golden-tests/snippets/sqrt.html
@@ -32,7 +32,6 @@ <h2>Functions</h2>
 <tr>
 <td><a href="#sqrt"><code>sqrt</code></a> </td><td><p><span>Computes the square root of an integral value.</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -49,7 +48,6 @@ <h2 id="sqrt">sqrt</h2>
 <p><span>Computes the square root of an integral value.</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -66,8 +64,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Description</h3>
-<p><span>This function calculates the square root of a</span> <span>given integral value using bit manipulation.</span></p>
-
+<p><span>This function calculates the square root of a    given integral value using bit manipulation.</span></p>
 
 
 </div>
@@ -84,7 +81,6 @@ <h3>Exceptions</h3>
 <tr>
 <td><code>if</code></td>
 <td><p><span>the input value is negative.</span></p>
-
 </td>
 </tr>
 </tbody>
@@ -94,7 +90,6 @@ <h3>Exceptions</h3>
 <h3>Return Value</h3>
 <p><span>The square root of the input value.</span></p>
 
-
 </div>
 <div>
 <h3>Template Parameters</h3>
@@ -109,7 +104,6 @@ <h3>Template Parameters</h3>
 <tr>
 <td><strong>T</strong></td>
 <td><p><span>The type of the input value. Must be an integral type.</span></p>
-
 </td>
 </tr>
 </tbody>
@@ -128,7 +122,6 @@ <h3>Parameters</h3>
 <tr>
 <td><strong>value</strong></td>
 <td><p><span>The integral value to compute the square root of.</span></p>
-
 </td>
 </tr>
 </tbody>
diff --git a/test-files/golden-tests/snippets/sqrt.xml b/test-files/golden-tests/snippets/sqrt.xml
index 4090956cd8..cb0db2e2ec 100644
--- a/test-files/golden-tests/snippets/sqrt.xml
+++ b/test-files/golden-tests/snippets/sqrt.xml
@@ -19,17 +19,16 @@
           <text>Computes the square root of an integral value.</text>
         </para>
         <para>
-          <text>This function calculates the square root of a</text>
-          <text>    given integral value using bit manipulation.</text>
+          <text>This function calculates the square root of a    given integral value using bit manipulation.</text>
         </para>
         <throws>
           <text>the input value is negative.</text>
         </throws>
         <tparam name="T">
-          <text>The type of the input value. Must be an integral type.</text>
+          <text>The type of the input value. Must be an integral type.    </text>
         </tparam>
         <param name="value">
-          <text>The integral value to compute the square root of.</text>
+          <text>The integral value to compute the square root of.    </text>
         </param>
         <returns>
           <text>The square root of the input value.</text>
diff --git a/test-files/golden-tests/snippets/terminate.html b/test-files/golden-tests/snippets/terminate.html
index c9f52b58f0..760731a6c2 100644
--- a/test-files/golden-tests/snippets/terminate.html
+++ b/test-files/golden-tests/snippets/terminate.html
@@ -20,7 +20,6 @@ <h2>Functions</h2>
 <tr>
 <td><a href="#terminate"><code>terminate</code></a> </td><td><p><span>Exit the program.</span></p>
 
-
 </td></tr>
 </tbody>
 </table>
@@ -32,7 +31,6 @@ <h2 id="terminate">terminate</h2>
 <p><span>Exit the program.</span></p>
 
 
-
 </div>
 </div>
 <div>
@@ -50,11 +48,9 @@ <h3>Synopsis</h3>
 <div>
 <h3>Description</h3>
 <p><span>The program will end immediately.</span></p>
-
 <div>
 <h4>NOTE</h4>
 <p><span>This function does not return.</span></p>
-
 </div>