Gdoc updated. Now handles powers and '->' symbol automatically for tex.

3 files changed, 21 insertions, 16 deletions

diff --git a/doc/scripts/gdoc b/doc/scripts/gdoc
index be9bc2352d..fc62f29001 100755
--- a/doc/scripts/gdoc
+++ b/doc/scripts/gdoc
@@ -10,11 +10,13 @@
 # This will read a 'c' file and scan for embedded comments in the
 # style of gnome comments (+minor extensions - see below).
 #
+# This program is modified by Nikos Mavroyanopoulos, for the gnutls
+# project.
 
 # Note: This only supports 'c'.
 
 # usage:
-# gdoc [ -docbook | -html | -text | -man ]
+# gdoc [ -docbook | -html | -text | -man | -tex ]
 #      [ -function funcname [ -function funcname ...] ] c file(s)s > outputfile
 #
 #  Set output format using one of -docbook -html -text or -man.  Default is man.
@@ -339,6 +341,9 @@ sub output_tex {
 	$sec = $args{'sections'}{$section};
 	$sec =~ s/_/\\_/g;
 	$sec =~ s/&/\\&/g;
+	$sec =~ s/->/\$\\rightarrow\$/g;
+	$sec =~ s/([0-9]+)\^([0-9]+)/\$\{\1\}\^\{\2\}\$/g;
+
 	output_highlight($sec);
 	print "\\end{rmfamily}\n";
     }
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index 9628c64892..0f56ab912d 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -1158,7 +1158,7 @@ size_t gnutls_get_max_record_size( GNUTLS_STATE state) {
   * This property can only be set to clients. The server may
   * choose not to accept the requested size.
   *
-  * Acceptable values are $2^{9}, 2^{10}, 2^{11}$ and $2^{12}$.
+  * Acceptable values are 2^9, 2^10, 2^11 and 2^12.
   * Returns 0 on success. The requested record size does not
   * get in effect immediately. It will be used after a successful
   * handshake.
diff --git a/lib/x509_asn1.c b/lib/x509_asn1.c
index 39b956a7e6..5cc14d5d10 100755
--- a/lib/x509_asn1.c
+++ b/lib/x509_asn1.c
@@ -897,35 +897,35 @@ _asn1_append_sequence_set(node_asn *node)
   * 
   * Examples:  description for each type
   *   INTEGER: VALUE must contain a two's complement form integer.
-  *            value[0]=0xFF ,               len=1 $\rightarrow$ integer=-1
-  *            value[0]=0xFF value[1]=0xFF , len=2 $\rightarrow$ integer=-1
-  *            value[0]=0x01 ,               len=1 $\rightarrow$ integer= 1
-  *            value[0]=0x00 value[1]=0x01 , len=2 $\rightarrow$ integer= 1
-  *            value="123"                 , len=0 $\rightarrow$ integer= 123
+  *            value[0]=0xFF ,               len=1 -> integer=-1
+  *            value[0]=0xFF value[1]=0xFF , len=2 -> integer=-1
+  *            value[0]=0x01 ,               len=1 -> integer= 1
+  *            value[0]=0x00 value[1]=0x01 , len=2 -> integer= 1
+  *            value="123"                 , len=0 -> integer= 123
   *   ENUMERATED: as INTEGER (but only with not negative numbers)
   *   BOOLEAN: VALUE must be the null terminated string "TRUE" or "FALSE" and LEN != 0
-  *            value="TRUE" , len=1 $\rightarrow$ boolean=TRUE
-  *            value="FALSE" , len=1 $\rightarrow$ boolean=FALSE
+  *            value="TRUE" , len=1 -> boolean=TRUE
+  *            value="FALSE" , len=1 -> boolean=FALSE
   *   OBJECT IDENTIFIER: VALUE must be a null terminated string with each number separated by
   *                      a blank (e.g. "1 2 3 543 1"). 
   *                      LEN != 0
-  *            value="1 2 840 10040 4 3" , len=1 $\rightarrow$ OID=dsa-with-sha
+  *            value="1 2 840 10040 4 3" , len=1 -> OID=dsa-with-sha
   *   UTCTime: VALUE must be a null terminated string in one of these formats:
   *            "YYMMDDhhmmssZ" "YYMMDDhhmmssZ" "YYMMDDhhmmss+hh'mm'" "YYMMDDhhmmss-hh'mm'"
   *            "YYMMDDhhmm+hh'mm'" "YYMMDDhhmm-hh'mm'".  
   *            LEN != 0
-  *            value="9801011200Z" , len=1 $\rightarrow$ time=Jannuary 1st, 1998 at 12h 00m  Greenwich Mean Time
+  *            value="9801011200Z" , len=1 -> time=Jannuary 1st, 1998 at 12h 00m  Greenwich Mean Time
   *   GeneralizedTime: VALUE must be in one of this format:
   *                    "YYYYMMDDhhmmss.sZ" "YYYYMMDDhhmmss.sZ" "YYYYMMDDhhmmss.s+hh'mm'" 
   *                    "YYYYMMDDhhmmss.s-hh'mm'" "YYYYMMDDhhmm+hh'mm'" "YYYYMMDDhhmm-hh'mm'" 
   *                    where ss.s indicates the seconds with any precision like "10.1" or "01.02".
   *                    LEN != 0
-  *            value="2001010112001.12-0700" , len=1 $\rightarrow$ time=Jannuary 1st, 2001 at 12h 00m 01.12s 
+  *            value="2001010112001.12-0700" , len=1 -> time=Jannuary 1st, 2001 at 12h 00m 01.12s 
   *                                                     Pacific Daylight Time
   *   OCTET STRING: VALUE contains the octet string and LEN is the number of octet.
-  *            value="$\backslash$x01$\backslash$x02$\backslash$x03" , len=3  $\rightarrow$ three bytes octet string
+  *            value="$\backslash$x01$\backslash$x02$\backslash$x03" , len=3  -> three bytes octet string
   *   BIT STRING: VALUE contains the bit string organized by bytes and LEN is the number of bits.
-  *            value="$\backslash$xCF" , len=6 $\rightarrow$ bit string="110011" (six bits)
+  *            value="$\backslash$xCF" , len=6 -> bit string="110011" (six bits)
   *   CHOICE: if NAME indicates a choice type, VALUE must specify one of the alternatives with a
   *           null terminated string. LEN != 0
   *           Using "pkix.asn":
@@ -1204,8 +1204,8 @@ asn1_write_value(node_asn *node_root,char *name,unsigned char *value,int len)
   * 
   * Examples: a description for each type
   *   INTEGER: VALUE will contain a two's complement form integer.
-  *            integer=-1  $\rightarrow$ value[0]=0xFF , len=1
-  *            integer=1   $\rightarrow$ value[0]=0x01 , len=1
+  *            integer=-1  -> value[0]=0xFF , len=1
+  *            integer=1   -> value[0]=0x01 , len=1
   *   ENUMERATED: as INTEGER (but only with not negative numbers)
   *   BOOLEAN: VALUE will be the null terminated string "TRUE" or "FALSE" and LEN=5 or LEN=6
   *   OBJECT IDENTIFIER: VALUE will be a null terminated string with each number separated by