[Gzz-commits] gzz doc/gzz.css metacode/pegboard.py doc/pegboa...

[Asko Soukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Asko Soukka <address@hidden>    02/11/18 04:18:31

Modified files:
        doc            : gzz.css 
        metacode       : pegboard.py 
        doc/pegboard/vobcoorder_culling--humppake: peg.rst 
        gfx/libcoords  : Coords.hxx Coords.cxx 

Log message:
        pegboard update, etc...

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/gzz.css.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/pegboard.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/vobcoorder_culling--humppake/peg.rst.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcoords/Coords.hxx.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcoords/Coords.cxx.diff?tr1=1.53&tr2=1.54&r1=text&r2=text

Patches:
Index: gzz/doc/gzz.css
diff -u gzz/doc/gzz.css:1.9 gzz/doc/gzz.css:1.10
--- gzz/doc/gzz.css:1.9 Fri Nov 15 16:18:00 2002
+++ gzz/doc/gzz.css     Mon Nov 18 04:18:31 2002
@@ -72,6 +72,8 @@
   vertical-align: top;
 }
 
+ul.plain { margin: 0 0 0 0; list-style: None; padding: 0 0 0 0; }
+
 .peg-current { background: #ff9900; color: #000000; }
 .peg-incomplete { background: #ffffff; color: #000000; } 
 .peg-accepted { background: #33ff33; color: #000000; }
Index: gzz/doc/pegboard/vobcoorder_culling--humppake/peg.rst
diff -u gzz/doc/pegboard/vobcoorder_culling--humppake/peg.rst:1.8 
gzz/doc/pegboard/vobcoorder_culling--humppake/peg.rst:1.9
--- gzz/doc/pegboard/vobcoorder_culling--humppake/peg.rst:1.8   Thu Nov 14 
10:40:08 2002
+++ gzz/doc/pegboard/vobcoorder_culling--humppake/peg.rst       Mon Nov 18 
04:18:31 2002
@@ -4,8 +4,8 @@
 
 :Authors:   Asko Soukka
 :Stakeholders: Tuomas Lukka
-:Last-Modified: $Date: 2002/11/14 15:40:08 $
-:Revision: $Revision: 1.8 $
+:Last-Modified: $Date: 2002/11/18 09:18:31 $
+:Revision: $Revision: 1.9 $
 :Status:   Current
 :Date-Created: 2002-11-05
 :Scope:    Minor
@@ -22,7 +22,8 @@
 
        /** Creates a CullingCoordSys with distinct parent and test 
         * coordinate systems. Exluding the test for drawing, the 
-        * CullingCoordSys works like its parent coordinate system. 
+        * CullingCoordSys works like its parent coordinate system.
+        * E.g. CullingCoordSys returns its parents box. 
         *
         * This coordsys will not necessarily be drawn if the boxes
         * of the test and clip coordinate systems do not intersect.
Index: gzz/gfx/libcoords/Coords.cxx
diff -u gzz/gfx/libcoords/Coords.cxx:1.53 gzz/gfx/libcoords/Coords.cxx:1.54
--- gzz/gfx/libcoords/Coords.cxx:1.53   Tue Nov 12 01:37:57 2002
+++ gzz/gfx/libcoords/Coords.cxx        Mon Nov 18 04:18:31 2002
@@ -855,7 +855,6 @@
          DBG(dbg_cull) << "(" << p1.x << "," << p1.y << "), (" << p2.x << "," 
<< p2.y << ") <=> ("
                        << p3.x << "," << p3.y << "), (" << p4.x << "," << p4.y 
<< ")\n";
          
-
          /*      
            glLineWidth(1);
            glColor3f(1, 1, 1);
@@ -1017,6 +1016,9 @@
        virtual bool performGL() { 
          DBG(dbg_cull) << "called CullingCoordsys::performGL\n";
            return super->performGL();
+       }
+       virtual Pt getSqSize() {
+         return super->getSqSize();
        }
        /** CullingCoordSys' shouldBeDrawn() returns true always when boxes 
         * of its test and clip coordinate systems do intersect. When
Index: gzz/gfx/libcoords/Coords.hxx
diff -u gzz/gfx/libcoords/Coords.hxx:1.22 gzz/gfx/libcoords/Coords.hxx:1.23
--- gzz/gfx/libcoords/Coords.hxx:1.22   Fri Nov  1 03:05:13 2002
+++ gzz/gfx/libcoords/Coords.hxx        Mon Nov 18 04:18:31 2002
@@ -95,7 +95,7 @@
        /** How nonlinear is the coordinate system at the given point.
         * The return value is 1/l where l would be a reasonable length 
         * for dicing.
-        * Returns 0 if dicing is required.
+        * Returns 0 if dicing is not required.
         * XXX This needs more thought.
         */
        virtual float nonlinearity(const ZPt &p, float radius) { 
Index: gzz/metacode/pegboard.py
diff -u gzz/metacode/pegboard.py:1.21 gzz/metacode/pegboard.py:1.22
--- gzz/metacode/pegboard.py:1.21       Fri Nov 15 16:42:20 2002
+++ gzz/metacode/pegboard.py    Mon Nov 18 04:18:31 2002
@@ -35,9 +35,6 @@
 #CSS' location relative to pegroot
 css = '../gzz.css'
 
-#macro in pegroot/pegboard.rst to replace with pegboard table
-replace = '<p>INSERT_PEGBOARD</p>\n' 
-
 #pegs will be sorted after their priority
 priority = {'Current': 1,
             'Revising': 2,
@@ -184,13 +181,6 @@
                peg['html'] = rstfile[0:len(rstfile)-4]+'.html'
                 peg['topic'] = getTagValue(document, 'title', always_raw=1)
                 peg['topic'] = peg['topic']
-                #mark literates in topic
-                if peg['topic'].count('``')%2 == 0:
-                    for i in range(peg['topic'].count('``')/2):
-                        peg['topic'] = peg['topic'].replace('``', '<tt>', 1)
-                        peg['topic'] = peg['topic'].replace('``', '</tt>', 1)
-                else:
-                    peg['topic'] = peg['topic'].replace('`', '')
                 peg['last-modified'] = getFieldTagValue(document, 
'last-modified')
                 #we may have got 'rawsource', which needs some tidying
                 if peg['last-modified'].startswith('$Date'):
@@ -290,20 +280,31 @@
     return [table]
 
 def td(__node, **args):
-    if isinstance(__node, type('')):
-        __node = nodes.Text(__node)
-        
     entry = nodes.entry(**args)
     para = nodes.paragraph()
     entry += para
+
+    if isinstance(__node, type('')):
+        str = __node
+        #mark literates
+        if str.count('``')%2 == 0:
+            for i in range(str.count('``')/2):
+                if str.find('``') != 0:
+                    para += nodes.Text(str[0:str.find('``')])
+                str = str[str.find('``')+2:len(str)]
+                literal = nodes.literal(para, 
nodes.Text(str[0:str.find('``')]))
+                para += literal
+                str = str[str.find('``')+2:len(str)]
+        __node = nodes.Text(str)
+        
     para += __node
     return entry
     
 
 def make_files(peg):
-    para = nodes.paragraph()
+    list = nodes.bullet_list(class="plain")
     entry = nodes.entry(class='peg_files_field')
-    entry += para
+    entry += list
     
     for file in peg['files']:
         try:
@@ -331,15 +332,16 @@
                 text = nodes.Text(converted)
 
                 ref += text
-                para += ref
+                listitem = nodes.list_item(list, ref)
+                list += listitem
             else:
                 href = peg['dir'] + '/' + file
                 ref = nodes.reference(anonymous=1, refuri=href)
                 text = nodes.Text(file)
                 
                 ref += text
-                para += ref
-
+                listitem = nodes.list_item(list, ref)
+                list += listitem
     return entry
 
 pegboard_directive.arguments = ()