[Gzz-commits] gzz ./Makefile doc/gzz.css gzz/view/LinebrokenC...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/10/08 18:55:18

Modified files:
        .              : Makefile 
        doc            : gzz.css 
        gzz/view       : LinebrokenCellContentView.java 
        test           : testutil.py 
Added files:
        metacode       : pegboard.py 

Log message:
        'make pegs' creates html

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Makefile.diff?tr1=1.180&tr2=1.181&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/gzz.css.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/LinebrokenCellContentView.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/pegboard.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/testutil.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: gzz/Makefile
diff -c gzz/Makefile:1.180 gzz/Makefile:1.181
*** gzz/Makefile:1.180  Tue Oct  8 12:26:09 2002
--- gzz/Makefile        Tue Oct  8 18:55:18 2002
***************
*** 280,286 ****
  gcj-src:
        gcj-3.0 --main=(mainclass) -o gzigzag $(SRC)
  
! doc: javadoc documl docxx
  
  javadoc: ready_to_compile
        find . -name '*.class' | xargs rm -f # Don't let javadoc see these
--- 280,286 ----
  gcj-src:
        gcj-3.0 --main=(mainclass) -o gzigzag $(SRC)
  
! doc: pegs javadoc documl docxx
  
  javadoc: ready_to_compile
        find . -name '*.class' | xargs rm -f # Don't let javadoc see these
***************
*** 294,299 ****
--- 294,302 ----
  
  docxx:
        doc++  -a --before-group --before-class --no-java-graphs 
--trivial-graphs  -H -F -d doc/docxx -u `find gfx -name '*.hxx'`
+         
+ pegs:
+       python metacode/pegboard.py # should be $(JYTHON)
  
  lavadoc::
        javadoc $(JAVADOCOPTS) -d lavadoc -sourcepath ./:lava/  gzz gzz.impl 
gzz.impl.errors
***************
*** 363,369 ****
  JVMFLAGS= -Xms64M -Xmx128M # -Xincgc
  
  ifeq (,$(JYTHONPATH))
!  
JYTHONPATH=$(GZZ_DEPENDS)/jythonlib.jar:$(GZZ_DEPENDS)/pythonlib.jar:$(GZZ_DEPENDS)/yaml.jar
  endif
  ifeq (,$(JYTHON))
  # python.verbose can be: "error", "warning", "message", "comment", "debug"
--- 366,372 ----
  JVMFLAGS= -Xms64M -Xmx128M # -Xincgc
  
  ifeq (,$(JYTHONPATH))
!  
JYTHONPATH=$(GZZ_DEPENDS)/jythonlib.jar:$(GZZ_DEPENDS)/pythonlib.jar:$(GZZ_DEPENDS)/yaml.jar:$(GZZ_DEPENDS)/docutils.jar
  endif
  ifeq (,$(JYTHON))
  # python.verbose can be: "error", "warning", "message", "comment", "debug"
Index: gzz/doc/gzz.css
diff -c gzz/doc/gzz.css:1.1 gzz/doc/gzz.css:1.2
*** gzz/doc/gzz.css:1.1 Tue Aug 27 05:32:50 2002
--- gzz/doc/gzz.css     Tue Oct  8 18:55:18 2002
***************
*** 10,22 ****
        font-size: medium;
        font-family: sans-serif;
        }
!  h1 { margin-left: -15%;}
   h2 { margin-left: -15%; margin-top: 2.0em; margin-bottom: 0.5em; }
   h3 { margin-left: -7%;  margin-top: 0.75em; margin-bottom: 0.5em; }
   h4 { margin-left: -0%;  margin-top: 0.5em; }
   h4 { margin-bottom: 0.25em; }
   h5 { margin-bottom: -1em; }
!  h1, h2, h3, h4, h5, p, ul { font-family: serif; }
   p, ul { font-family: sans-serif; }
   h1, h2, h3, h4, h5 { font-weight: bold; }
   h1, h2, h3, h4 { background: #b0e0e0; border-style: solid; border-color: 
black;
--- 10,22 ----
        font-size: medium;
        font-family: sans-serif;
        }
!  h1, .footer { margin-left: -15%;}
   h2 { margin-left: -15%; margin-top: 2.0em; margin-bottom: 0.5em; }
   h3 { margin-left: -7%;  margin-top: 0.75em; margin-bottom: 0.5em; }
   h4 { margin-left: -0%;  margin-top: 0.5em; }
   h4 { margin-bottom: 0.25em; }
   h5 { margin-bottom: -1em; }
