[SCM] GNU gnutls branch, master, updated. gnutls_3_0_17-1-g3043f86

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=3043f8631aaa0514e361395bceca1eec5a0d2fa6

The branch, master has been updated
       via  3043f8631aaa0514e361395bceca1eec5a0d2fa6 (commit)
      from  89856c82cc0a29a3566c9362354473baa39ba9a9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3043f8631aaa0514e361395bceca1eec5a0d2fa6
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Mar 17 12:55:14 2012 +0100

    texinfo documentation is similar to the printed manual.

-----------------------------------------------------------------------

Summary of changes:
 doc/Makefile.am           |   10 +++++++++-
 doc/gnutls.texi           |   28 +++++++++++++---------------
 doc/scripts/split-texi.pl |   20 ++++++++++++++------
 3 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1f31d3d..7455c1b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -188,6 +188,14 @@ HEADER_FILES = 
$(top_srcdir)/lib/includes/gnutls/gnutls.h.in \
        $(top_srcdir)/lib/includes/gnutls/dtls.h 
$(top_srcdir)/lib/includes/gnutls/crypto.h \
        $(top_srcdir)/lib/includes/gnutls/ocsp.h
 
+stamp_functions: gnutls-api.texi x509-api.texi pgp-api.texi pkcs12-api.texi 
pkcs11-api.texi abstract-api.texi compat-api.texi dtls-api.texi crypto-api.texi 
ocsp-api.texi
+       for i in $^; do \
+               $(srcdir)/scripts/split-texi.pl functions < $$i; \
+       done
+       sed -i 's/address@hidden//g' functions/*
+       sed -i 's/address@hidden//g' functions/*
+       echo $@ > $@
+
 gnutls-api.texi: $(top_srcdir)/lib/includes/gnutls/gnutls.h.in
        echo "" > address@hidden
        for i in `$(top_srcdir)/doc/scripts/getfuncs.pl 
<$(top_srcdir)/lib/includes/gnutls/gnutls.h.in|sort|uniq`; do \
@@ -387,7 +395,7 @@ ENUMS += enums/gnutls_x509_crt_fmt_t
 ENUMS += enums/gnutls_x509_subject_alt_name_t
 
 gnutls_TEXINFOS += $(ENUMS)
-DISTCLEANFILES += $(ENUMS) stamp_enums
+DISTCLEANFILES += $(ENUMS) stamp_enums stamp_functions
 
 stamp_enums: enums.texi
        $(MAKE) compare-makefile
diff --git a/doc/gnutls.texi b/doc/gnutls.texi
index 9d98de5..4d30e1d 100644
--- a/doc/gnutls.texi
+++ b/doc/gnutls.texi
@@ -75,60 +75,58 @@ Documentation License''.
 @end macro
 
 @macro showfuncA{ref}
address@hidden
address@hidden @code
 @item @ref{\ref\}
address@hidden itemize
address@hidden table
 @end macro
 
 @macro showfuncB{ref1,ref2}
address@hidden
address@hidden @code
 @item @ref{\ref1\}
 @item @ref{\ref2\}
address@hidden itemize
address@hidden table
 @end macro
 
 @macro showfuncC{ref1,ref2,ref3}
address@hidden
address@hidden @code
 @item @ref{\ref1\}
 @item @ref{\ref2\}
 @item @ref{\ref3\}
address@hidden itemize
address@hidden table
 @end macro
 
 @macro showfuncD{ref1,ref2,ref3,ref4}
address@hidden
address@hidden @code
 @item @ref{\ref1\}
 @item @ref{\ref2\}
 @item @ref{\ref3\}
 @item @ref{\ref4\}
address@hidden itemize
address@hidden table
 @end macro
 
 @macro showfuncE{ref1,ref2,ref3,ref4,ref5}
address@hidden
address@hidden @code
 @item @ref{\ref1\}
 @item @ref{\ref2\}
 @item @ref{\ref3\}
 @item @ref{\ref4\}
 @item @ref{\ref5\}
address@hidden itemize
address@hidden table
 @end macro
 
 @macro showfuncF{ref1,ref2,ref3,ref4,ref5,ref6}
address@hidden
address@hidden @code
 @item @ref{\ref1\}
 @item @ref{\ref2\}
 @item @ref{\ref3\}
 @item @ref{\ref4\}
 @item @ref{\ref5\}
 @item @ref{\ref6\}
address@hidden itemize
address@hidden table
 @end macro
 
 @macro showfuncdesc{ref}
address@hidden
address@hidden @ref{\ref\}
address@hidden itemize
address@hidden functions/\ref\
 @end macro
 
 @macro showenumdesc{ref,cap}
diff --git a/doc/scripts/split-texi.pl b/doc/scripts/split-texi.pl
index 63c2f76..edb99fe 100755
--- a/doc/scripts/split-texi.pl
+++ b/doc/scripts/split-texi.pl
@@ -23,7 +23,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
 $dir = shift;
 $param2 = shift;
 
-if ($param2 ne '') {
+if (defined $param2 && $param2 ne '') {
   $enum = 1;
 } else {
   $enum = 0;
@@ -36,21 +36,29 @@ sub key_of_record {
   my @lines = split /\n/, $record;
 
   my ($i) = 1;
-  my ($key) = $lines[$i]; 
+  my ($key) = '';
+  $key = $lines[$i] if (defined $lines[$i]);
 
   if ($enum == 1) {
     while( !($key =~ m/address@hidden(.*)\n/) && ($i < 5)) { $i=$i+1; $key = 
$lines[$i]; }
   } else {
-    while( !($key =~ m/^\\functionTitle\{(.*)\}/) && ($i < 5)) { $i=$i+1; $key 
= $lines[$i]; }
+    while( !($key =~ m/address@hidden(.*)/) && ($i < 5)) { 
+      $i=$i+1; 
+      if (defined $lines[$i]) {
+        $key = $lines[$i]; 
+      } else {
+        $key = '';
+      }
+    }
   }
 
   return $key;
 }
 
 if ($enum == 1) {
-  $/="address@hidden table";          # Records are separated by blank lines.
+  $/="address@hidden table";
 } else {
-  $/="\n\\end{function}";          # Records are separated by blank lines.
+  $/="address@hidden deftypefun";
 }
 @records = <>;  # Read in whole file, one record per array element.
 
@@ -68,7 +76,7 @@ foreach (@records) {
     $key =~ m/address@hidden(.*)\n/;
     $key = $1;
   } else {
-    $key =~ m/\\functionTitle\{(.*)\}/;
+    $key =~ m/address@hidden(.*)\n/;
     $key = $1;
   }
 


hooks/post-receive
-- 
GNU gnutls