updates.
authorPekka Riikonen <priikone@silcnet.org>
Sat, 9 Feb 2002 20:21:55 +0000 (20:21 +0000)
committerPekka Riikonen <priikone@silcnet.org>
Sat, 9 Feb 2002 20:21:55 +0000 (20:21 +0000)
13 files changed:
Makefile.am.pre
configure.in.pre
doc/Makefile.am.pre
doc/box.gif [new file with mode: 0644]
doc/box2.gif [new file with mode: 0644]
doc/dot.gif [new file with mode: 0644]
doc/index_pic.gif [new file with mode: 0644]
lib/LIBINDEX
lib/silcclient/silcclient_using.html
scripts/silcdoc/gen_html_index.php [new file with mode: 0644]
scripts/silcdoc/gen_index.php [new file with mode: 0644]
scripts/silcdoc/silcdoc
util/robodoc/Source/generator.c

index dad214450bcfa82ef841d36a3c6ae7306e07cd26..4f4606118d511f7ab4ea293652cf42216aae7346 100644 (file)
@@ -73,6 +73,7 @@ toolkit-install:
        -mkdir -p $(docdir)/toolkit/
        -$(INSTALL_DATA) $(srcdir)/doc/toolkit/silc* $(docdir)/toolkit
        -$(INSTALL_DATA) $(srcdir)/doc/toolkit/index* $(docdir)/toolkit
