updated scripts

4 files changed, 11 insertions, 4 deletions

diff --git a/doc/scripts/cleanup-autogen.pl b/doc/scripts/cleanup-autogen.pl
index fdc9ecd677..6f38f5e1f1 100755
--- a/doc/scripts/cleanup-autogen.pl
+++ b/doc/scripts/cleanup-autogen.pl
@@ -51,6 +51,12 @@ while ($line = <>) {
     $line = "\@subheading $1\n";
   }
 
+  if ($line =~ /\@cindex\s(.*)/) {
+    if ($line !~ /help/) {
+      next;
+    }
+  }
+
   print $line;
   $i++;
 }
diff --git a/doc/scripts/gdoc b/doc/scripts/gdoc
index ac5dea452a..953cd574aa 100755
--- a/doc/scripts/gdoc
+++ b/doc/scripts/gdoc
@@ -857,7 +857,7 @@ sub dump_function {
 sub dump_enum {
     my $prototype = shift @_;
 
-    if (($prototype =~ m/^\s*typedef\s+enum\s*[a-zA-Z0-9_~:]*\s*\{([a-zA-Z0-9_~=,:\s]+)\s*\}\s*([a-zA-Z0-9_]+);.*/)) {
+    if (($prototype =~ m/^\s*typedef\s+enum\s*[a-zA-Z0-9_~:]*\s*\{([\-a-zA-Z0-9_~=,:\s\(\)\<]+)\s*\}\s*([a-zA-Z0-9_]+);.*/)) {
 #        || $prototype =~ m/^\s*enum\s+([a-zA-Z0-9_~:]+).*/) {
         $args = $1;
 	$name = $2;
diff --git a/doc/scripts/getfuncs.pl b/doc/scripts/getfuncs.pl
index 383924045f..9e7680558a 100755
--- a/doc/scripts/getfuncs.pl
+++ b/doc/scripts/getfuncs.pl
@@ -42,7 +42,7 @@ while ($line=<STDIN>) {
         $func = $1;
     }
     
-    if ($func ne '' && $func =~ m/gnutls_.*/) {
+    if ($func ne '' && ($func =~ m/gnutls_.*/ || $func =~ m/dane_.*/)) {
       print $func . "\n";
     }
   }
diff --git a/doc/scripts/mytexi2latex b/doc/scripts/mytexi2latex
index 775f186e01..fe9176c52e 100755
--- a/doc/scripts/mytexi2latex
+++ b/doc/scripts/mytexi2latex
@@ -341,6 +341,8 @@ multitable:
         }
 
 	if ($verbatim == 0) {
+		$line =~ s/\</\$<\$/g;
+		$line =~ s/\>/\$>\$/g;
 		$line =~ s/\_/\\_/g;
 		$line =~ s/\~/\\~/g;
 		$line =~ s/\%(?!c)/\\%/g;
@@ -366,8 +368,7 @@ multitable:
 		$line =~ s/\@cindex (.+)/\\index{$1}/g;
 		$line =~ s/\@pindex (.+)/\\index{$1}/g;
 		$line =~ s/\@url\{($underscorematch+)\}/\\url{$1}/g;
-		#$line =~ s/\@euro/\\euro/g;
-		$line =~ s/\s*\@euro\{\}/\~\\textgreek\{\\euro\}/g;
+		#$line =~ s/\s*\@euro\{\}/\~\\textgreek\{\\euro\}/g;
 		$line =~ s/\@page/\\newpage/g;
 		$line =~ s/\@file\{($spacematch+)\}/\\file{$1}/g;
 		$line =~ s/\@code\{/\\code{/g;