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

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Changes by:     Asko Soukka <address@hidden>    03/05/22 10:17:25

Modified files:
        .              : TODO-navidoc config.py rst2any.py 
        navidoc/mp     : __init__.py 
Added files:
        navidoc/mp     : html.py 

Log message:
        some

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/TODO-navidoc.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.py.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/rst2any.py.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/html.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/__init__.py.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: navidoc/TODO-navidoc
diff -u navidoc/TODO-navidoc:1.15 navidoc/TODO-navidoc:1.16
--- navidoc/TODO-navidoc:1.15   Thu May 22 07:08:17 2003
+++ navidoc/TODO-navidoc        Thu May 22 10:17:25 2003
@@ -6,9 +6,19 @@
 =================================
 
 humppake:
+  - abstract the way 'title' and 'page' elements
+    grep a long title after element name, do other
+    elements need that?
+   
+    * scandinavian characters won't work, that's probably
+      again that jython problem
+  
   - syntax to follow Fenfire coding standards
-  - NavBar update for gzz.css
-  - features for NavBar to work better with himalia doc
+    * or is this necessary?
+
+  - NavBar update for gzz.css, to allow using NavBar with
+    design documentation
+
   - documenting, tests
   - document docutils.conf:datestamp -additions (CVS_DATE,
     CVS_VERSION, SSI_LASTMOD) somewhere
Index: navidoc/config.py
diff -u navidoc/config.py:1.28 navidoc/config.py:1.29
--- navidoc/config.py:1.28      Thu May 22 06:52:20 2003
+++ navidoc/config.py   Thu May 22 10:17:25 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: config.py,v 1.28 2003/05/22 10:52:20 humppake Exp $
+# $Id: config.py,v 1.29 2003/05/22 14:17:25 humppake Exp $
 
 __docformat__ = 'reStructuredText'
 
@@ -29,46 +29,28 @@
 
 #Environmental variable MPINPUTS should be relative to tmpdir,
 #or be an absolute path.
-os.putenv("MPINPUTS", "../navidoc/mp/")
+os.putenv("MPINPUTS", "../../../navidoc/navidoc/mp/")
 
 # midfix for generated files
 # don't change this, if you don't know what you are doing :)
-midfix = ".gen"
+midfix = ''
 
 # base_url
-base_url = 'http://fenfire.org/'
+base_url = 'http://www.nongnu.org/navidoc/'
 papers_directory = 'papers'
 
 # settings for metapost
-mp_directory = '../navidoc/diagrams'
+mp_directory = '../non-gnu/navidoc/diagrams'
 mp_generate = 1
 mp_eps_only = 0
-mp_context_menu = 1
+mp_context_menu = 0
 
 # settings for linking javadoc
 # the search order is ascending, sudden death
 linkpackages = {} # holder of packagenames, will members will be cleaned after 
every diagram
-javadoc_directories = ['../libvob/doc/javadoc',
-                       '../storm/doc/javadoc',
-                       '../alph/doc/javadoc',
-                       '../fenfire/docs/javadoc',
-                       '../loom/doc/javadoc',
-                       '../navidoc/doc/javadoc',
-                       ]
-link_redirection = {'navidoc': '../navidoc/doc',
-                    'libvob': '../libvob/doc',
-                    'storm': '../storm/doc',
-                    'alph': '../alph/doc',
-                    'fenfire': '../fenfire/docs',
-                    'loom': '../loom/doc',
-                    }
-docxx_directories = ['../libvob/doc/docxx',
-                     '../storm/doc/docxx',
-                     '../alph/doc/docxx',
-                     '../fenfire/docs/docxx',
-                     '../loom/doc/docxx',
-                     '../navidoc/doc/docxx',
-                     ]
+javadoc_directories = []
+link_redirection = {}
+docxx_directories = []
 
 # initializing dynamic settings
 # should be kept up-to-date in code
@@ -85,33 +67,10 @@
 docutils = "./docutils.conf"
 
 # pegs will be sorted after their priority
