[glibmm] gmmproc: DocParser: Correct the removal of link tags.

[Murray Cumming <murrayc src gnome org>]

commit eea80f82e0cc7c2a8d8d2d34984d75bcfa83368d
Author: Josà Alburquerque <jaalburqu svn gnome org>
Date:   Sat Sep 17 23:59:31 2011 -0400

    gmmproc: DocParser: Correct the removal of link tags.
    
    	* tools/pm/DocsParser.pm (convert_tags_to_doxygen): Make the matching
    	of the characters of a link tag not greedy so that the first
    	occurrence of the final '>' is accepted in a match instead of a
    	possible later one pertaining to a different tag altogether. Also
    	translate '|[' and ']|' to '@code' and '@endcode' respectively.
    
    	Bug #650544

 ChangeLog              |   12 ++++++++++++
 tools/pm/DocsParser.pm |    6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7e764ae..4c28b5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-09-17  Josà Alburquerque  <jaalburqu svn gnome org>
+
+	gmmproc: DocParser: Correct the removal of link tags.
+
+	* tools/pm/DocsParser.pm (convert_tags_to_doxygen): Make the matching
+	of the characters of a link tag not greedy so that the first
+	occurrence of the final '>' is accepted in a match instead of a
+	possible later one pertaining to a different tag altogether. Also
+	translate '|[' and ']|' to '@code' and '@endcode' respectively.
+
+	Bug #650544
+
 2.29.13:
 
 2011-09-06  Josà Alburquerque  <jaalburqu svn gnome org>
diff --git a/tools/pm/DocsParser.pm b/tools/pm/DocsParser.pm
index a041537..1a0b604 100644
--- a/tools/pm/DocsParser.pm
+++ b/tools/pm/DocsParser.pm
@@ -374,12 +374,12 @@ sub convert_tags_to_doxygen($)
     s"^Note ?\d?: "\ note "mg;
 
     s"</?programlisting>""g;
-    s"<informalexample>"\ code"g;
-    s"</informalexample>"\ endcode"g;
+    s"<informalexample>|\|\["\ code"g;
+    s"</informalexample>|]\|"\ endcode"g;
     s"<!>""g;
 
     # Remove all link tags.
-    s"</?u?link[^&]*>""g;
+    s"</?u?link[^&]*?>""g;
 
     # Remove all para tags (from tmpl sgml files).
     s"</?para>""g;