updates.

[crypto.git] / scripts / silcdoc / silcdoc

diff --git a/scripts/silcdoc/silcdoc b/scripts/silcdoc/silcdoc
index c9b5cbd48e3fdadef30d964655e2c0fb4c649a17..41c56643bd7ff04324338f30d3232ec1f6d3e02f 100755 (executable)
--- a/scripts/silcdoc/silcdoc
+++ b/scripts/silcdoc/silcdoc
@@ -52,7 +52,8 @@ if [ "$TYPE" = "HTML" ]; then
   mkdir /tmp/silcdoc_html.html
   cp $headers /tmp/silcdoc.html
 
-  # Generate index template from the DIRECTORY files
+  # Generate index template from the DIRECTORY files. The template for
+  # the generated index template is INDEX.tmpl.
   files=`find $SRC -name "DIRECTORY"`
   for i in $files
   do
@@ -63,30 +64,35 @@ if [ "$TYPE" = "HTML" ]; then
 
     # Generate links to template file that can be included into various
     # places on the webpage.
-    echo "<A HREF="$fname"><IMG SRC="box.gif" border="0" alt="">$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"><IMG SRC="box2.gif" border="0" alt="">$n</A><BR>" >>$DST/index.tmpl
+      echo "<li><a href="$k">$n</a>" >>$DST/$fname.links
+      echo "&nbsp;&nbsp;&nbsp; <a href="$k"><img src="box2.gif" border="0" alt="">$n</a><br />" >>$DST/index.tmpl
     done
   done
+  # Now get the template for the link template, and generate the final index
+  # template file
+  temp=`find $SRC -name "INDEX.tmpl"`
+  sed -e "/@BODY@/ r $DST/index.tmpl" -e s/@BODY@//g $temp >$DST/index.tmpl.tmp
+  mv $DST/index.tmpl.tmp $DST/index.tmpl
 
   # Copy all HTML files to destination
-  htmlfiles=`find $SRC -name "silc*.html"`
+  htmlfiles=`find $SRC -name "*.html"`
   for i in $htmlfiles
   do
     cp $i /tmp/silcdoc_html.html
   done
   path=`pwd`
   cd /tmp/silcdoc_html.html
-  htmlfiles=`find . -name "silc*.html" | cut -d/  -f2`
+  htmlfiles=`find . -name "*.html" | cut -d/  -f2`
   cd $path
   for i in $htmlfiles
   do
     # Generate the details and the layout
     f="/tmp/silcdoc_html.html/$i"
-    sh gen.sh $DST gen_html_index.php $f $f
+    sh gen.sh $DST gen_index.php 1 $f $f
     cp /tmp/silcdoc_html.html/$i $DST
 echo $f
   done
@@ -101,14 +107,13 @@ echo $f
     $ROBO /tmp/silcdoc.html/$i.h $DST/$i.html $TYPE
 
     # Generate the TOC file
-    sh gen.sh $DST gen_toc.php $DST/$i.html $DST/$i.html
-    sh gen.sh $DST gen_html_index.php $DST/$i.html $DST/$i.html
+    sh gen.sh $DST gen_index.php 1 $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_index.php $k $k
+      sh gen.sh $DST gen_index.php 0 $k $k
     done
 
     rm -f $DST/$i__index.tmpl
@@ -126,11 +131,10 @@ echo $f
     sed -e "/@LINKS@/ r $DST/$fname.links" -e s/@LINKS@//g $i >$DST/$fname
 
     # Generate the TOC file for the library
-    sh gen.sh $DST gen_toc.php $DST/$fname $DST/$fname
-    sh gen.sh $DST gen_html_index.php $DST/$fname $DST/$fname
+    sh gen.sh $DST gen_index.php 1 $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
+    echo "<li><a href="$fname">$name</a>" >>$DST/index.html.tmp
     rm -f $DST/$fname.links
   done
 
@@ -139,8 +143,7 @@ echo $f
   version=`grep SILC_VERSION_STRING $SRC/../includes/version_internal.h |cut -d\"  -f2`
   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 gen_html_index.php $DST/index.html $DST/index.html
+  sh gen.sh $DST gen_index.php 2 $DST/index.html $DST/index.html
 
   rm -rf $DST/index.html.tmp
   rm -rf /tmp/silcdoc.html