Changeset 522906 in git

Timestamp:

Mar 3, 2012, 10:21:04 AM (12 years ago)

Author:

Bernhard R. Link <brlink@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ede7a69d54c25b9d0c8b81afc4a499d622183a15

Parents:

5bcfa8f36743c68cb02d72f74780d253c35537a3

git-author:

Bernhard R. Link <brlink@debian.org>2012-03-03 10:21:04+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-03-13 15:28:57+01:00

Message:

tag more examples

Add a way to tag all examples from a .lib file included.

Use this new feature to tag some libs needed external programs,
special features or significant memory usage in order to be able
to build documentation on more machines.

Make DOC2TEX_EXAMPLE_EXCLUSIONS a make variable, so that this
setting can also be overridden at make invocation time.

Location:

doc

Files:

• Makefile.in (modified) (1 diff)
• doc2tex.pl (modified) (3 diffs)
• examples.doc (modified) (previous)
• pl2doc.pl (modified) (2 diffs)
• singular.doc (modified) (previous)

doc/Makefile.in

@@ -67 +67 @@
 EX_SUBDIR       = ./examples
 CHKSUM_DB       = ${DOC_SUBDIR}/chksum
+DOC2TEX_EXAMPLE_EXCLUSIONS = @DOC2TEX_EXAMPLE_EXCLUSIONS@
 DOC2TEX         = ${PERL} ./doc2tex.pl -docdir ${DOC_SUBDIR} \
                   -Singular ${SINGULAR} -verbose ${VERBOSE} -make ${MAKE} \
-                  -exdir ${EX_SUBDIR} @DOC2TEX_EXAMPLE_EXCLUSIONS@
-PL2DOC          = ${PERL} ./pl2doc.pl -db ${CHKSUM_DB}
+                  -exdir ${EX_SUBDIR} ${DOC2TEX_EXAMPLE_EXCLUSIONS}
+TAG             =
+PL2DOC          = ${PERL} ./pl2doc.pl ${TAG} -db ${CHKSUM_DB}
 
 # t2h stuff

doc/doc2tex.pl

@@ -539 +539 @@
 sub HandleLib
 {
-  my($lib, $proc, $n_fun, $n_ex, $section, $tex_file);
+  my($lib, $proc, $n_fun, $n_ex, $section, $tex_file, $tag);
 
   if (/^\@c\s*lib\s+([^\.]+)\.lib(.*)/)
@@ -551 +551 @@
     print TEX $_;
     return;
+  }
+  if (/tag:(\w+)/)
+  {
+    $tag = "TAG='-tag ".$1."'";
+  }
+  else
+  {
+    $tag = '';
   }
 
@@ -574 +582 @@
   {
     print "<lib $lib " if ($verbose);
-    System("$make $make_opts VERBOSE=$verbose $tex_file"); 
+    System("$make $make_opts $tag VERBOSE=$verbose $tex_file"); 
   }
   

doc/pl2doc.pl

@@ -20 +20 @@
   if (/^-o$/)    { $out_file = shift(@ARGV); next;}
   if (/^-db$/) { $db_file = shift(@ARGV); next;}
+  if (/^-tag$/) { $tag = $tag . " tag:" . shift(@ARGV); next;}
   if (/^-no_fun$/)    { $no_fun = 1;next;}
   if (/^-doc$/)       { $doc = 1; next;}
@@ -120 +121 @@
     {
       print LDOC "\@strong{Example:}\n";
-      print LDOC "\@smallexample\n\@c example\n";
+      print LDOC "\@smallexample\n\@c example$tag\n";
       print LDOC $ex;
       print LDOC "\n\@c example\n\@end smallexample\n";