Merge pull request kivikakk#150 from yujiri8/master

Add option to escape HTML instead of clobber (fix kivikakk#149)
BloopAI · Aug 11, 2020 · b46e3a2 · b46e3a2
2 parents aa714d9 + c70d51b
commit b46e3a2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/html.rs b/src/html.rs
@@ -476,7 +476,9 @@ impl<'o> HtmlFormatter<'o> {
             },
             NodeValue::HtmlBlock(ref nhb) => if entering {
                 self.cr()?;
-                if !self.options.render.unsafe_ {
+                if self.options.render.escape {
+                    self.escape(&nhb.literal)?;
+                } else if !self.options.render.unsafe_ {
                     self.output.write_all(b"<!-- raw HTML omitted -->")?;
                 } else if self.options.extension.tagfilter {
                     tagfilter_block(&nhb.literal, &mut self.output)?;
@@ -541,7 +543,9 @@ impl<'o> HtmlFormatter<'o> {
                 self.output.write_all(b"</code>")?;
             },
             NodeValue::HtmlInline(ref literal) => if entering {
-                if !self.options.render.unsafe_ {
+                if self.options.render.escape {
+                    self.escape(&literal)?;
+                } else if !self.options.render.unsafe_ {
                     self.output.write_all(b"<!-- raw HTML omitted -->")?;
                 } else if self.options.extension.tagfilter && tagfilter(literal) {
                     self.output.write_all(b"&lt;")?;

diff --git a/src/main.rs b/src/main.rs
@@ -56,6 +56,11 @@ fn main() -> Result<(), Box<dyn Error>> {
                 .long("unsafe")
                 .help("Allow raw HTML and dangerous URLs"),
         )
+        .arg(
+            clap::Arg::with_name("escape")
+                .long("escape")
+                .help("Escape raw HTML instead of clobbering it"),
+        )
         .arg(
             clap::Arg::with_name("extension")
                 .short("e")
@@ -134,6 +139,7 @@ fn main() -> Result<(), Box<dyn Error>> {
                 .parse()
                 .unwrap_or(0),
             unsafe_: matches.is_present("unsafe"),
+            escape: matches.is_present("escape"),
         },
     };
 

diff --git a/src/parser/mod.rs b/src/parser/mod.rs
@@ -381,6 +381,21 @@ pub struct ComrakRenderOptions {
     ///             <p><a href=\"http://commonmark.org\">Safe</a>.</p>\n");
     /// ```
     pub unsafe_: bool,
+
+    /// Escape raw HTML instead of clobbering it.
+    /// ```
+    /// # use comrak::{markdown_to_html, ComrakOptions};
+    /// let mut options = ComrakOptions::default();
+    /// let input = "<i>italic text</i>";
+    ///
+    /// assert_eq!(markdown_to_html(input, &options),
+    ///            "<p><!-- raw HTML omitted -->italic text<!-- raw HTML omitted --></p>\n");
+    ///
+    /// options.render.escape = true;
+    /// assert_eq!(markdown_to_html(input, &options),
+    ///            "<p>&lt;i&gt;italic text&lt;/i&gt;</p>\n");
+    /// ```
+    pub escape: bool,
 }
 
 #[derive(Clone)]