[Gzz-commits] navidoc ./config.py ./docutils.conf ./gzz.css ....

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Changes by:     Asko Soukka <address@hidden>    03/03/27 06:56:21

Modified files:
        .              : config.py docutils.conf gzz.css rst2any.py 
        navidoc        : __init__.py parser.py 
        navidoc/mp     : __init__.py 
        navidoc/utils  : debug.py 

Log message:
        minor

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/docutils.conf.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/gzz.css.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/rst2any.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/__init__.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/parser.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/__init__.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/utils/debug.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: navidoc/config.py
diff -u navidoc/config.py:1.6 navidoc/config.py:1.7
--- navidoc/config.py:1.6       Wed Mar 26 10:36:17 2003
+++ navidoc/config.py   Thu Mar 27 06:56:21 2003
@@ -19,9 +19,11 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: config.py,v 1.6 2003/03/26 15:36:17 humppake Exp $
+# $Id: config.py,v 1.7 2003/03/27 11:56:21 humppake Exp $
 
 __docformat__ = 'reStructuredText'
+
+dbg = None
 
 import os.path
 import docutils.utils
Index: navidoc/docutils.conf
diff -u navidoc/docutils.conf:1.3 navidoc/docutils.conf:1.4
--- navidoc/docutils.conf:1.3   Fri Mar 21 05:36:27 2003
+++ navidoc/docutils.conf       Thu Mar 27 06:56:21 2003
@@ -1,13 +1,13 @@
-#$Id: docutils.conf,v 1.3 2003/03/21 10:36:27 humppake Exp $
+#$Id: docutils.conf,v 1.4 2003/03/27 11:56:21 humppake Exp $
 
 [options]
 
 # These entries affect all processing:
 output-encoding: iso-8859-1
-source-link: 1
+#source-link: 1
 language: fi
-datestamp: %c
-generator: 1
+#datestamp: %c
+#generator: 1
 
 # These entries affect HTML output:
 stylesheet-path: gzz.css
Index: navidoc/gzz.css
diff -u navidoc/gzz.css:1.1 navidoc/gzz.css:1.2
--- navidoc/gzz.css:1.1 Tue Mar 18 09:32:53 2003
+++ navidoc/gzz.css     Thu Mar 27 06:56:21 2003
@@ -1,3 +1,5 @@
address@hidden screen {
+
 /* Overall */
 body {
        color: black;
@@ -200,3 +202,12 @@
 
 td.field-name {
   font-weight: bold }
+
+}
+
address@hidden print {
+
+body { font-size: medium; }
+h1 { font-size: 130%; }
+
+}
\ No newline at end of file
Index: navidoc/navidoc/__init__.py
diff -u navidoc/navidoc/__init__.py:1.7 navidoc/navidoc/__init__.py:1.8
--- navidoc/navidoc/__init__.py:1.7     Wed Mar 26 10:36:17 2003
+++ navidoc/navidoc/__init__.py Thu Mar 27 06:56:21 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: __init__.py,v 1.7 2003/03/26 15:36:17 humppake Exp $
+#$Id: __init__.py,v 1.8 2003/03/27 11:56:21 humppake Exp $
 
 #
 # Written by Asko Soukka
@@ -29,9 +29,6 @@
 
 import docutils.core
 import config
-
-import navidoc.directives
-import navidoc.writers
 
 # Because docutils' own relative path has problems with
 # paths beginning with '../', we use our own :-)
Index: navidoc/navidoc/mp/__init__.py
diff -u navidoc/navidoc/mp/__init__.py:1.4 navidoc/navidoc/mp/__init__.py:1.5
--- navidoc/navidoc/mp/__init__.py:1.4  Thu Mar 27 05:02:40 2003
+++ navidoc/navidoc/mp/__init__.py      Thu Mar 27 06:56:21 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: __init__.py,v 1.4 2003/03/27 10:02:40 humppake Exp $
+# $Id: __init__.py,v 1.5 2003/03/27 11:56:21 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -29,11 +29,13 @@
 
 import os, os.path
 
-from navidoc.utils.path import *
-from navidoc.parser import *
-
 import config
 
+import navidoc.link
+
+from navidoc.utils.path import *
+from navidoc.parser import NamedElement
+
 dbg = config.dbg.shorthand('mp')
 dbg_fail = config.dbg.shorthand('mp.fail')
 
@@ -42,8 +44,8 @@
     if not focus: return 'showlink("'+target+'", '+title+',  ('+box+'));'
     else:
         if rough_edge: return 'showfocus("'+target+'", '+title+', 
('+box+'));'+"\n"+'drawRoughEdge(('+box+'));'
-        else: return 'showfocus("'target+'", '+title+', ('+box+'));'
-navidoc.parser.Link.draw_code = link_draw_code
+        else: return 'showfocus("'+target+'", '+title+', ('+box+'));'
+navidoc.link.Link.draw_code = link_draw_code
 
 class NamedMPElement(NamedElement):
     def repl(self, s):
