Commit 7def81cf4266a66ed513807197708eacf1c7a2d2
2021-09-30T17:34:25
wikiheaders.pl: Don't treat chars in `code` blocks as markdown. Otherwise a formula like `x = y * 2;` would treat that '*' as the start of an italicized section when converting to MediaWiki format, and match any other '*' in the content as the end marker.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
diff --git a/build-scripts/wikiheaders.pl b/build-scripts/wikiheaders.pl
index 2dc02f0..602b109 100755
--- a/build-scripts/wikiheaders.pl
+++ b/build-scripts/wikiheaders.pl
@@ -136,14 +136,21 @@ sub wikify_chunk {
#print("\n\nWIKIFY CHUNK:\n\n$str\n\n\n");
if ($wikitype eq 'mediawiki') {
+ # convert `code` things first, so they aren't mistaken for other markdown items.
+ my $codedstr = '';
+ while ($str =~ s/\A(.*?)\`(.*?)\`//ms) {
+ my $codeblock = $2;
+ $codedstr .= wikify_chunk($wikitype, $1, undef, undef);
+ # Convert obvious SDL things to wikilinks, even inside `code` blocks.
+ $codeblock =~ s/\b(SDL_[a-zA-Z0-9_]+)/[[$1]]/gms;
+ $codedstr .= "<code>$codeblock</code>";
+ }
+
# Convert obvious SDL things to wikilinks.
$str =~ s/\b(SDL_[a-zA-Z0-9_]+)/[[$1]]/gms;
# Make some Markdown things into MediaWiki...
- # <code></code> is also popular. :/
- $str =~ s/\`(.*?)\`/<code>$1<\/code>/gms;
-
# bold+italic
$str =~ s/\*\*\*(.*?)\*\*\*/'''''$1'''''/gms;
@@ -156,6 +163,8 @@ sub wikify_chunk {
# bullets
$str =~ s/^\- /* /gm;
+ $str = $codedstr . $str;
+
if (defined $code) {
$str .= "<syntaxhighlight lang='$codelang'>$code<\/syntaxhighlight>";
}