From 86843fd84e21fa67bbf6925aecf969f2c6b3fae7 Mon Sep 17 00:00:00 2001
From: alandefreitas <alandefreitas@gmail.com>
Date: Fri, 31 Jan 2025 20:22:41 -0300
Subject: [PATCH 1/7] sfinae constraints are not repopulated

#fix

fix #850
---
 src/lib/AST/ASTVisitor.cpp                    | 44 +++++++++--------
 .../golden-tests/config/sfinae/redeclare.adoc | 36 ++++++++++++++
 .../golden-tests/config/sfinae/redeclare.cpp  | 14 ++++++
 .../golden-tests/config/sfinae/redeclare.html | 49 +++++++++++++++++++
 .../golden-tests/config/sfinae/redeclare.xml  | 17 +++++++
 5 files changed, 140 insertions(+), 20 deletions(-)
 create mode 100644 test-files/golden-tests/config/sfinae/redeclare.adoc
 create mode 100644 test-files/golden-tests/config/sfinae/redeclare.cpp
 create mode 100644 test-files/golden-tests/config/sfinae/redeclare.html
 create mode 100644 test-files/golden-tests/config/sfinae/redeclare.xml

diff --git a/src/lib/AST/ASTVisitor.cpp b/src/lib/AST/ASTVisitor.cpp
index 723960125b..964f7ae80a 100644
--- a/src/lib/AST/ASTVisitor.cpp
+++ b/src/lib/AST/ASTVisitor.cpp
@@ -811,7 +811,7 @@ populate(
     {
         populate(I.Requires, TRC);
     }
-    else
+    else if (I.Requires.Written.empty())
     {
         // Return type SFINAE constraints
         if (I.ReturnType &&
@@ -1200,33 +1200,37 @@ populate(
     }
 
     // Extract requires clause from SFINAE context
-    for (auto it = Template.Args.begin(); it != Template.Args.end();)
+    if (Template.Requires.Written.empty())
     {
-        auto& arg = *it;
-        if (!arg)
-        {
-            ++it;
-            continue;
-        }
-        if (auto* T = dynamic_cast<TypeTArg*>(arg.operator->());
-            T &&
-            T->Type &&
-            !T->Type->Constraints.empty())
+        for (auto it = Template.Args.begin(); it != Template.Args.end();)
         {
-            for (ExprInfo const& constraint: T->Type->Constraints)
+            auto& arg = *it;
+            if (!arg)
+            {
+                ++it;
+                continue;
+            }
+            if (auto* T = dynamic_cast<TypeTArg*>(arg.operator->());
+                T &&
+                T->Type &&
+                !T->Type->Constraints.empty())
             {
-                if (!Template.Requires.Written.empty())
+                for (ExprInfo const& constraint: T->Type->Constraints)
                 {
-                    Template.Requires.Written += " && ";
+                    if (!Template.Requires.Written.empty())
+                    {
+                        Template.Requires.Written += " && ";
+                    }
+                    Template.Requires.Written += constraint.Written;
                 }
-                Template.Requires.Written += constraint.Written;
+                it = Template.Args.erase(it);
+                continue;
             }
-            it = Template.Args.erase(it);
-            continue;
+            ++it;
         }
-        ++it;
     }
 
+
     // Extract the template parameters if this is a partial specialization
     if (auto* CTPSD = dyn_cast<ClassTemplatePartialSpecializationDecl>(CTSD))
     {
@@ -1468,7 +1472,7 @@ populate(
     {
         populate(TI.Requires, RC);
     }
-    else
+    else if (TI.Requires.Written.empty())
     {
         // If there's no requires clause, check if the template
         // parameter types we extracted have constraints
diff --git a/test-files/golden-tests/config/sfinae/redeclare.adoc b/test-files/golden-tests/config/sfinae/redeclare.adoc
new file mode 100644
index 0000000000..cdd407980a
--- /dev/null
+++ b/test-files/golden-tests/config/sfinae/redeclare.adoc
@@ -0,0 +1,36 @@
+= Reference
+:mrdocs:
+
+[#index]
+== Global namespace
+
+
+=== Functions
+
+[cols=1]
+|===
+| Name 
+
+| <<f,`f`>> 
+|===
+
+[#f]
+== f
+
+
+=== Synopsis
+
+
+Declared in `&lt;redeclare&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+template&lt;typename T&gt;
+void
+f(void)
+requires std&colon;&colon;is&lowbar;class&lowbar;v&lt;T&gt;;
+----
+
+
+
+[.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/config/sfinae/redeclare.cpp b/test-files/golden-tests/config/sfinae/redeclare.cpp
new file mode 100644
index 0000000000..7eb75ff959
--- /dev/null
+++ b/test-files/golden-tests/config/sfinae/redeclare.cpp
@@ -0,0 +1,14 @@
+// issue #850
+
+#include <type_traits>
+
+template <typename T>
+void f(std::enable_if_t<std::is_class_v<T>>);
+
+template <typename T>
+void f(std::enable_if_t<std::is_class_v<T>>);
+
+template <typename T>
+void f(std::enable_if_t<std::is_class_v<T>>)
+{
+}
\ No newline at end of file
diff --git a/test-files/golden-tests/config/sfinae/redeclare.html b/test-files/golden-tests/config/sfinae/redeclare.html
new file mode 100644
index 0000000000..8537db57f0
--- /dev/null
+++ b/test-files/golden-tests/config/sfinae/redeclare.html
@@ -0,0 +1,49 @@
+<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>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#f"><code>f</code></a> </td></tr>
+</tbody>
+</table>
+</div>
+<div>
+<div>
+<h2 id="f">f</h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;redeclare.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">
+template&lt;typename T&gt;
+void
+f(void)
+requires std::is_class_v&lt;T&gt;;
+</code>
+</pre>
+</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/config/sfinae/redeclare.xml b/test-files/golden-tests/config/sfinae/redeclare.xml
new file mode 100644
index 0000000000..b5ac1efab8
--- /dev/null
+++ b/test-files/golden-tests/config/sfinae/redeclare.xml
@@ -0,0 +1,17 @@
+<?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=">
+  <template>
+    <tparam name="T" class="type"/>
+    <function name="f" requires="std::is_class_v&lt;T&gt;" id="BLN6H1yQLtKanicO0huYQpQPbnk=">
+      <file short-path="redeclare.cpp" source-path="redeclare.cpp" line="11" class="def"/>
+      <file short-path="redeclare.cpp" source-path="redeclare.cpp" line="5"/>
+      <file short-path="redeclare.cpp" source-path="redeclare.cpp" line="8"/>
+      <param>
+        <type name="void"/>
+      </param>
+    </function>
+  </template>
+</namespace>
+</mrdocs>

From ce149943d55b7207215070ff7f69205244afdab5 Mon Sep 17 00:00:00 2001
From: alandefreitas <alandefreitas@gmail.com>
Date: Fri, 31 Jan 2025 20:30:58 -0300
Subject: [PATCH 2/7] test: return based sfinae

fix #849
---
 .../golden-tests/config/sfinae/mrdocs.yml     |  3 ++
 .../config/sfinae/return-based.adoc           | 36 ++++++++++++++
 .../config/sfinae/return-based.cpp            |  6 +++
 .../config/sfinae/return-based.html           | 49 +++++++++++++++++++
 .../config/sfinae/return-based.xml            | 15 ++++++
 5 files changed, 109 insertions(+)
 create mode 100644 test-files/golden-tests/config/sfinae/mrdocs.yml
 create mode 100644 test-files/golden-tests/config/sfinae/return-based.adoc
 create mode 100644 test-files/golden-tests/config/sfinae/return-based.cpp
 create mode 100644 test-files/golden-tests/config/sfinae/return-based.html
 create mode 100644 test-files/golden-tests/config/sfinae/return-based.xml

diff --git a/test-files/golden-tests/config/sfinae/mrdocs.yml b/test-files/golden-tests/config/sfinae/mrdocs.yml
new file mode 100644
index 0000000000..255a15647f
--- /dev/null
+++ b/test-files/golden-tests/config/sfinae/mrdocs.yml
@@ -0,0 +1,3 @@
+source-root: .
+input:
+  - .
diff --git a/test-files/golden-tests/config/sfinae/return-based.adoc b/test-files/golden-tests/config/sfinae/return-based.adoc
new file mode 100644
index 0000000000..c10b19c2ee
--- /dev/null
+++ b/test-files/golden-tests/config/sfinae/return-based.adoc
@@ -0,0 +1,36 @@
+= Reference
+:mrdocs:
+
+[#index]
+== Global namespace
+
+
+=== Functions
+
+[cols=1]
+|===
+| Name 
+
+| <<f,`f`>> 
+|===
+
+[#f]
+== f
+
+
+=== Synopsis
+
+
+Declared in `&lt;return&hyphen;based&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+template&lt;typename T&gt;
+int
+f()
+requires std&colon;&colon;is&lowbar;class&lowbar;v&lt;T&gt;;
+----
+
+
+
+[.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/config/sfinae/return-based.cpp b/test-files/golden-tests/config/sfinae/return-based.cpp
new file mode 100644
index 0000000000..e701be1055
--- /dev/null
+++ b/test-files/golden-tests/config/sfinae/return-based.cpp
@@ -0,0 +1,6 @@
+// issue #849
+
+#include <type_traits>
+
+template <typename T>
+std::enable_if_t<std::is_class_v<T>, int> f();
diff --git a/test-files/golden-tests/config/sfinae/return-based.html b/test-files/golden-tests/config/sfinae/return-based.html
new file mode 100644
index 0000000000..d04fdbba5a
--- /dev/null
+++ b/test-files/golden-tests/config/sfinae/return-based.html
@@ -0,0 +1,49 @@
+<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>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#f"><code>f</code></a> </td></tr>
+</tbody>
+</table>
+</div>
+<div>
+<div>
+<h2 id="f">f</h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;return-based.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">
+template&lt;typename T&gt;
+int
+f()
+requires std::is_class_v&lt;T&gt;;
+</code>
+</pre>
+</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/config/sfinae/return-based.xml b/test-files/golden-tests/config/sfinae/return-based.xml
new file mode 100644
index 0000000000..e10386d775
--- /dev/null
+++ b/test-files/golden-tests/config/sfinae/return-based.xml
@@ -0,0 +1,15 @@
+<?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=">
+  <template>
+    <tparam name="T" class="type"/>
+    <function name="f" requires="std::is_class_v&lt;T&gt;" id="+zl/sg3GXOLbrJGwRx2qkepftDY=">
+      <file short-path="return-based.cpp" source-path="return-based.cpp" line="5"/>
+      <return>
+        <type name="int"/>
+      </return>
+    </function>
+  </template>
+</namespace>
+</mrdocs>

From 8f2efd3dac8684e994b987022a3833d289141ac2 Mon Sep 17 00:00:00 2001
From: alandefreitas <alandefreitas@gmail.com>
Date: Fri, 31 Jan 2025 20:34:24 -0300
Subject: [PATCH 3/7] default test input is source dir

#test
---
 src/test/TestRunner.cpp                          | 2 ++
 test-files/golden-tests/config/sfinae/mrdocs.yml | 3 ---
 test-files/golden-tests/core/libcxx.yml          | 3 ---
 test-files/golden-tests/mrdocs.yml               | 1 -
 4 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 test-files/golden-tests/config/sfinae/mrdocs.yml
 delete mode 100644 test-files/golden-tests/core/libcxx.yml

diff --git a/src/test/TestRunner.cpp b/src/test/TestRunner.cpp
index ac07ac9648..3f8485d09e 100644
--- a/src/test/TestRunner.cpp
+++ b/src/test/TestRunner.cpp
@@ -280,6 +280,7 @@ handleDir(
             auto const& subdir = entry.path();
             Config::Settings subdirSettings = dirSettings;
             subdirSettings.sourceRoot = subdir;
+            subdirSettings.input = {subdir};
             std::string const& configPath = files::appendPath(subdir, "mrdocs.yml");
             if (files::exists(configPath))
             {
@@ -340,6 +341,7 @@ checkPath(
     testArgs.apply(dirSettings, dirs_, argv);
     dirSettings.multipage = false;
     dirSettings.sourceRoot = inputDir;
+    dirSettings.input = {inputDir};
     std::string const& configPath = files::appendPath(inputDir, "mrdocs.yml");
 
     if (files::exists(configPath))
diff --git a/test-files/golden-tests/config/sfinae/mrdocs.yml b/test-files/golden-tests/config/sfinae/mrdocs.yml
deleted file mode 100644
index 255a15647f..0000000000
--- a/test-files/golden-tests/config/sfinae/mrdocs.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-source-root: .
-input:
-  - .
diff --git a/test-files/golden-tests/core/libcxx.yml b/test-files/golden-tests/core/libcxx.yml
deleted file mode 100644
index 255a15647f..0000000000
--- a/test-files/golden-tests/core/libcxx.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-source-root: .
-input:
-  - .
diff --git a/test-files/golden-tests/mrdocs.yml b/test-files/golden-tests/mrdocs.yml
index eee2ef0cd9..3342a7ec21 100644
--- a/test-files/golden-tests/mrdocs.yml
+++ b/test-files/golden-tests/mrdocs.yml
@@ -1,4 +1,3 @@
-#ignore-failures: true
 concurrency: 1
 source-root: .
 single-page: true

From 560e98b8b2d66e09de8c5b85af8918b2dc366b5f Mon Sep 17 00:00:00 2001
From: alandefreitas <alandefreitas@gmail.com>
Date: Fri, 31 Jan 2025 20:49:02 -0300
Subject: [PATCH 4/7] test: function template attributes

#test
---
 .../golden-tests/metadata/attributes-2.adoc   | 36 ++++++++++++++
 .../golden-tests/metadata/attributes-2.cpp    |  4 ++
 .../golden-tests/metadata/attributes-2.html   | 49 +++++++++++++++++++
 .../golden-tests/metadata/attributes-2.xml    | 16 ++++++
 4 files changed, 105 insertions(+)
 create mode 100644 test-files/golden-tests/metadata/attributes-2.adoc
 create mode 100644 test-files/golden-tests/metadata/attributes-2.cpp
 create mode 100644 test-files/golden-tests/metadata/attributes-2.html
 create mode 100644 test-files/golden-tests/metadata/attributes-2.xml

diff --git a/test-files/golden-tests/metadata/attributes-2.adoc b/test-files/golden-tests/metadata/attributes-2.adoc
new file mode 100644
index 0000000000..8aab6a676b
--- /dev/null
+++ b/test-files/golden-tests/metadata/attributes-2.adoc
@@ -0,0 +1,36 @@
+= Reference
+:mrdocs:
+
+[#index]
+== Global namespace
+
+
+=== Functions
+
+[cols=1]
+|===
+| Name 
+
+| <<f,`f`>> 
+|===
+
+[#f]
+== f
+
+
+=== Synopsis
+
+
+Declared in `&lt;attributes&hyphen;2&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+template&lt;class T&gt;
+[[nodiscard]]
+int
+f();
+----
+
+
+
+[.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/metadata/attributes-2.cpp b/test-files/golden-tests/metadata/attributes-2.cpp
new file mode 100644
index 0000000000..1340ffbe19
--- /dev/null
+++ b/test-files/golden-tests/metadata/attributes-2.cpp
@@ -0,0 +1,4 @@
+// issue #851
+
+template <class T>
+[[nodiscard]] int f();
diff --git a/test-files/golden-tests/metadata/attributes-2.html b/test-files/golden-tests/metadata/attributes-2.html
new file mode 100644
index 0000000000..18e4ad8ba0
--- /dev/null
+++ b/test-files/golden-tests/metadata/attributes-2.html
@@ -0,0 +1,49 @@
+<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>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#f"><code>f</code></a> </td></tr>
+</tbody>
+</table>
+</div>
+<div>
+<div>
+<h2 id="f">f</h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;attributes-2.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">
+template&lt;class T&gt;
+[[nodiscard]]
+int
+f();
+</code>
+</pre>
+</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/metadata/attributes-2.xml b/test-files/golden-tests/metadata/attributes-2.xml
new file mode 100644
index 0000000000..7ca4475180
--- /dev/null
+++ b/test-files/golden-tests/metadata/attributes-2.xml
@@ -0,0 +1,16 @@
+<?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=">
+  <template>
+    <tparam name="T" class="type"/>
+    <function name="f" id="e/hP0+mSSe5Ju83w/5pueMcFgLQ=">
+      <file short-path="attributes-2.cpp" source-path="attributes-2.cpp" line="3"/>
+      <attr id="nodiscard"/>
+      <return>
+        <type name="int"/>
+      </return>
+    </function>
+  </template>
+</namespace>
+</mrdocs>

From 207d396af0ae84f04eb013fced7bd2c2185cea62 Mon Sep 17 00:00:00 2001
From: alandefreitas <alandefreitas@gmail.com>
Date: Fri, 31 Jan 2025 21:02:26 -0300
Subject: [PATCH 5/7] broken reference warnings

#feat

fix #844
---
 .../Finalizers/ReferenceFinalizer.cpp         | 20 ++---
 .../Finalizers/ReferenceFinalizer.hpp         |  3 +
 .../golden-tests/javadoc/ref/broken-ref.adoc  | 67 ++++++++++++++++
 .../golden-tests/javadoc/ref/broken-ref.cpp   | 12 +++
 .../golden-tests/javadoc/ref/broken-ref.html  | 80 +++++++++++++++++++
 .../golden-tests/javadoc/ref/broken-ref.xml   | 29 +++++++
 .../golden-tests/javadoc/{ => ref}/ref.adoc   |  0
 .../golden-tests/javadoc/{ => ref}/ref.cpp    |  0
 .../golden-tests/javadoc/{ => ref}/ref.html   |  0
 .../golden-tests/javadoc/{ => ref}/ref.xml    |  0
 10 files changed, 198 insertions(+), 13 deletions(-)
 create mode 100644 test-files/golden-tests/javadoc/ref/broken-ref.adoc
 create mode 100644 test-files/golden-tests/javadoc/ref/broken-ref.cpp
 create mode 100644 test-files/golden-tests/javadoc/ref/broken-ref.html
 create mode 100644 test-files/golden-tests/javadoc/ref/broken-ref.xml
 rename test-files/golden-tests/javadoc/{ => ref}/ref.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => ref}/ref.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => ref}/ref.html (100%)
 rename test-files/golden-tests/javadoc/{ => ref}/ref.xml (100%)

diff --git a/src/lib/Metadata/Finalizers/ReferenceFinalizer.cpp b/src/lib/Metadata/Finalizers/ReferenceFinalizer.cpp
index 271cd29226..8b07d5d85c 100644
--- a/src/lib/Metadata/Finalizers/ReferenceFinalizer.cpp
+++ b/src/lib/Metadata/Finalizers/ReferenceFinalizer.cpp
@@ -234,20 +234,14 @@ finalize(doc::Node& node)
 
         if constexpr(std::derived_from<NodeTy, doc::Reference>)
         {
-            if (!resolveReference(N))
+            if (!resolveReference(N) &&
+                !warned_.contains({N.string, current_->Name}))
             {
-                // The warning shouldn't be triggered if the symbol name
-                // has been explicitly marked excluded in mrdocs.yml.
-                // Finalizer needs to be updated to handle this case.
-                // When tagfile support is implemented, we can't
-                // report an error if the reference exists in the tagfile.
-                // if constexpr (false)
-                // {
-                //    report::warn(
-                //        "Failed to resolve reference to '{}' from '{}'",
-                //        N.string,
-                //        current_->Name);
-                // }
+                report::warn(
+                    "Failed to resolve reference to '{}' from '{}'",
+                    N.string,
+                    current_->Name);
+                warned_.insert({N.string, current_->Name});
             }
         }
     });
diff --git a/src/lib/Metadata/Finalizers/ReferenceFinalizer.hpp b/src/lib/Metadata/Finalizers/ReferenceFinalizer.hpp
index 2eced7fceb..6ac0216d6c 100644
--- a/src/lib/Metadata/Finalizers/ReferenceFinalizer.hpp
+++ b/src/lib/Metadata/Finalizers/ReferenceFinalizer.hpp
@@ -14,6 +14,8 @@
 
 #include "lib/Lib/Info.hpp"
 #include "lib/Lib/Lookup.hpp"
+#include <set>
+#include <utility>
 
 namespace clang::mrdocs {
 
@@ -30,6 +32,7 @@ class ReferenceFinalizer
     InfoSet& info_;
     SymbolLookup& lookup_;
     Info* current_ = nullptr;
+    std::set<std::pair<std::string, std::string>> warned_;
 
     bool
     resolveReference(doc::Reference& ref) const;
diff --git a/test-files/golden-tests/javadoc/ref/broken-ref.adoc b/test-files/golden-tests/javadoc/ref/broken-ref.adoc
new file mode 100644
index 0000000000..be25765095
--- /dev/null
+++ b/test-files/golden-tests/javadoc/ref/broken-ref.adoc
@@ -0,0 +1,67 @@
+= Reference
+:mrdocs:
+
+[#index]
+== Global namespace
+
+
+=== Functions
+
+[cols=2]
+|===
+| Name | Description 
+
+| <<f0,`f0`>> 
+| 
+
+| <<f1,`f1`>> 
+| See xref:#f0[f0]
+
+|===
+
+[#f0]
+== f0
+
+
+=== Synopsis
+
+
+Declared in `&lt;broken&hyphen;ref&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+void
+f0();
+----
+
+[#f1]
+== f1
+
+
+See xref:#f0[f0]
+
+=== Synopsis
+
+
+Declared in `&lt;broken&hyphen;ref&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+void
+f1();
+----
+
+=== Description
+
+
+See &colon;&colon;f2
+
+Broken should be warned only once
+
+See &colon;&colon;f2
+
+
+
+
+
+[.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/javadoc/ref/broken-ref.cpp b/test-files/golden-tests/javadoc/ref/broken-ref.cpp
new file mode 100644
index 0000000000..f390f3acd7
--- /dev/null
+++ b/test-files/golden-tests/javadoc/ref/broken-ref.cpp
@@ -0,0 +1,12 @@
+void f0();
+
+/**
+    See @ref f0
+
+    See @ref ::f2
+
+    Broken should be warned only once
+
+    See @ref ::f2
+*/
+void f1();
diff --git a/test-files/golden-tests/javadoc/ref/broken-ref.html b/test-files/golden-tests/javadoc/ref/broken-ref.html
new file mode 100644
index 0000000000..5c63016f3d
--- /dev/null
+++ b/test-files/golden-tests/javadoc/ref/broken-ref.html
@@ -0,0 +1,80 @@
+<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="#f0"><code>f0</code></a> </td><td>
+</td></tr><tr>
+<td><a href="#f1"><code>f1</code></a> </td><td><span><span>See </span><a href="#f0"><code>f0</code></a></span>
+
+</td></tr>
+</tbody>
+</table>
+</div>
+<div>
+<div>
+<h2 id="f0">f0</h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;broken-ref.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">
+void
+f0();
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
+<h2 id="f1">f1</h2>
+<div>
+<span><span>See </span><a href="#f0"><code>f0</code></a></span>
+
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;broken-ref.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">
+void
+f1();
+</code>
+</pre>
+</div>
+<div>
+<h3>Description</h3>
+<p><span>See </span><span>::f2</span></p>
+<p><span>Broken should be warned only once</span></p>
+<p><span>See </span><span>::f2</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/ref/broken-ref.xml b/test-files/golden-tests/javadoc/ref/broken-ref.xml
new file mode 100644
index 0000000000..5e8f4deec4
--- /dev/null
+++ b/test-files/golden-tests/javadoc/ref/broken-ref.xml
@@ -0,0 +1,29 @@
+<?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="f0" id="e1UQQek5v3C9OClW5cGf57XvwQo=">
+    <file short-path="broken-ref.cpp" source-path="broken-ref.cpp" line="1"/>
+  </function>
+  <function name="f1" id="CnO51rIKTzfiVKHkR3TdPa0eo+8=">
+    <file short-path="broken-ref.cpp" source-path="broken-ref.cpp" line="12"/>
+    <doc>
+      <para>
+        <text>See </text>
+        <reference id="e1UQQek5v3C9OClW5cGf57XvwQo=">f0</reference>
+      </para>
+      <para>
+        <text>See </text>
+        <reference>::f2</reference>
+      </para>
+      <para>
+        <text>Broken should be warned only once</text>
+      </para>
+      <para>
+        <text>See </text>
+        <reference>::f2</reference>
+      </para>
+    </doc>
+  </function>
+</namespace>
+</mrdocs>
diff --git a/test-files/golden-tests/javadoc/ref.adoc b/test-files/golden-tests/javadoc/ref/ref.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/ref.adoc
rename to test-files/golden-tests/javadoc/ref/ref.adoc
diff --git a/test-files/golden-tests/javadoc/ref.cpp b/test-files/golden-tests/javadoc/ref/ref.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/ref.cpp
rename to test-files/golden-tests/javadoc/ref/ref.cpp
diff --git a/test-files/golden-tests/javadoc/ref.html b/test-files/golden-tests/javadoc/ref/ref.html
similarity index 100%
rename from test-files/golden-tests/javadoc/ref.html
rename to test-files/golden-tests/javadoc/ref/ref.html
diff --git a/test-files/golden-tests/javadoc/ref.xml b/test-files/golden-tests/javadoc/ref/ref.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/ref.xml
rename to test-files/golden-tests/javadoc/ref/ref.xml

From 8af00eb011572d932bc1a1bd81d1d0275b889109 Mon Sep 17 00:00:00 2001
From: alandefreitas <alandefreitas@gmail.com>
Date: Fri, 31 Jan 2025 21:06:16 -0300
Subject: [PATCH 6/7] modularize javadoc tests

#test
---
 test-files/golden-tests/javadoc/{ => brief}/brief-1.adoc         | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-1.cpp          | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-1.html         | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-1.xml          | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-2.adoc         | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-2.cpp          | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-2.html         | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-2.xml          | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-3.adoc         | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-3.cpp          | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-3.html         | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-3.xml          | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-4.adoc         | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-4.cpp          | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-4.html         | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-4.xml          | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-5.adoc         | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-5.cpp          | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-5.html         | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-5.xml          | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-6.adoc         | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-6.cpp          | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-6.html         | 0
 test-files/golden-tests/javadoc/{ => brief}/brief-6.xml          | 0
 test-files/golden-tests/javadoc/{ => code}/code.adoc             | 0
 test-files/golden-tests/javadoc/{ => code}/code.cpp              | 0
 test-files/golden-tests/javadoc/{ => code}/code.html             | 0
 test-files/golden-tests/javadoc/{ => code}/code.xml              | 0
 test-files/golden-tests/javadoc/{ => copydoc}/copydoc.adoc       | 0
 test-files/golden-tests/javadoc/{ => copydoc}/copydoc.cpp        | 0
 test-files/golden-tests/javadoc/{ => copydoc}/copydoc.html       | 0
 test-files/golden-tests/javadoc/{ => copydoc}/copydoc.xml        | 0
 test-files/golden-tests/javadoc/{ => inline}/styled.adoc         | 0
 test-files/golden-tests/javadoc/{ => inline}/styled.cpp          | 0
 test-files/golden-tests/javadoc/{ => inline}/styled.html         | 0
 test-files/golden-tests/javadoc/{ => inline}/styled.xml          | 0
 test-files/golden-tests/javadoc/{ => lists}/li.adoc              | 0
 test-files/golden-tests/javadoc/{ => lists}/li.cpp               | 0
 test-files/golden-tests/javadoc/{ => lists}/li.html              | 0
 test-files/golden-tests/javadoc/{ => lists}/li.xml               | 0
 test-files/golden-tests/javadoc/{ => lists}/listitem.adoc        | 0
 test-files/golden-tests/javadoc/{ => lists}/listitem.cpp         | 0
 test-files/golden-tests/javadoc/{ => lists}/listitem.html        | 0
 test-files/golden-tests/javadoc/{ => lists}/listitem.xml         | 0
 test-files/golden-tests/javadoc/{ => paragraph}/par-1.adoc       | 0
 test-files/golden-tests/javadoc/{ => paragraph}/par-1.cpp        | 0
 test-files/golden-tests/javadoc/{ => paragraph}/par-1.html       | 0
 test-files/golden-tests/javadoc/{ => paragraph}/par-1.xml        | 0
 test-files/golden-tests/javadoc/{ => paragraph}/para-1.adoc      | 0
 test-files/golden-tests/javadoc/{ => paragraph}/para-1.cpp       | 0
 test-files/golden-tests/javadoc/{ => paragraph}/para-1.html      | 0
 test-files/golden-tests/javadoc/{ => paragraph}/para-1.xml       | 0
 test-files/golden-tests/javadoc/{ => paragraph}/para-2.adoc      | 0
 test-files/golden-tests/javadoc/{ => paragraph}/para-2.cpp       | 0
 test-files/golden-tests/javadoc/{ => paragraph}/para-2.html      | 0
 test-files/golden-tests/javadoc/{ => paragraph}/para-2.xml       | 0
 test-files/golden-tests/javadoc/{ => paragraph}/para-3.adoc      | 0
 test-files/golden-tests/javadoc/{ => paragraph}/para-3.cpp       | 0
 test-files/golden-tests/javadoc/{ => paragraph}/para-3.html      | 0
 test-files/golden-tests/javadoc/{ => paragraph}/para-3.xml       | 0
 test-files/golden-tests/javadoc/{ => param}/param-1.adoc         | 0
 test-files/golden-tests/javadoc/{ => param}/param-1.cpp          | 0
 test-files/golden-tests/javadoc/{ => param}/param-1.html         | 0
 test-files/golden-tests/javadoc/{ => param}/param-1.xml          | 0
 test-files/golden-tests/javadoc/{ => param}/param-direction.adoc | 0
 test-files/golden-tests/javadoc/{ => param}/param-direction.cpp  | 0
 test-files/golden-tests/javadoc/{ => param}/param-direction.html | 0
 test-files/golden-tests/javadoc/{ => param}/param-direction.xml  | 0
 test-files/golden-tests/javadoc/{ => param}/param.adoc           | 0
 test-files/golden-tests/javadoc/{ => param}/param.cpp            | 0
 test-files/golden-tests/javadoc/{ => param}/param.html           | 0
 test-files/golden-tests/javadoc/{ => param}/param.xml            | 0
 test-files/golden-tests/javadoc/{ => pre}/pre-post.adoc          | 0
 test-files/golden-tests/javadoc/{ => pre}/pre-post.cpp           | 0
 test-files/golden-tests/javadoc/{ => pre}/pre-post.html          | 0
 test-files/golden-tests/javadoc/{ => pre}/pre-post.xml           | 0
 test-files/golden-tests/javadoc/{ => throw}/throw.adoc           | 0
 test-files/golden-tests/javadoc/{ => throw}/throw.cpp            | 0
 test-files/golden-tests/javadoc/{ => throw}/throw.html           | 0
 test-files/golden-tests/javadoc/{ => throw}/throw.xml            | 0
 test-files/golden-tests/javadoc/{ => tparam}/tparam-1.adoc       | 0
 test-files/golden-tests/javadoc/{ => tparam}/tparam-1.cpp        | 0
 test-files/golden-tests/javadoc/{ => tparam}/tparam-1.html       | 0
 test-files/golden-tests/javadoc/{ => tparam}/tparam-1.xml        | 0
 84 files changed, 0 insertions(+), 0 deletions(-)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-1.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-1.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-1.html (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-1.xml (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-2.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-2.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-2.html (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-2.xml (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-3.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-3.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-3.html (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-3.xml (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-4.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-4.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-4.html (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-4.xml (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-5.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-5.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-5.html (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-5.xml (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-6.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-6.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-6.html (100%)
 rename test-files/golden-tests/javadoc/{ => brief}/brief-6.xml (100%)
 rename test-files/golden-tests/javadoc/{ => code}/code.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => code}/code.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => code}/code.html (100%)
 rename test-files/golden-tests/javadoc/{ => code}/code.xml (100%)
 rename test-files/golden-tests/javadoc/{ => copydoc}/copydoc.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => copydoc}/copydoc.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => copydoc}/copydoc.html (100%)
 rename test-files/golden-tests/javadoc/{ => copydoc}/copydoc.xml (100%)
 rename test-files/golden-tests/javadoc/{ => inline}/styled.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => inline}/styled.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => inline}/styled.html (100%)
 rename test-files/golden-tests/javadoc/{ => inline}/styled.xml (100%)
 rename test-files/golden-tests/javadoc/{ => lists}/li.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => lists}/li.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => lists}/li.html (100%)
 rename test-files/golden-tests/javadoc/{ => lists}/li.xml (100%)
 rename test-files/golden-tests/javadoc/{ => lists}/listitem.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => lists}/listitem.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => lists}/listitem.html (100%)
 rename test-files/golden-tests/javadoc/{ => lists}/listitem.xml (100%)
 rename test-files/golden-tests/javadoc/{ => paragraph}/par-1.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => paragraph}/par-1.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => paragraph}/par-1.html (100%)
 rename test-files/golden-tests/javadoc/{ => paragraph}/par-1.xml (100%)
 rename test-files/golden-tests/javadoc/{ => paragraph}/para-1.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => paragraph}/para-1.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => paragraph}/para-1.html (100%)
 rename test-files/golden-tests/javadoc/{ => paragraph}/para-1.xml (100%)
 rename test-files/golden-tests/javadoc/{ => paragraph}/para-2.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => paragraph}/para-2.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => paragraph}/para-2.html (100%)
 rename test-files/golden-tests/javadoc/{ => paragraph}/para-2.xml (100%)
 rename test-files/golden-tests/javadoc/{ => paragraph}/para-3.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => paragraph}/para-3.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => paragraph}/para-3.html (100%)
 rename test-files/golden-tests/javadoc/{ => paragraph}/para-3.xml (100%)
 rename test-files/golden-tests/javadoc/{ => param}/param-1.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => param}/param-1.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => param}/param-1.html (100%)
 rename test-files/golden-tests/javadoc/{ => param}/param-1.xml (100%)
 rename test-files/golden-tests/javadoc/{ => param}/param-direction.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => param}/param-direction.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => param}/param-direction.html (100%)
 rename test-files/golden-tests/javadoc/{ => param}/param-direction.xml (100%)
 rename test-files/golden-tests/javadoc/{ => param}/param.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => param}/param.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => param}/param.html (100%)
 rename test-files/golden-tests/javadoc/{ => param}/param.xml (100%)
 rename test-files/golden-tests/javadoc/{ => pre}/pre-post.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => pre}/pre-post.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => pre}/pre-post.html (100%)
 rename test-files/golden-tests/javadoc/{ => pre}/pre-post.xml (100%)
 rename test-files/golden-tests/javadoc/{ => throw}/throw.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => throw}/throw.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => throw}/throw.html (100%)
 rename test-files/golden-tests/javadoc/{ => throw}/throw.xml (100%)
 rename test-files/golden-tests/javadoc/{ => tparam}/tparam-1.adoc (100%)
 rename test-files/golden-tests/javadoc/{ => tparam}/tparam-1.cpp (100%)
 rename test-files/golden-tests/javadoc/{ => tparam}/tparam-1.html (100%)
 rename test-files/golden-tests/javadoc/{ => tparam}/tparam-1.xml (100%)

diff --git a/test-files/golden-tests/javadoc/brief-1.adoc b/test-files/golden-tests/javadoc/brief/brief-1.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-1.adoc
rename to test-files/golden-tests/javadoc/brief/brief-1.adoc
diff --git a/test-files/golden-tests/javadoc/brief-1.cpp b/test-files/golden-tests/javadoc/brief/brief-1.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-1.cpp
rename to test-files/golden-tests/javadoc/brief/brief-1.cpp
diff --git a/test-files/golden-tests/javadoc/brief-1.html b/test-files/golden-tests/javadoc/brief/brief-1.html
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-1.html
rename to test-files/golden-tests/javadoc/brief/brief-1.html
diff --git a/test-files/golden-tests/javadoc/brief-1.xml b/test-files/golden-tests/javadoc/brief/brief-1.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-1.xml
rename to test-files/golden-tests/javadoc/brief/brief-1.xml
diff --git a/test-files/golden-tests/javadoc/brief-2.adoc b/test-files/golden-tests/javadoc/brief/brief-2.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-2.adoc
rename to test-files/golden-tests/javadoc/brief/brief-2.adoc
diff --git a/test-files/golden-tests/javadoc/brief-2.cpp b/test-files/golden-tests/javadoc/brief/brief-2.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-2.cpp
rename to test-files/golden-tests/javadoc/brief/brief-2.cpp
diff --git a/test-files/golden-tests/javadoc/brief-2.html b/test-files/golden-tests/javadoc/brief/brief-2.html
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-2.html
rename to test-files/golden-tests/javadoc/brief/brief-2.html
diff --git a/test-files/golden-tests/javadoc/brief-2.xml b/test-files/golden-tests/javadoc/brief/brief-2.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-2.xml
rename to test-files/golden-tests/javadoc/brief/brief-2.xml
diff --git a/test-files/golden-tests/javadoc/brief-3.adoc b/test-files/golden-tests/javadoc/brief/brief-3.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-3.adoc
rename to test-files/golden-tests/javadoc/brief/brief-3.adoc
diff --git a/test-files/golden-tests/javadoc/brief-3.cpp b/test-files/golden-tests/javadoc/brief/brief-3.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-3.cpp
rename to test-files/golden-tests/javadoc/brief/brief-3.cpp
diff --git a/test-files/golden-tests/javadoc/brief-3.html b/test-files/golden-tests/javadoc/brief/brief-3.html
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-3.html
rename to test-files/golden-tests/javadoc/brief/brief-3.html
diff --git a/test-files/golden-tests/javadoc/brief-3.xml b/test-files/golden-tests/javadoc/brief/brief-3.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-3.xml
rename to test-files/golden-tests/javadoc/brief/brief-3.xml
diff --git a/test-files/golden-tests/javadoc/brief-4.adoc b/test-files/golden-tests/javadoc/brief/brief-4.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-4.adoc
rename to test-files/golden-tests/javadoc/brief/brief-4.adoc
diff --git a/test-files/golden-tests/javadoc/brief-4.cpp b/test-files/golden-tests/javadoc/brief/brief-4.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-4.cpp
rename to test-files/golden-tests/javadoc/brief/brief-4.cpp
diff --git a/test-files/golden-tests/javadoc/brief-4.html b/test-files/golden-tests/javadoc/brief/brief-4.html
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-4.html
rename to test-files/golden-tests/javadoc/brief/brief-4.html
diff --git a/test-files/golden-tests/javadoc/brief-4.xml b/test-files/golden-tests/javadoc/brief/brief-4.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-4.xml
rename to test-files/golden-tests/javadoc/brief/brief-4.xml
diff --git a/test-files/golden-tests/javadoc/brief-5.adoc b/test-files/golden-tests/javadoc/brief/brief-5.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-5.adoc
rename to test-files/golden-tests/javadoc/brief/brief-5.adoc
diff --git a/test-files/golden-tests/javadoc/brief-5.cpp b/test-files/golden-tests/javadoc/brief/brief-5.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-5.cpp
rename to test-files/golden-tests/javadoc/brief/brief-5.cpp
diff --git a/test-files/golden-tests/javadoc/brief-5.html b/test-files/golden-tests/javadoc/brief/brief-5.html
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-5.html
rename to test-files/golden-tests/javadoc/brief/brief-5.html
diff --git a/test-files/golden-tests/javadoc/brief-5.xml b/test-files/golden-tests/javadoc/brief/brief-5.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-5.xml
rename to test-files/golden-tests/javadoc/brief/brief-5.xml
diff --git a/test-files/golden-tests/javadoc/brief-6.adoc b/test-files/golden-tests/javadoc/brief/brief-6.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-6.adoc
rename to test-files/golden-tests/javadoc/brief/brief-6.adoc
diff --git a/test-files/golden-tests/javadoc/brief-6.cpp b/test-files/golden-tests/javadoc/brief/brief-6.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-6.cpp
rename to test-files/golden-tests/javadoc/brief/brief-6.cpp
diff --git a/test-files/golden-tests/javadoc/brief-6.html b/test-files/golden-tests/javadoc/brief/brief-6.html
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-6.html
rename to test-files/golden-tests/javadoc/brief/brief-6.html
diff --git a/test-files/golden-tests/javadoc/brief-6.xml b/test-files/golden-tests/javadoc/brief/brief-6.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/brief-6.xml
rename to test-files/golden-tests/javadoc/brief/brief-6.xml
diff --git a/test-files/golden-tests/javadoc/code.adoc b/test-files/golden-tests/javadoc/code/code.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/code.adoc
rename to test-files/golden-tests/javadoc/code/code.adoc
diff --git a/test-files/golden-tests/javadoc/code.cpp b/test-files/golden-tests/javadoc/code/code.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/code.cpp
rename to test-files/golden-tests/javadoc/code/code.cpp
diff --git a/test-files/golden-tests/javadoc/code.html b/test-files/golden-tests/javadoc/code/code.html
similarity index 100%
rename from test-files/golden-tests/javadoc/code.html
rename to test-files/golden-tests/javadoc/code/code.html
diff --git a/test-files/golden-tests/javadoc/code.xml b/test-files/golden-tests/javadoc/code/code.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/code.xml
rename to test-files/golden-tests/javadoc/code/code.xml
diff --git a/test-files/golden-tests/javadoc/copydoc.adoc b/test-files/golden-tests/javadoc/copydoc/copydoc.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/copydoc.adoc
rename to test-files/golden-tests/javadoc/copydoc/copydoc.adoc
diff --git a/test-files/golden-tests/javadoc/copydoc.cpp b/test-files/golden-tests/javadoc/copydoc/copydoc.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/copydoc.cpp
rename to test-files/golden-tests/javadoc/copydoc/copydoc.cpp
diff --git a/test-files/golden-tests/javadoc/copydoc.html b/test-files/golden-tests/javadoc/copydoc/copydoc.html
similarity index 100%
rename from test-files/golden-tests/javadoc/copydoc.html
rename to test-files/golden-tests/javadoc/copydoc/copydoc.html
diff --git a/test-files/golden-tests/javadoc/copydoc.xml b/test-files/golden-tests/javadoc/copydoc/copydoc.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/copydoc.xml
rename to test-files/golden-tests/javadoc/copydoc/copydoc.xml
diff --git a/test-files/golden-tests/javadoc/styled.adoc b/test-files/golden-tests/javadoc/inline/styled.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/styled.adoc
rename to test-files/golden-tests/javadoc/inline/styled.adoc
diff --git a/test-files/golden-tests/javadoc/styled.cpp b/test-files/golden-tests/javadoc/inline/styled.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/styled.cpp
rename to test-files/golden-tests/javadoc/inline/styled.cpp
diff --git a/test-files/golden-tests/javadoc/styled.html b/test-files/golden-tests/javadoc/inline/styled.html
similarity index 100%
rename from test-files/golden-tests/javadoc/styled.html
rename to test-files/golden-tests/javadoc/inline/styled.html
diff --git a/test-files/golden-tests/javadoc/styled.xml b/test-files/golden-tests/javadoc/inline/styled.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/styled.xml
rename to test-files/golden-tests/javadoc/inline/styled.xml
diff --git a/test-files/golden-tests/javadoc/li.adoc b/test-files/golden-tests/javadoc/lists/li.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/li.adoc
rename to test-files/golden-tests/javadoc/lists/li.adoc
diff --git a/test-files/golden-tests/javadoc/li.cpp b/test-files/golden-tests/javadoc/lists/li.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/li.cpp
rename to test-files/golden-tests/javadoc/lists/li.cpp
diff --git a/test-files/golden-tests/javadoc/li.html b/test-files/golden-tests/javadoc/lists/li.html
similarity index 100%
rename from test-files/golden-tests/javadoc/li.html
rename to test-files/golden-tests/javadoc/lists/li.html
diff --git a/test-files/golden-tests/javadoc/li.xml b/test-files/golden-tests/javadoc/lists/li.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/li.xml
rename to test-files/golden-tests/javadoc/lists/li.xml
diff --git a/test-files/golden-tests/javadoc/listitem.adoc b/test-files/golden-tests/javadoc/lists/listitem.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/listitem.adoc
rename to test-files/golden-tests/javadoc/lists/listitem.adoc
diff --git a/test-files/golden-tests/javadoc/listitem.cpp b/test-files/golden-tests/javadoc/lists/listitem.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/listitem.cpp
rename to test-files/golden-tests/javadoc/lists/listitem.cpp
diff --git a/test-files/golden-tests/javadoc/listitem.html b/test-files/golden-tests/javadoc/lists/listitem.html
similarity index 100%
rename from test-files/golden-tests/javadoc/listitem.html
rename to test-files/golden-tests/javadoc/lists/listitem.html
diff --git a/test-files/golden-tests/javadoc/listitem.xml b/test-files/golden-tests/javadoc/lists/listitem.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/listitem.xml
rename to test-files/golden-tests/javadoc/lists/listitem.xml
diff --git a/test-files/golden-tests/javadoc/par-1.adoc b/test-files/golden-tests/javadoc/paragraph/par-1.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/par-1.adoc
rename to test-files/golden-tests/javadoc/paragraph/par-1.adoc
diff --git a/test-files/golden-tests/javadoc/par-1.cpp b/test-files/golden-tests/javadoc/paragraph/par-1.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/par-1.cpp
rename to test-files/golden-tests/javadoc/paragraph/par-1.cpp
diff --git a/test-files/golden-tests/javadoc/par-1.html b/test-files/golden-tests/javadoc/paragraph/par-1.html
similarity index 100%
rename from test-files/golden-tests/javadoc/par-1.html
rename to test-files/golden-tests/javadoc/paragraph/par-1.html
diff --git a/test-files/golden-tests/javadoc/par-1.xml b/test-files/golden-tests/javadoc/paragraph/par-1.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/par-1.xml
rename to test-files/golden-tests/javadoc/paragraph/par-1.xml
diff --git a/test-files/golden-tests/javadoc/para-1.adoc b/test-files/golden-tests/javadoc/paragraph/para-1.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/para-1.adoc
rename to test-files/golden-tests/javadoc/paragraph/para-1.adoc
diff --git a/test-files/golden-tests/javadoc/para-1.cpp b/test-files/golden-tests/javadoc/paragraph/para-1.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/para-1.cpp
rename to test-files/golden-tests/javadoc/paragraph/para-1.cpp
diff --git a/test-files/golden-tests/javadoc/para-1.html b/test-files/golden-tests/javadoc/paragraph/para-1.html
similarity index 100%
rename from test-files/golden-tests/javadoc/para-1.html
rename to test-files/golden-tests/javadoc/paragraph/para-1.html
diff --git a/test-files/golden-tests/javadoc/para-1.xml b/test-files/golden-tests/javadoc/paragraph/para-1.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/para-1.xml
rename to test-files/golden-tests/javadoc/paragraph/para-1.xml
diff --git a/test-files/golden-tests/javadoc/para-2.adoc b/test-files/golden-tests/javadoc/paragraph/para-2.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/para-2.adoc
rename to test-files/golden-tests/javadoc/paragraph/para-2.adoc
diff --git a/test-files/golden-tests/javadoc/para-2.cpp b/test-files/golden-tests/javadoc/paragraph/para-2.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/para-2.cpp
rename to test-files/golden-tests/javadoc/paragraph/para-2.cpp
diff --git a/test-files/golden-tests/javadoc/para-2.html b/test-files/golden-tests/javadoc/paragraph/para-2.html
similarity index 100%
rename from test-files/golden-tests/javadoc/para-2.html
rename to test-files/golden-tests/javadoc/paragraph/para-2.html
diff --git a/test-files/golden-tests/javadoc/para-2.xml b/test-files/golden-tests/javadoc/paragraph/para-2.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/para-2.xml
rename to test-files/golden-tests/javadoc/paragraph/para-2.xml
diff --git a/test-files/golden-tests/javadoc/para-3.adoc b/test-files/golden-tests/javadoc/paragraph/para-3.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/para-3.adoc
rename to test-files/golden-tests/javadoc/paragraph/para-3.adoc
diff --git a/test-files/golden-tests/javadoc/para-3.cpp b/test-files/golden-tests/javadoc/paragraph/para-3.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/para-3.cpp
rename to test-files/golden-tests/javadoc/paragraph/para-3.cpp
diff --git a/test-files/golden-tests/javadoc/para-3.html b/test-files/golden-tests/javadoc/paragraph/para-3.html
similarity index 100%
rename from test-files/golden-tests/javadoc/para-3.html
rename to test-files/golden-tests/javadoc/paragraph/para-3.html
diff --git a/test-files/golden-tests/javadoc/para-3.xml b/test-files/golden-tests/javadoc/paragraph/para-3.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/para-3.xml
rename to test-files/golden-tests/javadoc/paragraph/para-3.xml
diff --git a/test-files/golden-tests/javadoc/param-1.adoc b/test-files/golden-tests/javadoc/param/param-1.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/param-1.adoc
rename to test-files/golden-tests/javadoc/param/param-1.adoc
diff --git a/test-files/golden-tests/javadoc/param-1.cpp b/test-files/golden-tests/javadoc/param/param-1.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/param-1.cpp
rename to test-files/golden-tests/javadoc/param/param-1.cpp
diff --git a/test-files/golden-tests/javadoc/param-1.html b/test-files/golden-tests/javadoc/param/param-1.html
similarity index 100%
rename from test-files/golden-tests/javadoc/param-1.html
rename to test-files/golden-tests/javadoc/param/param-1.html
diff --git a/test-files/golden-tests/javadoc/param-1.xml b/test-files/golden-tests/javadoc/param/param-1.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/param-1.xml
rename to test-files/golden-tests/javadoc/param/param-1.xml
diff --git a/test-files/golden-tests/javadoc/param-direction.adoc b/test-files/golden-tests/javadoc/param/param-direction.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/param-direction.adoc
rename to test-files/golden-tests/javadoc/param/param-direction.adoc
diff --git a/test-files/golden-tests/javadoc/param-direction.cpp b/test-files/golden-tests/javadoc/param/param-direction.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/param-direction.cpp
rename to test-files/golden-tests/javadoc/param/param-direction.cpp
diff --git a/test-files/golden-tests/javadoc/param-direction.html b/test-files/golden-tests/javadoc/param/param-direction.html
similarity index 100%
rename from test-files/golden-tests/javadoc/param-direction.html
rename to test-files/golden-tests/javadoc/param/param-direction.html
diff --git a/test-files/golden-tests/javadoc/param-direction.xml b/test-files/golden-tests/javadoc/param/param-direction.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/param-direction.xml
rename to test-files/golden-tests/javadoc/param/param-direction.xml
diff --git a/test-files/golden-tests/javadoc/param.adoc b/test-files/golden-tests/javadoc/param/param.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/param.adoc
rename to test-files/golden-tests/javadoc/param/param.adoc
diff --git a/test-files/golden-tests/javadoc/param.cpp b/test-files/golden-tests/javadoc/param/param.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/param.cpp
rename to test-files/golden-tests/javadoc/param/param.cpp
diff --git a/test-files/golden-tests/javadoc/param.html b/test-files/golden-tests/javadoc/param/param.html
similarity index 100%
rename from test-files/golden-tests/javadoc/param.html
rename to test-files/golden-tests/javadoc/param/param.html
diff --git a/test-files/golden-tests/javadoc/param.xml b/test-files/golden-tests/javadoc/param/param.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/param.xml
rename to test-files/golden-tests/javadoc/param/param.xml
diff --git a/test-files/golden-tests/javadoc/pre-post.adoc b/test-files/golden-tests/javadoc/pre/pre-post.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/pre-post.adoc
rename to test-files/golden-tests/javadoc/pre/pre-post.adoc
diff --git a/test-files/golden-tests/javadoc/pre-post.cpp b/test-files/golden-tests/javadoc/pre/pre-post.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/pre-post.cpp
rename to test-files/golden-tests/javadoc/pre/pre-post.cpp
diff --git a/test-files/golden-tests/javadoc/pre-post.html b/test-files/golden-tests/javadoc/pre/pre-post.html
similarity index 100%
rename from test-files/golden-tests/javadoc/pre-post.html
rename to test-files/golden-tests/javadoc/pre/pre-post.html
diff --git a/test-files/golden-tests/javadoc/pre-post.xml b/test-files/golden-tests/javadoc/pre/pre-post.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/pre-post.xml
rename to test-files/golden-tests/javadoc/pre/pre-post.xml
diff --git a/test-files/golden-tests/javadoc/throw.adoc b/test-files/golden-tests/javadoc/throw/throw.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/throw.adoc
rename to test-files/golden-tests/javadoc/throw/throw.adoc
diff --git a/test-files/golden-tests/javadoc/throw.cpp b/test-files/golden-tests/javadoc/throw/throw.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/throw.cpp
rename to test-files/golden-tests/javadoc/throw/throw.cpp
diff --git a/test-files/golden-tests/javadoc/throw.html b/test-files/golden-tests/javadoc/throw/throw.html
similarity index 100%
rename from test-files/golden-tests/javadoc/throw.html
rename to test-files/golden-tests/javadoc/throw/throw.html
diff --git a/test-files/golden-tests/javadoc/throw.xml b/test-files/golden-tests/javadoc/throw/throw.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/throw.xml
rename to test-files/golden-tests/javadoc/throw/throw.xml
diff --git a/test-files/golden-tests/javadoc/tparam-1.adoc b/test-files/golden-tests/javadoc/tparam/tparam-1.adoc
similarity index 100%
rename from test-files/golden-tests/javadoc/tparam-1.adoc
rename to test-files/golden-tests/javadoc/tparam/tparam-1.adoc
diff --git a/test-files/golden-tests/javadoc/tparam-1.cpp b/test-files/golden-tests/javadoc/tparam/tparam-1.cpp
similarity index 100%
rename from test-files/golden-tests/javadoc/tparam-1.cpp
rename to test-files/golden-tests/javadoc/tparam/tparam-1.cpp
diff --git a/test-files/golden-tests/javadoc/tparam-1.html b/test-files/golden-tests/javadoc/tparam/tparam-1.html
similarity index 100%
rename from test-files/golden-tests/javadoc/tparam-1.html
rename to test-files/golden-tests/javadoc/tparam/tparam-1.html
diff --git a/test-files/golden-tests/javadoc/tparam-1.xml b/test-files/golden-tests/javadoc/tparam/tparam-1.xml
similarity index 100%
rename from test-files/golden-tests/javadoc/tparam-1.xml
rename to test-files/golden-tests/javadoc/tparam/tparam-1.xml

From f1c2fad938102fa3fe5b01c732f1b8c08c64790d Mon Sep 17 00:00:00 2001
From: alandefreitas <alandefreitas@gmail.com>
Date: Fri, 31 Jan 2025 21:25:41 -0300
Subject: [PATCH 7/7] escape escape brackets in attribute lists

#fix

fix #851
---
 .../generator/common/partials/symbol/signature/field.hbs    | 2 +-
 .../generator/common/partials/symbol/signature/function.hbs | 2 +-
 test-files/golden-tests/metadata/attributes-2.adoc          | 2 +-
 test-files/golden-tests/metadata/attributes_1.adoc          | 2 +-
 test-files/golden-tests/metadata/no_unique_address.adoc     | 2 +-
 test-files/golden-tests/metadata/noreturn.adoc              | 6 +++---
 test-files/golden-tests/snippets/terminate.adoc             | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/share/mrdocs/addons/generator/common/partials/symbol/signature/field.hbs b/share/mrdocs/addons/generator/common/partials/symbol/signature/field.hbs
index adb83e6528..e43274dc59 100644
--- a/share/mrdocs/addons/generator/common/partials/symbol/signature/field.hbs
+++ b/share/mrdocs/addons/generator/common/partials/symbol/signature/field.hbs
@@ -1,4 +1,4 @@
-{{#if attributes}}[[{{join ", " attributes}}]]
+{{#if attributes}}{{ str "[[" }}{{join ", " attributes}}{{ str "]]" }}
 {{/if}}
 {{#if isMutable}}mutable
 {{/if~}}
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/signature/function.hbs b/share/mrdocs/addons/generator/common/partials/symbol/signature/function.hbs
index 3c40f6bf3e..7b2ab8d2ec 100644
--- a/share/mrdocs/addons/generator/common/partials/symbol/signature/function.hbs
+++ b/share/mrdocs/addons/generator/common/partials/symbol/signature/function.hbs
@@ -2,7 +2,7 @@
 {{/if~}}
 {{#if isFriend}}friend
 {{/if~}}
-{{#if attributes}}{{#unless isFriend}}[[{{join ", " attributes}}]]
+{{#if attributes}}{{#unless isFriend}}{{ str "[[" }}{{join ", " attributes}}{{ str "]]" }}
 {{/unless}}{{/if~}}
 {{#if constexprKind}}{{constexprKind}}
 {{/if~}}
diff --git a/test-files/golden-tests/metadata/attributes-2.adoc b/test-files/golden-tests/metadata/attributes-2.adoc
index 8aab6a676b..60b9ae8e74 100644
--- a/test-files/golden-tests/metadata/attributes-2.adoc
+++ b/test-files/golden-tests/metadata/attributes-2.adoc
@@ -26,7 +26,7 @@ Declared in `&lt;attributes&hyphen;2&period;cpp&gt;`
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 template&lt;class T&gt;
-[[nodiscard]]
+&lsqb;&lsqb;nodiscard&rsqb;&rsqb;
 int
 f();
 ----
diff --git a/test-files/golden-tests/metadata/attributes_1.adoc b/test-files/golden-tests/metadata/attributes_1.adoc
index 6a21d8d78e..10791ed4f2 100644
--- a/test-files/golden-tests/metadata/attributes_1.adoc
+++ b/test-files/golden-tests/metadata/attributes_1.adoc
@@ -25,7 +25,7 @@ Declared in `&lt;attributes&lowbar;1&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-[[nodiscard]]
+&lsqb;&lsqb;nodiscard&rsqb;&rsqb;
 bool
 f();
 ----
diff --git a/test-files/golden-tests/metadata/no_unique_address.adoc b/test-files/golden-tests/metadata/no_unique_address.adoc
index 2395065b95..e6be35b39e 100644
--- a/test-files/golden-tests/metadata/no_unique_address.adoc
+++ b/test-files/golden-tests/metadata/no_unique_address.adoc
@@ -69,7 +69,7 @@ Declared in `&lt;no&lowbar;unique&lowbar;address&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-[[deprecated, maybe&lowbar;unused]]
+&lsqb;&lsqb;deprecated, maybe&lowbar;unused&rsqb;&rsqb;
 <<Empty,Empty>> e = Empty&lcub;&rcub;;
 ----
 
diff --git a/test-files/golden-tests/metadata/noreturn.adoc b/test-files/golden-tests/metadata/noreturn.adoc
index c103d8000b..a6f698601d 100644
--- a/test-files/golden-tests/metadata/noreturn.adoc
+++ b/test-files/golden-tests/metadata/noreturn.adoc
@@ -74,7 +74,7 @@ Declared in `&lt;noreturn&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-[[noreturn]]
+&lsqb;&lsqb;noreturn&rsqb;&rsqb;
 static
 void
 f2();
@@ -91,7 +91,7 @@ Declared in `&lt;noreturn&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-[[noreturn]]
+&lsqb;&lsqb;noreturn&rsqb;&rsqb;
 void
 f3();
 ----
@@ -123,7 +123,7 @@ Declared in `&lt;noreturn&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-[[noreturn]]
+&lsqb;&lsqb;noreturn&rsqb;&rsqb;
 void
 f1();
 ----
diff --git a/test-files/golden-tests/snippets/terminate.adoc b/test-files/golden-tests/snippets/terminate.adoc
index ef0db3ac2a..baeb1edd69 100644
--- a/test-files/golden-tests/snippets/terminate.adoc
+++ b/test-files/golden-tests/snippets/terminate.adoc
@@ -29,7 +29,7 @@ Declared in `&lt;terminate&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-[[noreturn]]
+&lsqb;&lsqb;noreturn&rsqb;&rsqb;
 void
 terminate() noexcept;
 ----