Sync gdoc with GnuTLS.

2 files changed, 31 insertions, 38 deletions

diff --git a/NEWS b/NEWS
index 75a4cd3..13a2617 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Version 2.0 (unreleased)
 - Optimized tree generation.
 - Decoder can now decode BER encoded octet strings.
 - doc: Change license on the manual to GFDLv1.3+.
+- doc: Sync gdoc script with GnuTLS, changes license on man-pages to GAP.
 - Assumes system has strdup and string.h.
 - API and ABI changes since last version:
   asn1_get_length_ber: New function
diff --git a/doc/gdoc b/doc/gdoc
index 09b154a..c00f0cd 100755
--- a/doc/gdoc
+++ b/doc/gdoc
@@ -1,23 +1,28 @@
 #!/usr/bin/perl
 
-## Copyright (c) 2002, 2003, 2004, 2005, 2006 Simon Josefsson    ##
-##                    added -texinfo, -listfunc                  ##
-##                    man page revamp                            ##
-##                    various improvements                       ##
-## Copyright (c) 1998 Michael Zucchi, All Rights Reserved        ##
-##                    hacked to allow -tex option --nmav         ##
-##                                                               ##
-## This software falls under the GNU Public License. Please read ##
-##              the COPYING file for more information            ##
-
+## Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Simon Josefsson
+##                    added -texinfo, -listfunc
+##                    man page revamp
+##                    various improvements
+## Copyright (c) 2001, 2002 Nikos Mavrogiannopoulos
+##                    added -tex
+## Copyright (c) 1998 Michael Zucchi
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# This will read a 'c' file and scan for embedded comments in the
-# style of gnome comments (+minor extensions - see below).
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# This program is modified by Nikos Mavroyanopoulos, for the gnutls
-# project.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Note: This only supports 'c'.
+# This will read a C source code file and scan for embedded comments
+# in the style of gnome comments (+minor extensions - see below).
 
 # usage:
 # gdoc [ -docbook | -html | -text | -man | -tex | -texinfo | -listfunc ]
@@ -306,24 +311,6 @@ sub repstr {
     $return;
 }
 
-sub output_highlight {
-    my $contents = join "\n", @_;
-    my $line;
-
-    foreach $pattern (keys %highlights) {
-#	print "scanning pattern $pattern ($highlights{$pattern})\n";
-	$contents =~ s:$pattern:repstr($pattern, $highlights{$pattern}, $1, $2, $3, $4):gse;
-    }
-    foreach $line (split "\n", $contents) {
-	if ($line eq ""){
-	    print $lineprefix, $blankline;
-	} else {
-	    print $lineprefix, $line;
-	}
-	print "\n";
-    }
-}
-
 sub just_highlight {
     my $contents = join "\n", @_;
     my $line;
@@ -345,6 +332,10 @@ sub just_highlight {
     return $ret;
 }
 
+sub output_highlight {
+    print (just_highlight (@_));
+}
+
 # output in texinfo
 sub output_texinfo {
     my %args = %{$_[0]};
@@ -628,7 +619,9 @@ sub output_man {
     print ".SH ARGUMENTS\n";
     foreach $parameter (@{$args{'parameterlist'}}) {
 	print ".IP \"".$args{'parametertypes'}{$parameter}." ".$parameter."\" 12\n";
-	output_highlight($args{'parameters'}{$parameter});
+	$param = $args{'parameters'}{$parameter};
+	$param =~ s/-/\\-/g;
+	output_highlight($param);
     }
     foreach $section (@{$args{'sectionlist'}}) {
 	print ".SH \"" . uc($section) . "\"\n";
@@ -647,9 +640,9 @@ sub output_man {
 	print "Copyright \\(co ". $args{'copyright'} . ".\n";
 	if ($args{'verbatimcopying'}) {
 	    print ".br\n";
-	    print "Permission is granted to make and distribute verbatim copies of this\n";
-	    print "manual provided the copyright notice and this permission notice are\n";
-	    print "preserved on all copies.\n";
+	    print "Copying and distribution of this file, with or without modification,\n";
+	    print "are permitted in any medium without royalty provided the copyright\n";
+	    print "notice and this notice are preserved.\n";
 	}
     }
 
@@ -902,4 +895,3 @@ foreach $file (@ARGV) {
 	}
     }
 }
-