[Gzz-commits] navidoc TODO-navidoc config.py rst2any.py

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Changes by:     Asko Soukka <address@hidden>    03/06/05 07:05:07

Modified files:
        .              : TODO-navidoc config.py rst2any.py 

Log message:
        no more reloading the same config

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/TODO-navidoc.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.py.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/rst2any.py.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: navidoc/TODO-navidoc
diff -u navidoc/TODO-navidoc:1.20 navidoc/TODO-navidoc:1.21
--- navidoc/TODO-navidoc:1.20   Wed Jun  4 08:19:18 2003
+++ navidoc/TODO-navidoc        Thu Jun  5 07:05:06 2003
@@ -47,7 +47,7 @@
 ------------
 
   - fix umltool graphics to be closer to the UML 3amigos books
-  - Fix UML sequence diagram: now you have to put
+  - ??? Fix UML sequence diagram: now you have to put
     seqobjects *after* the sequence...
 
 Docutils latex writer
Index: navidoc/config.py
diff -u navidoc/config.py:1.36 navidoc/config.py:1.37
--- navidoc/config.py:1.36      Wed Jun  4 08:19:18 2003
+++ navidoc/config.py   Thu Jun  5 07:05:07 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: config.py,v 1.36 2003/06/04 12:19:18 humppake Exp $
+# $Id: config.py,v 1.37 2003/06/05 11:05:07 humppake Exp $
 
 __docformat__ = 'reStructuredText'
 
@@ -46,10 +46,11 @@
 link_base_directory = None # if different than working_directory
 
 # set the default docutils.conf
-docutils_conf = "./docutils.conf"
+docutils_conf = './docutils.conf'
 
 # set the default navidoc.conf
-navidoc_conf = "./navidoc.conf"
+navidoc_conf = './navidoc.conf'
+read_navidoc_conf = ''
 
 # holder of packagenames when linking diagrams
 # will be cleaned after every diagram
Index: navidoc/rst2any.py
diff -u navidoc/rst2any.py:1.29 navidoc/rst2any.py:1.30
--- navidoc/rst2any.py:1.29     Thu Jun  5 03:42:45 2003
+++ navidoc/rst2any.py  Thu Jun  5 07:05:07 2003
@@ -21,7 +21,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: rst2any.py,v 1.29 2003/06/05 07:42:45 humppake Exp $
+#$Id: rst2any.py,v 1.30 2003/06/05 11:05:07 humppake Exp $
 
 #
 # Written by Asko Soukka
@@ -97,10 +97,12 @@
 
     dbg_config('Working directory: '+config.working_directory)
     dbg_config('Input file: '+config.input_filename)
-    config.read_config(config, config.navidoc_conf)
 
-    navidoc.link.docxx.__init__() # init Doc++ linking information
-    # of course that could be done everytime, when processing a clink, but...
+    if (config.read_navidoc_conf != config.navidoc_conf):
+        config.read_config(config, config.navidoc_conf)
+        navidoc.link.docxx.__init__() # init Doc++ linking information
+        # of course that could be done everytime, when processing a clink, 
but...
+        config.read_navidoc_conf = config.navidoc_conf
 
     if html:
         dbg('Compiling ReST '+input)