Skip to content

Commit 92bf36e

Browse files
authored
Merge pull request doxygen#12097 from albert-github/feature/bug_doxywizard_config
Incorrect link in configuration documentation doxywizard
2 parents bb49381 + 0fa7e7e commit 92bf36e

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

addon/doxywizard/expert.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -462,11 +462,6 @@ static QString getDocsForNode(const QDomElement &child)
462462
// \#undef -> #undef
463463
docs.replace(SA("\\#include"),SA("#include"));
464464
docs.replace(SA("\\#undef"),SA("#undef"));
465-
// -# -> <br>-
466-
// " - " -> <br>-
467-
docs.replace(SA("-#"),SA("<br>-"));
468-
docs.replace(SA("\\# "),SA("# "));
469-
docs.replace(SA(" - "),SA("<br>-"));
470465
// \verbatim -> <pre>
471466
// \endverbatim -> </pre>
472467
docs.replace(SA("\\verbatim"),SA("<pre>"));
@@ -499,6 +494,11 @@ static QString getDocsForNode(const QDomElement &child)
499494
docs.replace(regexp,SA("2^(16+LOOKUP_CACHE_SIZE)"));
500495
regexp.setPattern(SA("\\\\f\\$2\\^\\{16\\} = 65536\\\\f\\$"));
501496
docs.replace(regexp,SA("2^16=65536"));
497+
// -# -> <br>-
498+
// " - " -> <br>-
499+
docs.replace(SA("-#"),SA("<br>-"));
500+
docs.replace(SA("\\# "),SA("# "));
501+
docs.replace(SA(" - "),SA("<br>-"));
502502

503503
return docs.trimmed();
504504
}

src/config.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4289,14 +4289,14 @@ to be found in the default search path.
42894289
The \c MERMAID_JS_URL tag specifies the URL to load \c mermaid.js from when using
42904290
client-side rendering (\c MERMAID_RENDER_MODE is \c CLIENT_SIDE or \c AUTO).
42914291
The default points to the latest Mermaid v11 release on the jsDelivr CDN.
4292+
<br>
4293+
The default CDN URL requires internet access when viewing the generated documentation.
4294+
For offline use, download \c mermaid.esm.min.mjs and set this to a relative path,
4295+
or use \c MERMAID_RENDER_MODE=CLI to pre-generate images instead.
42924296
\par Examples:
42934297
- Latest v11 (default): \c 'https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.esm.min.mjs'
42944298
- Pinned version: \c 'https://cdn.jsdelivr.net/npm/mermaid@11.3.0/dist/mermaid.esm.min.mjs'
42954299
- Local copy: \c './mermaid.esm.min.mjs' (user must place file in HTML output directory)
4296-
\par
4297-
The default CDN URL requires internet access when viewing the generated documentation.
4298-
For offline use, download \c mermaid.esm.min.mjs and set this to a relative path,
4299-
or use \c MERMAID_RENDER_MODE=CLI to pre-generate images instead.
43004300
]]>
43014301
</docs>
43024302
</option>

0 commit comments

Comments
 (0)