+       -$(INSTALL_DATA) $(srcdir)/doc/*.gif $(docdir)/toolkit
 
 examples-install:
        -mkdir -p $(docdir)/examples/
index b7acfd23ff95cbb1a202c8e375e1be726ed7629d..63e2a1ff0995c34f4d8f999ccaa302043932933b 100644 (file)
@@ -610,6 +610,12 @@ AC_ARG_WITH(win32,
 
 AM_CONDITIONAL(SILC_WIN32, test x$win32-support = xtrue)
 
+#
+# Native EPOC support (disabled by default)
+#
+epoc-support = false
+AM_CONDITIONAL(SILC_EPOC, test x$epoc-support = xtrue)
+
 #
 # IPv6 support
 #
index aff1254bd1df64f9d02334364798d030fbcf294b..39455419127db664e2fdae23ab5d0dd7a9f89d91 100644 (file)
@@ -78,7 +78,7 @@ endif
 endif
 
 if SILC_DIST_TOOLKIT
-SILC_EXTRA_DIST = toolkit examples
+SILC_EXTRA_DIST = toolkit examples *.gif
 else
 if SILC_DIST_SERVER
 SILC_EXTRA_DIST = examples
diff --git a/doc/box.gif b/doc/box.gif
new file mode 100644 (file)
index 0000000..5b9cfcd
Binary files /dev/null and b/doc/box.gif differ
diff --git a/doc/box2.gif b/doc/box2.gif
new file mode 100644 (file)
index 0000000..041f76d
Binary files /dev/null and b/doc/box2.gif differ
diff --git a/doc/dot.gif b/doc/dot.gif
new file mode 100644 (file)
index 0000000..5829b6e
Binary files /dev/null and b/doc/dot.gif differ
diff --git a/doc/index_pic.gif b/doc/index_pic.gif
new file mode 100644 (file)
index 0000000..e84bec4
Binary files /dev/null and b/doc/index_pic.gif differ
index ba2219d13328e0198c628f574c811b5b0539304a..02cf48b3f9c4011f782ff0531b76fb3b1e694055 100644 (file)
@@ -3,11 +3,13 @@
  the SILC Document generator.
 -->
 
-<FONT SIZE="+3" COLOR="#000044"><B>SILC Toolkit Reference Manual</B></FONT>
+<FONT SIZE="+2" COLOR="#000044"><B>SILC Toolkit Reference Manual</B></FONT>
 <BR>
-Copyright (C) 2001 - 2002 The SILC Project<BR>
+<small>
+Copyright &copy; 2001 - 2002 The SILC Project<BR>
 Version: @VERSION@<BR>
 Updated: @DATE@
+</small>
 <BR><BR>
 <B><FONT SIZE="2">Note that this document is still under work and does not
 include yet all references for SILC Toolkit interfaces.</FONT></B>
@@ -15,7 +17,7 @@ include yet all references for SILC Toolkit interfaces.</FONT></B>
 @BODY@
 
 <BR><BR>
-<FONT SIZE="+2" COLOR="#000044"><B>Resource Links</B></FONT>
+<BIG><B>Resource Links</B></BIG>
 <BR><BR>
 <LI><A HREF="http://silcnet.org">SILC Project Website</a><BR>
 <LI><A HREF="http://silcnet.org/?page=docs">SILC Protocol Documentation</a><BR>
index 1ffa65b7ebbd0ee0d3742ba296c80be95283877c..ef53850af8345bafcf5cc54b45ab448bf7dbd2b9 100644 (file)
@@ -1,4 +1,3 @@
-<br />
 <font size="+2">Using SILC Client Library</font>
 
 <br />&nbsp;<br />&nbsp;<br />
diff --git a/scripts/silcdoc/gen_html_index.php b/scripts/silcdoc/gen_html_index.php
new file mode 100644 (file)
index 0000000..464cce1
--- /dev/null
@@ -0,0 +1,110 @@
+<?php
+/*
+
+  Author: Pekka Riikonen <priikone@silcnet.org>
+
+  Copyright (C) 2002 Pekka Riikonen
+
+  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 2 of the License, or
+  (at your option) any later version.
+
+  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.
+
+*/
+?>
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-a" />
+ <meta http-equiv="Content-Language" content="en" />
+ <meta name="description" content="SILC Secure Internet Live Conferencing" />
+ <meta name="keywords" content="SILC, secure, chat, protocol, cipher, encrypt, SKE" />
+ <meta content="INDEX, FOLLOW" name="ROBOTS" />
+ <style type="text/css">
+  <!--
+  body { color: #000000; background: #ffffff; font-family: Helvetica, Arial, Sans-serif; }
+  a:link { text-decoration: none; color: #2f488f; }
+  a:visited { text-decoration: none;color: #2f488f; }
+  a:active { text-decoration: none; color: #2f488f; }
+  -->
+ </style>
+</head>
+
+<body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0">
+
+<table border="0" cellspacing="0" cellpadding="6" width="100%">
+ <tr valign="top" bgcolor="#dddddd">
+  <td><small>Copyright &copy; 2001 - 2002 SILC Project<br />
+    <a href="http://silcnet.org">SILC Project Website</a></small></td>
+  <td align="right"><small>
+   <a href="index.html">SILC Toolkit Reference Manual</a><br />
+   </small></td>
+ </tr>
+</table>
+<table border="0" cellspacing="0" cellpadding="0" width="100%">
+ <tr valign="top"><td bgcolor="#cccccc"></td></tr>
+</table>
+
+<table cellpadding="0" cellspacing="0" border="0">
+ <tr valign="top">
+
+  <td width="230" bgcolor="#f0f0f0">
+   <table width="100%" cellpadding="2" cellspacing="2" border="0">
+    <tr valign="top"><td>
+<br />
+<small>
+<?php
+require "$dest/index.tmpl";
+?>
+</small>
+<br /><br /><br /><br />
+    </td></tr>
+   </table>
+  </td>
+
+  <td bgcolor="#dddddd" background="dot.gif"> </td>
+
+  <td width="800">
+   <table cellpadding="2" cellspacing="6" width="100%">
+    <tr><td valign="top">
+<br />
+<?php
+require "$page";
+?>
+<br /><br /><br /><br />
+    </td></tr>
+   </table>
+  </td>
+
+  <td bgcolor="#cccccc" background="dot.gif"> </td>
+
+  <td width="200" bgcolor="#f0f0f0">
+    <table width="100%" cellpadding="4" cellspacing="0">
+    <tr valign="top"><td>
+<br /><br /><br /><br /><br />
+    </td></tr>
+    </table>
+  </td>
+</tr>
+</table>
+
+<table border="0" cellspacing="0" cellpadding="0" width="100%">
+ <tr valign="top"><td bgcolor="#cccccc"></td></tr>
+</table>
+<table border="0" cellspacing="0" cellpadding="6" width="100%">
+ <tr valign="top" bgcolor="#dddddd">
+  <td><small>Copyright &copy; 2001 - 2002 SILC Project<br />
+    <a href="http://silcnet.org">SILC Project Website</a></small></td>
+  <td align="right"><small>
+   <a href="index.html">SILC Toolkit Reference Manual</a><br />
+   </small></td>
+ </tr>
+</table>
+
+</body>
+</html>
diff --git a/scripts/silcdoc/gen_index.php b/scripts/silcdoc/gen_index.php
new file mode 100644 (file)
index 0000000..7737f04
--- /dev/null
@@ -0,0 +1,120 @@
+<?php
+/*
+
+  Author: Pekka Riikonen <priikone@silcnet.org>
+
+  Copyright (C) 2002 Pekka Riikonen
+
+  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 2 of the License, or
+  (at your option) any later version.
+
+  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.
+
+*/
+?>
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-a" />
+ <meta http-equiv="Content-Language" content="en" />
+ <meta name="description" content="SILC Secure Internet Live Conferencing" />
+ <meta name="keywords" content="SILC, secure, chat, protocol, cipher, encrypt, SKE" />
+ <meta content="INDEX, FOLLOW" name="ROBOTS" />
+ <style type="text/css">
+  <!--
+  body { color: #000000; background: #ffffff; font-family: Helvetica, Arial, Sans-serif; }
+  a:link { text-decoration: none; color: #2f488f; }
+  a:visited { text-decoration: none;color: #2f488f; }
+  a:active { text-decoration: none; color: #2f488f; }
+  -->
+ </style>
+</head>
+
+<body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0">
+
+<table border="0" cellspacing="0" cellpadding="6" width="100%">
+ <tr valign="top" bgcolor="#dddddd">
+  <td><small>Copyright &copy; 2001 - 2002 SILC Project<br />
+    <a href="http://silcnet.org">SILC Project Website</a></small></td>
+  <td align="right"><small>
+   <a href="index.html">SILC Toolkit Reference Manual</a><br />
+   </small></td>
+ </tr>
+</table>
+<table border="0" cellspacing="0" cellpadding="0" width="100%">
+ <tr valign="top"><td bgcolor="#cccccc"></td></tr>
+</table>
+
+<table cellpadding="0" cellspacing="0" border="0">
+ <tr valign="top">
+
+  <td width="230" bgcolor="#f0f0f0">
+   <table width="100%" cellpadding="2" cellspacing="2" border="0">
+    <tr valign="top"><td>
+<br />
+<small>
+<?php
+require "$dest/index.tmpl";
+?>
+</small>
+<br /><br /><br /><br />
+    </td></tr>
+   </table>
+  </td>
+
+  <td bgcolor="#dddddd" background="dot.gif"> </td>
+
+  <td width="800">
+   <table cellpadding="2" cellspacing="6" width="100%">
+    <tr><td valign="top">
+<br />
+<?php
+require "$page";
+?>
+<br /><br /><br /><br />
+    </td></tr>
+   </table>
+  </td>
+
+  <td bgcolor="#cccccc" background="dot.gif"> </td>
+
+  <td width="200" bgcolor="#f0f0f0">
+    <table width="100%" cellpadding="4" cellspacing="0">
+    <tr valign="top"><td>
+<br />
+<font face="Helvetica,Arial,Sans-serif" size="1">
+<?php
+/* Get the index for this page */
+$len = strcspn($page, "__");
+$fname = substr($page, 0, $len);
+require "$fname"."__index.tmpl";
+?>
+</font>
+
+<br /><br /><br /><br />
+    </td></tr>
+    </table>
+  </td>
+</tr>
+</table>
+
+<table border="0" cellspacing="0" cellpadding="0" width="100%">
+ <tr valign="top"><td bgcolor="#cccccc"></td></tr>
+</table>
+<table border="0" cellspacing="0" cellpadding="6" width="100%">
+ <tr valign="top" bgcolor="#dddddd">
+  <td><small>Copyright &copy; 2001 - 2002 SILC Project<br />
+    <a href="http://silcnet.org">SILC Project Website</a></small></td>
+  <td align="right"><small>
+   <a href="index.html">SILC Toolkit Reference Manual</a><br />
+   </small></td>
+ </tr>
+</table>
+
+</body>
+</html>
index a9dd91586bb03ae240f69deb66f41cdc6bbe1c85..c9b5cbd48e3fdadef30d964655e2c0fb4c649a17 100755 (executable)
@@ -63,12 +63,12 @@ if [ "$TYPE" = "HTML" ]; then
 
     # Generate links to template file that can be included into various
     # places on the webpage.
-    echo "<A HREF="$fname">$name</A><BR>" >>$DST/index.tmpl
+    echo "<A HREF="$fname"><IMG SRC="box.gif" border="0" alt="">$name</A><BR>" >>$DST/index.tmpl
     for k in $links
     do
       n=`grep $k $i |cut -d=  -f2 |cut -d:  -f2`
       echo "<LI><A HREF="$k">$n</A>" >>$DST/$fname.links
-      echo "&nbsp;&nbsp;&nbsp; <A HREF="$k">$n</A><BR>" >>$DST/index.tmpl
+      echo "&nbsp;&nbsp;&nbsp; <A HREF="$k"><IMG SRC="box2.gif" border="0" alt="">$n</A><BR>" >>$DST/index.tmpl
     done
   done
 
@@ -86,8 +86,7 @@ if [ "$TYPE" = "HTML" ]; then
   do
     # Generate the details and the layout
     f="/tmp/silcdoc_html.html/$i"
-    sh gen.sh $DST gen_html_detail.php $f $f
-    sh gen.sh $DST index.php $f $f
+    sh gen.sh $DST gen_html_index.php $f $f
     cp /tmp/silcdoc_html.html/$i $DST
 echo $f
   done
@@ -103,14 +102,13 @@ echo $f
 
     # Generate the TOC file
     sh gen.sh $DST gen_toc.php $DST/$i.html $DST/$i.html
-    sh gen.sh $DST index.php $DST/$i.html $DST/$i.html
+    sh gen.sh $DST gen_html_index.php $DST/$i.html $DST/$i.html
 
     # Generate the details and the layout
     files=`find $DST -name ""$i"__*.html"`
     for k in $files
     do
-      sh gen.sh $DST gen_detail.php $k $k
-      sh gen.sh $DST index.php $k $k
+      sh gen.sh $DST gen_index.php $k $k
     done
 
     rm -f $DST/$i__index.tmpl
@@ -129,7 +127,7 @@ echo $f
 
     # Generate the TOC file for the library
     sh gen.sh $DST gen_toc.php $DST/$fname $DST/$fname
-    sh gen.sh $DST index.php $DST/$fname $DST/$fname
+    sh gen.sh $DST gen_html_index.php $DST/$fname $DST/$fname
 
     # Generate the link for the top index.html for this library
     echo "<LI><A HREF="$fname">$name</A>" >>$DST/index.html.tmp
@@ -142,7 +140,7 @@ echo $f
   curdate=`date`
   sed -e "/@VERSION@/s//$version/" -e "/@DATE@/s//$curdate/" -e "/@BODY@/ r $DST/index.html.tmp" -e s/@BODY@//g $index >$DST/index.html
   sh gen.sh $DST gen_toc.php $DST/index.html $DST/index.html
-  sh gen.sh $DST index.php $DST/index.html $DST/index.html
+  sh gen.sh $DST gen_html_index.php $DST/index.html $DST/index.html
 
   rm -rf $DST/index.html.tmp
   rm -rf /tmp/silcdoc.html
index 6c12fa26b8994ea23e24ffa72a2720e6f37436ac..f93b00b398c1687c611705ee67124b3c207a3087 100644 (file)
@@ -335,7 +335,7 @@ RB_Generate_Doc_Start (
 
                      if (index)
                        {
-                         fprintf (index, " >> <A HREF=\"%s\">%s</A><BR>\n",
+                         fprintf (index, "<A HREF=\"%s\"><IMG SRC=\"index_pic.gif\" BORDER=\"0\" ALT=\"\">%s</A><BR>\n",
                                   name, cur_header->function_name);
                        }
 
@@ -346,7 +346,7 @@ RB_Generate_Doc_Start (
                      fprintf (dest_doc, "<LI><A HREF=\"%s\">%s</A>\n",
                               fname, cur_header->function_name);
                      if (index)
-                       fprintf (index, " >> <A HREF=\"%s\">%s</A><BR>\n",
+                       fprintf (index, "<A HREF=\"%s\"><IMG SRC=\"index_pic.gif\" BORDER=\"0\" ALT=\"\">%s</A><BR>\n",
                                 fname, cur_header->function_name);
                    }
                }
@@ -574,28 +574,28 @@ RB_Generate_Header_Start (FILE * dest_doc, struct RB_header *cur_header)
 #endif
          if (cur_header->type == FUNCTION_HEADER)
            fprintf (dest_doc, 
-                    "\n<FONT SIZE=\"+3\" COLOR=\"#000044\"><B>"
+                    "\n<FONT SIZE=\"+2\" COLOR=\"#000055\"><B>"
                     "Function <A NAME=\"%s\">%s</A>"
                     "</FONT></B><BR><BR>\n\n",
                     cur_header->function_name,
                     cur_header->function_name);
          else if (cur_header->type == STRUCT_HEADER)
            fprintf (dest_doc, 
-                    "\n<FONT SIZE=\"+3\" COLOR=\"#000044\"><B>"
+                    "\n<FONT SIZE=\"+2\" COLOR=\"#000055\"><B>"
                     "Structure <A NAME=\"%s\">%s</A>"
                     "</FONT></B><BR><BR>\n\n",
                     cur_header->function_name,
                     cur_header->function_name);
          else if (cur_header->type == VARIABLE_HEADER)
            fprintf (dest_doc, 
-                    "\n<FONT SIZE=\"+3\" COLOR=\"#000044\"><B>"
+                    "\n<FONT SIZE=\"+2\" COLOR=\"#000055\"><B>"
                     "Variable <A NAME=\"%s\">%s</A>"
                     "</FONT></B><BR><BR>\n\n",
                     cur_header->function_name,
                     cur_header->function_name);
          else
            fprintf (dest_doc, 
-                    "\n<FONT SIZE=\"+3\" COLOR=\"#000044\"><B>"
+                    "\n<FONT SIZE=\"+2\" COLOR=\"#000055\"><B>"
                     "<A NAME=\"%s\">%s</A>"
                     "</FONT></B><BR><BR>\n\n",
                     cur_header->function_name,
@@ -746,7 +746,7 @@ RB_Generate_Item_Name (FILE * dest_doc, int item_type)
       fprintf (dest_doc, format_str,
               att_start_command[MAKE_BOLD][output_mode]);
       if (output_mode == HTML)
-       fprintf (dest_doc, "\n<FONT COLOR=\"#000044\">");
+       fprintf (dest_doc, "\n<FONT COLOR=\"#000055\">");
       fprintf (dest_doc, format_str, item_names[item_type]);
       if (output_mode == HTML)
        fprintf (dest_doc, "\n</FONT>");