Index: navidoc/navidoc/parser.py
diff -u navidoc/navidoc/parser.py:1.3 navidoc/navidoc/parser.py:1.4
--- navidoc/navidoc/parser.py:1.3       Thu Mar 27 05:02:40 2003
+++ navidoc/navidoc/parser.py   Thu Mar 27 06:56:21 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: parser.py,v 1.3 2003/03/27 10:02:40 humppake Exp $
+# $Id: parser.py,v 1.4 2003/03/27 11:56:21 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -28,16 +28,15 @@
 __docformat__ = 'reStructuredText'
 
 #from __future__ import nested_scopes
-import re, os, random, string
+import re, random, string
 
 import navidoc.mp, navidoc.link
-from navidoc.mp.core import MetapostException
 
 import config
 
 dbg = config.dbg.shorthand('parser')
 
-element_typs = {}
+element_types = {}
 link_types = {}
 
 def __init__():
@@ -47,12 +46,12 @@
     #XXX: Fix key-name conflicts
     element_types.update(keys4classes(navidoc.mp))
     for module in dir(navidoc.mp):
-        module = getattr(root_module, module)
+        module = getattr(navidoc.mp, module)
         element_types.update(keys4classes(module))
 
     link_types.update(keys4classes(navidoc.link))
     for module in dir(navidoc.link):
-        module = getattr(root_module, module)
+        module = getattr(navidoc.link, module)
         link_types.update(keys4classes(module))
 
 def keys4classes(module):
@@ -64,13 +63,14 @@
     for elements in dir(module):
         for element in elements:
             element = getattr(module, element)
-            if hassattr(element, "key") \
+            if hasattr(element, "key") \
                    and type(element.key) == type(''):
                 d[element.key] = element
     return d
 
 class ParserException(Exception):
     def __init__(self, value):
+        Exception.__init__()
         self.value = value
     def __str__(self):
         return self.value
@@ -137,9 +137,6 @@
     """
     def __init__(self, list):
         self.list = list
-       self.link = None
-    def get_key(self):
-        return self.key
 
 class NamedElement (Element):
     """
@@ -155,11 +152,11 @@
            if len(link):
                 self.link = link_types[el[0]](link[0][0])
            else:
-               self.link = self.defaultlink()
+               self.link = self.defaultlink(link[0][0])
        else:
             self.list.add_sub_element(self.name, el)
-    def defaultlink(self):
-        return navidoc.link.Link(link[0][0])
+    def defaultlink(self, link):
+        return navidoc.link.Link(link)
 
 class ElementList:
     """
Index: navidoc/navidoc/utils/debug.py
diff -u navidoc/navidoc/utils/debug.py:1.7 navidoc/navidoc/utils/debug.py:1.8
--- navidoc/navidoc/utils/debug.py:1.7  Fri Mar 21 08:23:36 2003
+++ navidoc/navidoc/utils/debug.py      Thu Mar 27 06:56:21 2003
@@ -19,15 +19,13 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: debug.py,v 1.7 2003/03/21 13:23:36 humppake Exp $
+#$Id: debug.py,v 1.8 2003/03/27 11:56:21 humppake Exp $
 
 #
 # Written by Asko Soukka
 #
 
 __docformat__ = 'reStructuredText'
-
-import os.path
 
 class DebugFilter:
     """Handle debug streams."""
Index: navidoc/rst2any.py
diff -u navidoc/rst2any.py:1.14 navidoc/rst2any.py:1.15
--- navidoc/rst2any.py:1.14     Thu Mar 27 04:33:48 2003
+++ navidoc/rst2any.py  Thu Mar 27 06:56:21 2003
@@ -32,9 +32,11 @@
 import sys, os, getopt
 import docutils.core
 
-import navidoc
 import config
 
+import navidoc.directives
+import navidoc.writers
+
 from navidoc.utils.path import _slashify, _listdir
 
 """
@@ -154,12 +156,12 @@
 while 1:
     
     #the first pass, docutils
-    for path in sys.argv:
-        run_docutils(path)
+    for filepath in sys.argv:
+        run_docutils(filepath)
 
     #the second pass, postprocess
-    for path in sys.argv:
-        postprocess(path)
+    for filepath in sys.argv:
+        postprocess(filepath)
 
     #    try:
     #        run_convert(path)