Commit 5c98fc03 authored by Johannes Berg's avatar Johannes Berg Committed by Sam Ravnborg

kernel-doc: fix xml output mode

After Randy's patch fixing the HTML output in DOC: sections
(6b5b55f6) the same bug remained in XML
mode, this fixes it.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 8561b089
...@@ -182,10 +182,10 @@ my $blankline_html = $local_lt . "p" . $local_gt; # was "<p>" ...@@ -182,10 +182,10 @@ my $blankline_html = $local_lt . "p" . $local_gt; # was "<p>"
my %highlights_xml = ( "([^=])\\\"([^\\\"<]+)\\\"", "\$1<quote>\$2</quote>", my %highlights_xml = ( "([^=])\\\"([^\\\"<]+)\\\"", "\$1<quote>\$2</quote>",
$type_constant, "<constant>\$1</constant>", $type_constant, "<constant>\$1</constant>",
$type_func, "<function>\$1</function>", $type_func, "<function>\$1</function>",
$type_struct, "<structname>\$1</structname>", $type_struct_xml, "<structname>\$1</structname>",
$type_env, "<envar>\$1</envar>", $type_env, "<envar>\$1</envar>",
$type_param, "<parameter>\$1</parameter>" ); $type_param, "<parameter>\$1</parameter>" );
my $blankline_xml = "</para><para>\n"; my $blankline_xml = $local_lt . "/para" . $local_gt . $local_lt . "para" . $local_gt . "\n";
# gnome, docbook format # gnome, docbook format
my %highlights_gnome = ( $type_constant, "<replaceable class=\"option\">\$1</replaceable>", my %highlights_gnome = ( $type_constant, "<replaceable class=\"option\">\$1</replaceable>",
...@@ -394,7 +394,7 @@ sub output_highlight { ...@@ -394,7 +394,7 @@ sub output_highlight {
# confess "output_highlight got called with no args?\n"; # confess "output_highlight got called with no args?\n";
# } # }
if ($output_mode eq "html") { if ($output_mode eq "html" || $output_mode eq "xml") {
$contents = local_unescape($contents); $contents = local_unescape($contents);
# convert data read & converted thru xml_escape() into &xyz; format: # convert data read & converted thru xml_escape() into &xyz; format:
$contents =~ s/\\\\\\/&/g; $contents =~ s/\\\\\\/&/g;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment