Fix links in markdown rendering

Author: rdmsr

example/cppdoc.toml

@@ -8,7 +8,7 @@ compiler_arguments = ["-Iinclude", "-std=gnu++20", "-xc++"]
 
 [pages]
 index = "README.md"
-extra = ["extra-pages/getting_started.md"]
+extra = ["extra-pages/extra-page.md"]
 
 [output]
 static_dir = "static"

example/extra-pages/getting_started.md example/extra-pages/extra-page.md

@@ -110,7 +110,7 @@ fn main() {
 
             let mut doctests = Vec::new();
 
-            render::process_namespace(root_namespace, &output.index, &mut doctests);
+            render::process_namespace(root_namespace, &output.index, &mut doctests, &config);
 
             let index = match config.pages.index {
                 Some(ref x) => std::fs::read_to_string(x).unwrap(),
@@ -120,7 +120,8 @@ fn main() {
                 },
             };
 
-            let index_html = render::process_markdown(&index, &output.index, &mut doctests);
+            let index_html =
+                render::process_markdown(&index, &output.index, &mut doctests, &config);
 
             let mut extra_pages = Vec::new();
 
@@ -133,7 +134,8 @@ fn main() {
                     }
                 };
 
-                let mut page = render::process_markdown(&page_source, &output.index, &mut doctests);
+                let mut page =
+                    render::process_markdown(&page_source, &output.index, &mut doctests, &config);
 
                 if page.title.is_empty() {
                     page.title = page_path.split("/").last().unwrap().to_string();

src/main.rs

@@ -1,3 +1,4 @@
+use crate::config::Config;
 use crate::doctest;
 use crate::parser;
 
@@ -47,6 +48,7 @@ pub fn process_markdown(
     input: &str,
     index: &HashMap<String, String>,
     doctests: &mut Vec<doctest::Doctest>,
+    config: &Config,
 ) -> Page {
     let mut code = String::new();
     let mut in_code_block = false;
@@ -146,7 +148,9 @@ pub fn process_markdown(
                     let real = get_path_for_name(url, index);
 
                     if let Some(real) = real {
-                        return Some(Event::Html(format!("<a href=\"/{}.html\">", real).into()));
+                        return Some(Event::Html(
+                            format!("<a href=\"{}/{}.html\">", config.output.base_url, real).into(),
+                        ));
                     }
                 }
             }
@@ -177,66 +181,74 @@ pub fn process_function(
     func: &mut parser::Function,
     index: &HashMap<String, String>,
     doctests: &mut Vec<doctest::Doctest>,
+    config: &Config,
 ) {
     if let Some(ref mut comment) = &mut func.comment {
-        comment.brief = process_markdown(&comment.brief, index, doctests).content;
-        comment.description = process_markdown(&comment.description, index, doctests).content;
+        comment.brief = process_markdown(&comment.brief, index, doctests, config).content;
+        comment.description =
+            process_markdown(&comment.description, index, doctests, config).content;
     }
 }
 
 pub fn process_enum(
     enm: &mut parser::Enum,
     index: &HashMap<String, String>,
     doctests: &mut Vec<doctest::Doctest>,
+    config: &Config,
 ) {
     if let Some(ref mut comment) = &mut enm.comment {
-        comment.brief = process_markdown(&comment.brief, index, doctests).content;
-        comment.description = process_markdown(&comment.description, index, doctests).content;
+        comment.brief = process_markdown(&comment.brief, index, doctests, config).content;
+        comment.description =
+            process_markdown(&comment.description, index, doctests, config).content;
     }
 }
 
 pub fn process_record(
     record: &mut parser::Record,
     index: &HashMap<String, String>,
     doctests: &mut Vec<doctest::Doctest>,
+    config: &Config,
 ) {
     if let Some(ref mut comment) = &mut record.comment {
-        comment.brief = process_markdown(&comment.brief, index, doctests).content;
-        comment.description = process_markdown(&comment.description, index, doctests).content;
+        comment.brief = process_markdown(&comment.brief, index, doctests, config).content;
+        comment.description =
+            process_markdown(&comment.description, index, doctests, config).content;
     }
 
     for method in &mut record.methods {
-        process_function(method, index, doctests);
+        process_function(method, index, doctests, config);
     }
 
     for ctor in &mut record.ctor {
-        process_function(ctor, index, doctests);
+        process_function(ctor, index, doctests, config);
     }
 }
 
 pub fn process_namespace(
     namespace: &mut parser::Namespace,
     index: &HashMap<String, String>,
     doctests: &mut Vec<doctest::Doctest>,
+    config: &Config,
 ) {
     if let Some(ref mut comment) = &mut namespace.comment {
-        comment.brief = process_markdown(&comment.brief, index, doctests).content;
-        comment.description = process_markdown(&comment.description, index, doctests).content;
+        comment.brief = process_markdown(&comment.brief, index, doctests, config).content;
+        comment.description =
+            process_markdown(&comment.description, index, doctests, config).content;
     }
 
     for func in &mut namespace.functions {
-        process_function(func, index, doctests);
+        process_function(func, index, doctests, config);
     }
 
     for record in &mut namespace.records {
-        process_record(record, index, doctests);
+        process_record(record, index, doctests, config);
     }
 
     for enm in &mut namespace.enums {
-        process_enum(enm, index, doctests);
+        process_enum(enm, index, doctests, config);
     }
 
     for ns in &mut namespace.namespaces {
-        process_namespace(ns, index, doctests);
+        process_namespace(ns, index, doctests, config);
     }
 }