Turn off Markdown interpretation of HTML blocks in markdown files

Fixes openssl/project#394

Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/web/pull/447)

diff --git a/bin/fix-man-html b/bin/fix-man-html
deleted file mode 100755 (executable)
index 3caad2a..0000000
--- a/bin/fix-man-html
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /usr/bin/env perl
-
-# The pod source may contain things that can be reinterpreted as markdown,
-# and thereby rendered incorrectly.  This script fixes that, usually by
-# replacing some character with the corresponding HTML character entity.
-
-local $/;                       # Slurp the whole file
-my $contents = <STDIN>;
-
-$contents =~ s|\]\(|\&rbrack;(|g; # ]( suggests a markdown link
-
-print $contents;

diff --git a/bin/md-to-html5 b/bin/md-to-html5
index 7a6aabd448fb92db6487f66e33e12c0e372b5b10..051d960c087fc7774e9d6c4e4935dd706d617ef2 100755 (executable)
--- a/bin/md-to-html5
+++ b/bin/md-to-html5
@@ -177,7 +177,8 @@ for f in "$@"; do
         input_file="$HERE/../$f"
     fi
 
-    pandoc -t html5 -f markdown --template="$template" \
+    pandoc -t html5 -f markdown-markdown_in_html_blocks \
+        --template="$template" \
         --highlight-style="$highlightstyle" \
         --tab-stop=8 --shift-heading-level-by=1 \
         -M author-meta='OpenSSL Foundation, Inc.' \

diff --git a/bin/strip-man-html b/bin/strip-man-html
index 0a1bf168bb4ad349452fd90bf5d20fc710c043a7..fb50971ca53433d7938d5de867bbc281603d4e73 100755 (executable)
--- a/bin/strip-man-html
+++ b/bin/strip-man-html
@@ -15,7 +15,5 @@ $contents = $`;                 # </body> and everything after is stripped
 
 # Adapt all H tags to be wrapped inside H1 and H2
 $contents =~ s@(</?h)(\d)(\s|>)@$1.($2 + 2).$3@emg;
-#added from /bin/fix-man-html
-$contents =~ s|\]\(|\&rbrack;(|g; # ]( suggests a markdown link
 
 print $contents;