!  h1, h2, h3, h4, h5 { font-family: serif; }
   p, ul { font-family: sans-serif; }
   h1, h2, h3, h4, h5 { font-weight: bold; }
   h1, h2, h3, h4 { background: #b0e0e0; border-style: solid; border-color: 
black;
***************
*** 27,32 ****
--- 27,33 ----
   h3 { font-size: 160%; }
   h4 { font-size: 120%; }
   h5 { font-size: 100%; }
+  .footer { font-size: 80%; }
   dt { font-weight: bold; }
   dfn { font-weight: bold; }
   code { font-family: monospace; }
***************
*** 38,43 ****
--- 39,45 ----
   .wideimg { margin-left: -18%; margin-right: -6%; }
   .abstract { width: 60%; text-align: center; }
   .algorithm { font-family: serif; background: #00E0E0; margin-left: 1cm;}
+  .docinfo-name { font-weight: bold; }
   span.red { color: red; background: white;}
   span.green { color: green; background: white; }
  
Index: gzz/gzz/view/LinebrokenCellContentView.java
diff -c gzz/gzz/view/LinebrokenCellContentView.java:1.9 
gzz/gzz/view/LinebrokenCellContentView.java:1.10
*** gzz/gzz/view/LinebrokenCellContentView.java:1.9     Tue Oct  8 03:34:54 2002
--- gzz/gzz/view/LinebrokenCellContentView.java Tue Oct  8 18:55:18 2002
***************
*** 38,44 ****
   */
  
  public class LinebrokenCellContentView implements CellContentView {
! public static final String rcsid = "$Id: LinebrokenCellContentView.java,v 1.9 
2002/10/08 07:34:54 tjl Exp $";
      public static boolean dbg = false;
      private static void p(String s) { if(dbg) pa(s); }
      private static void pa(String s) { System.err.println(s); }
--- 38,44 ----
   */
  
  public class LinebrokenCellContentView implements CellContentView {
! public static final String rcsid = "$Id: LinebrokenCellContentView.java,v 
1.10 2002/10/08 22:55:18 benja Exp $";
      public static boolean dbg = false;
      private static void p(String s) { if(dbg) pa(s); }
      private static void pa(String s) { System.err.println(s); }
***************
*** 107,137 ****
                             float scale) {
          Object key = new Integer(start+1472);
        s = s.substring(start, end);
- 
-       /**
-         (Benja:) Ouch. The following line makes a great difference, even 
though
-       that should really not be so.
-       
-       Without this line, on *my* system (though not Tuomas'!), the text vobs
-       added by this method extend from 'start' till 's.length()'-- 'end'
-       seems to be ignored. That is, if 's' is "Foo bar baz", 'start' is 4
-       and 'end' is 8, the text shown on the screen is not "bar ", as intended,
-       but "bar baz". (The width used in linebreaking is "bar ", though.)
-       
-       This means two things, apparently:
-       o  My JVM handles substring() virtually, so 's.substring(start, end)'
-          is not a copy of a part of 's', but a subrange of the memory range
-          occupied by 's', starting at 'start' and spanning 'end-start'
-          characters. '""+s', on the other hand, creates a copy of 's'.
-       o  Something on the C++ side does not respect the string length passed
-          to it by the JVM (it presumably thinks the string is 
-          NUL-terminated). So, it displays all the text starting at 'start'
-          till the end of 's'.
-          
-       Therefore, please don't remove the following line until you can be sure
-       the bug explained above has been fixed...
-       **/
-       s = ""+s;
  
        if(dbg) pa("addVobs: "+start+" "+end+" '"+s+"'");
          TextVob vob = new TextVob(style, s, true, key);
--- 107,112 ----
Index: gzz/test/testutil.py
diff -c gzz/test/testutil.py:1.12 gzz/test/testutil.py:1.13
*** gzz/test/testutil.py:1.12   Tue Oct  1 06:14:47 2002
--- gzz/test/testutil.py        Tue Oct  8 18:55:18 2002
***************
*** 110,117 ****
  
  
  
! def suite(files):
!     """Create a test suite for all .tests in a given directory."""
      return unittest.TestSuite([unittest.makeSuite(load(t))
                                 for t in tests(files)])
  
--- 110,122 ----
  
  
  
! def suite(files, omit=[]):
!     """
!     Create a test suite for all .tests in a given directory.
!     
!     files -- list of files and directories
!     omit -- files/subdirectories to avoid (defaults to empty list)
!     """
      return unittest.TestSuite([unittest.makeSuite(load(t))
                                 for t in tests(files)])