[gtk-doc] Don't attempt to markup inside <> tags

[William Jon McCann <mccann src gnome org>]

commit 758ebc5ec8c0b603c283a57db63735e1cb286fde
Author: William Jon McCann <william jon mccann gmail com>
Date:   Tue Feb 4 11:01:51 2014 -0500

    Don't attempt to markup inside <> tags
    
    https://bugzilla.gnome.org/show_bug.cgi?id=723417

 gtkdoc-mkdb.in |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 insertions(+), 3 deletions(-)
---
diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in
index 052c354..5bb9f45 100755
--- a/gtkdoc-mkdb.in
+++ b/gtkdoc-mkdb.in
@@ -4824,8 +4824,18 @@ sub MarkDownParseBlocks {
 
     # indentation insensitive types
 
-    if ($line =~ /^[ ]*<(\w+)[^>]*([\/])?[ \t]*>/) {
-      # markup
+    if ($line =~ /^[ ]*<!DOCTYPE/) {
+      push @md_blocks, $md_block;
+
+      $md_block = { type   => "markup",
+                    text   => $deindented_line,
+                    start  => "<",
+                    end    => ">",
+                    closed => 0,
+                    depth  => 0 };
+
+    } elsif ($line =~ /^[ ]*<\??(\w+)[^>]*([\/\?])?[ \t]*>/) {
+      # markup, including <?xml version="1.0"?>
       my $tag = $1;
       my $is_self_closing = defined($2);
 
@@ -5013,6 +5023,24 @@ sub MarkDownParseSpanElementsInner {
           $offset = 1;
         }
       }
+    } elsif ($closest_marker eq "<") {
+      if ($text =~ /^<(https?:[\/]{2}[^\s]+?)>/i) {
+        my $element_url = $1;
+        $element_url =~ s/&/&amp;/g;
+        $element_url =~ s/</&lt;/g;
+
+        $markup .= "<ulink url=\"" . $element_url . "\">" . $element_url . "</ulink>";
+        $offset = length ($&);
+      } elsif ($text =~ /^<(\S+? \S+?)>/) {
+        $markup .= "<ulink url=\"mailto:"; . $1 . "\">" . $1 . "</a>";
+        $offset = length ($&);
+      } elsif ($text =~ /^<[^>]+?>/) {
+        $markup .= $&;
+        $offset = length ($&);
+      } else {
+        $markup .= "&lt;";
+        $offset = 1;
+      }
     } elsif ($closest_marker eq "`") {
       if ($text =~ /^(`+)([^`]+?)\1(?!`)/) {
         my $element_text = $2;
@@ -5034,7 +5062,7 @@ sub MarkDownParseSpanElementsInner {
 
 sub MarkDownParseSpanElements {
   my ($text) = @_;
-  my @markers = ( '![', '[', '`' );
+  my @markers = ( '<', '![', '[', '`' );
 
   return &MarkDownParseSpanElementsInner ($text, \ markers);
 }