Changeset c04b94 in git for doc/doc2tex.pl

Timestamp:

Dec 6, 1999, 5:07:00 PM (23 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

e612312190d9035d6258e7dd6bac20871a42d807

Parents:

4a553b8ad97e5927df9e168f04952d3d3c4d855c

Message:

* example on kernel commands implemented


git-svn-id: file:///usr/local/Singular/svn/trunk@3959 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• doc/doc2tex.pl (modified) (13 diffs)

doc/doc2tex.pl

@@ -1 +1 @@
 #!/usr/local/bin/perl
-# $Id: doc2tex.pl,v 1.21 1999-12-03 11:20:44 obachman Exp $
+# $Id: doc2tex.pl,v 1.22 1999-12-06 16:06:54 obachman Exp $
 ###################################################################
 #  Computer Algebra System SINGULAR
@@ -62 +62 @@
 $no_fun = 0;
 $doc_subdir = "./d2t_singular";
+$ex_subdir = "./examples";
 @include_dirs = (".", "../Singular/LIB");
 $make = 0;
@@ -110 +111 @@
   if (/^-no_fu(n)?$/)    { $no_fun = 1;next;}
   if (/^-m(ake)?$/)      { $make =  shift(@ARGV);next;}
-  if (/^-s(ubdir)?$/)    { $doc_subdir = shift(@ARGV); next;}
+  if (/^-d(ocdir)?$/)    { $doc_subdir = shift(@ARGV); next;}
+  if (/^-e(xdir)?$/)     { $ex_subdir = shift(@ARGV); next;}
   if (/^-I$/)            { unshift(@include_dirs, shift(@ARGV)); next;}
   if (/^-v(erbose)?$/)   { $verbose = shift(@ARGV); next;}
@@ -147 +149 @@
 if (-d $doc_subdir)
 {
-  print "<subdir: $doc_subdir>"  if ($verbose > 1);
+  print "<docdir:$doc_subdir>"  if ($verbose > 1);
 }
 else
@@ -153 +155 @@
   mkdir($doc_subdir, oct(755)) 
     || Error("can't create directory $doc_subdir: $!\n");
-  print "(subdir: $doc_subdir)"  if ($verbose > 1);
+  print "(docdir:$doc_subdir)"  if ($verbose > 1);
+}
+if (-d $ex_subdir)
+{
+  print "<exdir:$ex_subdir>"  if ($verbose > 1);
+}
+else
+{
+  mkdir($ex_subdir, oct(755)) 
+    || Error("can't create directory $ex_subdir: $!\n");
+  print "(exdir:$ex_subdir)"  if ($verbose > 1);
 }
 
@@ -169 +181 @@
   if (/^\@setfilename/)     {print TEX "\@setfilename $doc.hlp\n"; next;}
 
-  if (/^\@\w*section\s*(\w+)/ || /^\@\w*chapter\s*(\w+)/)
-  {
-    $section = lc(substr($1, 0, 6));
+  if (/^\@\w*section\s*/ || /^\@\w*chapter\s*/ || /^\@\w*heading\s*/)
+  {
+    $section = $';
+    $section =~ s/^\s*(.*)\s*$/$1/;
+    if ($section =~ /\w/)
+    {
+      $section =~ s/\s/_/g
+    }
+    else
+    {
+      $section = "unknown";
+    }
   }
   
@@ -218 +239 @@
   $section = 'unknown' unless $section;
   $ex_prefix = $section;
-  $ex_prefix .= "$examples{$section}" if $examples{$section};
+  $ex_prefix .= "_$examples{$section}" if $examples{$section};
   $examples{$section}++;
 
@@ -229 +250 @@
   else
   {
-    $inc_file = "$doc_subdir/$doc" . "_$ex_prefix.inc";
-    $ex_file = "$doc_subdir/$doc" . "_$ex_prefix.tst";
+    $inc_file = "$ex_subdir/$ex_prefix.inc";
+    $ex_file = "$ex_subdir/$ex_prefix.sing";
     if (-r $inc_file && -r $ex_file && -s $inc_file && -s $ex_file)
     {
       $cache = 1;
-      open(TST, "<$ex_file") || ($cache = 0);
+      open(SING, "<$ex_file") || ($cache = 0);
     }
   }
@@ -256 +277 @@
     {
       $thisexample .= $_;
-      if ($cache && $_ && $_ ne <TST>)
+      if ($cache && $_ && $_ ne <SING>)
       {
         $cache = 0;
-        close(TST);
-      }
-    }
-  }
-  close(TST) if $cache;
+        close(SING);
+      }
+    }
+  }
+  close(SING) if $cache;
   Error("no matching '\@c example' found for $doc_file:$lline\n")
     unless (/^\@c\s*example\s*$/);
@@ -292 +313 @@
     print "($ex_prefix" if ($verbose == 1);
     my ($res_file);
-    $res_file = "$doc_subdir/$doc" . "_$ex_prefix.res";
+    $res_file = "$ex_subdir/$ex_prefix.res";
 
     print TEX "\@c computed example $ex_prefix $doc_file:$lline \n";
@@ -298 +319 @@
     # run singular
     open(EX, ">$ex_file") || Error("can't open $ex_file for writing: $!\n");
-    print EX "$thisexample\$\n";
+    print EX "$thisexample";
     close(EX);
 
-    &System("$Singular $Singular_opts $ex_file > $res_file");
+    &System("echo '\$' | $Singular $Singular_opts $ex_file > $res_file");
     print ")" if ($verbose == 1);
 
@@ -310 +331 @@
     while (<RES>)
     {
-      last if (/^$ex_file\s*([0-9]+)..\$/);
+      last if (/^STDIN\s*([0-9]+)..\$/);
       # check for error
       Error("while running example $ex_prefix from $doc_file:$lline.\nCall: '$Singular $Singular_opts $ex_file > $res_file'\n")
@@ -619 +640 @@
   -no_ex        : skip computation of examples 
   -no_fun       : don't include help for library functions
-  -subdir  dir  : put intermediate files into 'dir'
+  -docdir  dir  : put intermediate doc/tex files into 'dir'
                           (default: './d2t_singular')
+  -exdir   dir  : put example files into 'dir'
+                          (default: './examples')
   -I dir        : look also into 'dir' for include  and lib files
                           (default: ".", "../Singular/LIB")