-pegboard_priorities = {'Current': 1,
-                       'Revising': 2,
-                       'Incomplete': 3,
-                       'Undefined': 4,
-                       'Accepted': 5,
-                       'Implemented': 6,
-                       'Rejected': 7,
-                       'Irrelevant': 8,
-                       }
+pegboard_priorities = {}
 
 # authors and stakeholders to replace with nicknames
-pegboard_authors = {'Tuomas Lukka': 'tjl',
-                    'Tuomas J. Lukka': 'tjl',
-                    'Benja Fallenstein': 'benja',
-                    'Benja': 'benja',
-                    'Asko Soukka': 'humppake',
-                    'Matti Katila': 'mudyc',
-                    'Anton Feldmann': 'anton',
-                    'Tero Mäyränen': 'deetsay',
-                    'Marc Schiereck': 'dreevich',
-                    'Hermanni Hyytiälä': 'hemppah',
-                    'Antti_Juhani Kaijanaho': 'ibid',
-                    'Janne V. Kujala': 'jvk',
-                    'Janne Kujala': 'jvk',
-                    'Tuukka Hastrup': 'tuukkah',
-                    'Vesa Kaihlavirta': 'vegai',
-                    }
+pegboard_authors = {}
 
 # status for pegs without rst or with failing rst
-pegboard_undefined = 'Undefined'
+pegboard_undefined = ''
Index: navidoc/navidoc/mp/__init__.py
diff -u navidoc/navidoc/mp/__init__.py:1.29 navidoc/navidoc/mp/__init__.py:1.30
--- navidoc/navidoc/mp/__init__.py:1.29 Thu May 22 06:52:21 2003
+++ navidoc/navidoc/mp/__init__.py      Thu May 22 10:17:25 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: __init__.py,v 1.29 2003/05/22 10:52:21 humppake Exp $
+# $Id: __init__.py,v 1.30 2003/05/22 14:17:25 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -277,7 +277,8 @@
     dbg("List: "+str(list))
     syscmd = ('pstopnm '+' '.join(list)+' 
<'+slashify(config.mp_directory)+diagram+config.midfix \
               +""".mp.1 2>/dev/null | pnmscale -reduce %s 2>/dev/null | 
"""%scaling \
-              +'pnmtopng 
>'+slashify(config.mp_directory)+diagram+config.midfix+'.png 2>/dev/null')#
+              +'pnmtopng -transparent =white >'+slashify(config.mp_directory) \
+              +diagram+config.midfix+'.png 2>/dev/null')#
 
     dbg(syscmd)
     os.system(syscmd)
@@ -287,8 +288,8 @@
     PostScriptBoundingBox.
     """
     def __init__(self, els):
-       self.x=(round_down(els[0]), round_up(els[2]))
-       self.y=(round_up(els[1]), round_down(els[3]))
+       self.x=(int(float(els[0])), int(float(els[2])))
+       self.y=(int(float(els[1])), int(float(els[3])))
        self.scale = 1 # 1 point = 1 pixel
        self.w = self.scale*(self.x[1]-self.x[0])
        self.h = self.scale*(self.y[0]-self.y[1])
Index: navidoc/rst2any.py
diff -u navidoc/rst2any.py:1.26 navidoc/rst2any.py:1.27
--- navidoc/rst2any.py:1.26     Thu May 22 06:52:20 2003
+++ navidoc/rst2any.py  Thu May 22 10:17:25 2003
@@ -21,7 +21,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: rst2any.py,v 1.26 2003/05/22 10:52:20 humppake Exp $
+#$Id: rst2any.py,v 1.27 2003/05/22 14:17:25 humppake Exp $
 
 #
 # Written by Asko Soukka
@@ -43,6 +43,7 @@
 from navidoc.util.path import *
 
 import navidoc.mp.uml
+import navidoc.mp.html
 import navidoc.link.javadoc
 import navidoc.link.docxx