[Gzz-commits] navidoc ./config.himalia ./config.py ./rst2any....

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Changes by:     Asko Soukka <address@hidden>    03/04/29 15:10:37

Modified files:
        .              : config.himalia config.py rst2any.py 
Added files:
        navidoc/modules: texture.py 

Log message:
        textures

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.himalia.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/rst2any.py.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/modules/texture.py?rev=1.1

Patches:
Index: navidoc/config.himalia
diff -u navidoc/config.himalia:1.10 navidoc/config.himalia:1.11
--- navidoc/config.himalia:1.10 Sat Apr 26 07:30:43 2003
+++ navidoc/config.himalia      Tue Apr 29 15:10:36 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: config.himalia,v 1.10 2003/04/26 11:30:43 humppake Exp $
+# $Id: config.himalia,v 1.11 2003/04/29 19:10:36 humppake Exp $
 
 __docformat__ = 'reStructuredText'
 
@@ -36,6 +36,9 @@
 #Environmental variable MPINPUTS should be relative to tmpdir,
 #or be an absolute path.
 os.putenv("MPINPUTS", "../../navidoc/navidoc/mp/")
+
+# base_url
+base_rul = 'http://fenfire.org/'
 
 # global settings needed all around
 mp_directory = '../ffdoc/diagrams'
Index: navidoc/config.py
diff -u navidoc/config.py:1.22 navidoc/config.py:1.23
--- navidoc/config.py:1.22      Sat Apr 26 07:30:43 2003
+++ navidoc/config.py   Tue Apr 29 15:10:36 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: config.py,v 1.22 2003/04/26 11:30:43 humppake Exp $
+# $Id: config.py,v 1.23 2003/04/29 19:10:36 humppake Exp $
 
 __docformat__ = 'reStructuredText'
 
@@ -36,6 +36,10 @@
 #Environmental variable MPINPUTS should be relative to tmpdir,
 #or be an absolute path.
 os.putenv("MPINPUTS", "../navidoc/mp/")
+
+# base_url
+base_url = 'http://fenfire.org/'
+papers_directory = 'papers'
 
 # settings for metapost
 mp_directory = '../navidoc/diagrams'
Index: navidoc/rst2any.py
diff -u navidoc/rst2any.py:1.23 navidoc/rst2any.py:1.24
--- navidoc/rst2any.py:1.23     Fri Apr 25 09:36:41 2003
+++ navidoc/rst2any.py  Tue Apr 29 15:10:36 2003
@@ -21,7 +21,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: rst2any.py,v 1.23 2003/04/25 13:36:41 humppake Exp $
+#$Id: rst2any.py,v 1.24 2003/04/29 19:10:36 humppake Exp $
 
 #
 # Written by Asko Soukka
@@ -79,6 +79,10 @@
 try: sys.argv.remove('--navbar'); navbar = 1
 except ValueError: navbar = 0
 
+# catching feature parameters from the command line
+try: sys.argv.remove('--texture'); texture = 1
+except ValueError: texture = 0
+
 def rst2any(input):
     """
     Runs docutils for a single file.
@@ -144,6 +148,15 @@
         import navidoc.modules.imagemap
         config.working_directory = os.path.normpath(os.path.dirname(path))
         navidoc.modules.imagemap.postprocess(path)
+
+    if texture:
+        if os.path.isfile(path):
+            last_dot = path.replace("../", "__/").rfind('.')
+            if last_dot != -1: path = path[:last_dot]+'.gen.html'
+            
+        import navidoc.modules.texture
+        config.working_directory = os.path.normpath(os.path.dirname(path))
+        navidoc.modules.texture.postprocess(path)
 
 def run_docutils(path):
     """