updated this test reference output.

2003-06-30  Dodji Seketeli <dodji at seketeli dot org>

* tests/test-output-refs/test4.1.css.out: updated this
test reference output.

* src/parser/cr-statement.c: fixed a typo that lead to a small
regression detected by the non regression test suite.

* tests/testctl: made sure no to consider the .cvsignore file
during the final diff.

* src/layeng/cr-box-view.[ch]: fixed some compiler warnings.

Dodji.

7 files changed, 25 insertions, 98 deletions

diff --git a/ChangeLog b/ChangeLog
index 46063ae..c6614bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-06-30  Dodji Seketeli <dodji at seketeli dot org>
+
+	* tests/test-output-refs/test4.1.css.out: updated this
+	test reference output.
+
+	* src/parser/cr-statement.c: fixed a typo that lead to a small
+	regression detected by the non regression test suite.
+
+	* tests/testctl: made sure no to consider the .cvsignore file
+	during the final diff.
+
+	* src/layeng/cr-box-view.[ch]: fixed some compiler warnings.	
+
 2003-06-28  Gaël Chamoulaud (strider) <strider@freespiders.org>
 
 	* csslint/csslint.c (csslint_show_version): Added CROCO_LAYENG_ENABLED
@@ -28,7 +41,7 @@
 	* csslint/csslint.c: fixed some small bugs in csslint. Now, --cssom is
 	set by default.
 
-2003-06-21  dodji  <dodji@seketeli.org>
+2003-06-21  dodji  <dodji()seketeli()org>
 
 	* src/parser/cr-statement.[ch]:
 	Changed the prototype of cr_statement_unlink() to
diff --git a/Makefile.am b/Makefile.am
index 9cf526c..6e16253 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ bin_SCRIPTS=croco-config
 man_MANS = croco-config.1
 
 EXTRA_DIST= croco-config.in libcroco.pc libcroco.spec TODO Doxyfile \
-HACKING COPYING.LIB COPYING docs/examples/cssom-example.c  \
+HACKING COPYING.LIB COPYING docs/examples/*.c  \
 docs/usage.txt  tests/test-inputs/*.css \
 tests/test-output-refs/*.out $(man_MANS)
 
diff --git a/src/layeng/cr-box-view.c b/src/layeng/cr-box-view.c
index beb4dd4..1f48153 100644
--- a/src/layeng/cr-box-view.c
+++ b/src/layeng/cr-box-view.c
@@ -76,10 +76,6 @@ draw_box (CRBoxView *a_this,
           GdkRectangle *a_region_to_draw) ;
 
 static enum CRStatus
-draw_margins (CRBoxView *a_bv,
-              CRBox *a_box) ;
-
-static enum CRStatus
 draw_borders (CRBoxView *a_bv,
               CRBox *a_box) ;
 
@@ -301,96 +297,6 @@ set_color (CRBoxView *a_this, CRRgb *a_rgb_color,
         return CR_OK ;
 }
 
-/**
- *Draws the margin rectangle.
- *Note: This is only for debug purpose because 
- *margins are always transparent.
- *@param a_this the bow view to draw on.
- *@param a_box the box to draw.
- *@return CR_OK upon successfull completion, an error code
- *otherwise.
- */
-static enum CRStatus
-draw_margins (CRBoxView *a_this,
-              CRBox *a_box)
-{
-        GdkWindow * window = NULL ;
-        GtkWidget *widget = NULL ;
-        CRBox *box = NULL ;
-        GdkRectangle rect ;
-
-        g_return_val_if_fail (a_this
-                              && CR_IS_BOX_VIEW (a_this)
-                              && a_box,
-                              CR_BAD_PARAM_ERROR) ;
-
-        widget = GTK_WIDGET (a_this) ;
-        window = GTK_LAYOUT (a_this)->bin_window ;
-        g_return_val_if_fail (window, CR_ERROR) ;
-
-        box = a_box ;
-        g_return_val_if_fail (box, CR_ERROR) ;
-
-        /*
-         *draw left margin rectangle
-         */
-        rect.x = box->outer_edge.x ;
-        rect.y = box->border_edge.y ;
-        rect.width = box->border_edge.x - box->outer_edge.x ;
-        rect.height = box->border_edge.height ;
-        gdk_draw_rectangle 
-                (window,
-                 PRIVATE (a_this)->gc,
-                 FALSE,
-                 rect.x, rect.y, rect.width, rect.height) ;
-
-        /*
-         *draw right margin rectangle
-         *Note: this uses the previous left margin rectangle calculation result.
-         */
-        rect.x = box->border_edge.x + box->border_edge.width;
-        /*rect.y remains the same*/
-        rect.width = box->outer_edge.width - 
-                (box->border_edge.width + rect.width) ;
-        /*rect.height remains the same;*/  
-        gdk_draw_rectangle 
-                (window,
-                 GTK_WIDGET (a_this)->style->base_gc[widget->state],
-                 FALSE,
-                 rect.x, rect.y, rect.width, rect.height) ;
-
-        /*
-         *draw top margin rectangle.
-         */
-        rect.x = box->outer_edge.x ;
-        rect.y = box->outer_edge.y ;
-        rect.width = box->outer_edge.width ;
-        rect.height = box->border_edge.y - box->outer_edge.y ;
-        
-        gdk_draw_rectangle 
-                (window,
-                 GTK_WIDGET (a_this)->style->base_gc[widget->state],
-                 FALSE,
-                 rect.x, rect.y, rect.width, rect.height) ;
-
-        /*
-         *draw bottom margin rectangle.
-         */
-        /*rect.x remains the same*/
-        rect.y = box->border_edge.y + box->border_edge.height ;
-        /*rect.width remains the same as for top margin rect.*/
-        rect.height = box->outer_edge.height -
-                (box->border_edge.height + rect.height) ;
-
-        gdk_draw_rectangle 
-                (window,
-                 GTK_WIDGET (a_this)->style->base_gc[widget->state],
-                 FALSE,
-                 rect.x, rect.y, rect.width, rect.height) ;
-
-        return CR_OK ;
-}
-
 static enum CRStatus
 draw_borders (CRBoxView *a_this,
               CRBox *a_box)
diff --git a/src/layeng/cr-box-view.h b/src/layeng/cr-box-view.h
index 82c0985..6839352 100644
--- a/src/layeng/cr-box-view.h
+++ b/src/layeng/cr-box-view.h
@@ -69,6 +69,11 @@ cr_box_view_get_box_model (CRBoxView *a_this, CRBoxModel **a_box_model) ;
 enum CRStatus
 cr_box_view_set_box_model (CRBoxView *a_this,
                            CRBoxModel *a_box_model) ;
+CRBoxView *
+cr_box_view_new_from_bm (CRBoxModel *a_box_root) ;
+
+enum CRStatus
+cr_box_view_layout (CRBoxView *a_this) ;
 
 void
 cr_box_view_destroy (GtkObject *a_this) ;
diff --git a/src/parser/cr-statement.c b/src/parser/cr-statement.c
index 36458c9..88ef9c0 100644
--- a/src/parser/cr-statement.c
+++ b/src/parser/cr-statement.c
@@ -232,7 +232,6 @@ parse_page_end_page_cb (CRDocHandler *a_this,
 	g_return_if_fail (stmt->type == AT_PAGE_RULE_STMT);
         
 	status = cr_doc_handler_set_result (a_this, stmt) ;
-        status = cr_doc_handler_set_result (a_this, NULL) ;
 	g_return_if_fail (status == CR_OK) ;
 }
 
diff --git a/tests/test-output-refs/test4.1.css.out b/tests/test-output-refs/test4.1.css.out
index 6431341..df3e4c8 100644
--- a/tests/test-output-refs/test4.1.css.out
+++ b/tests/test-output-refs/test4.1.css.out
@@ -2,6 +2,10 @@
   font-family : Verdana, Arial, Helvetica, sans-serif, monospace
 }
 
+tutu:class1:class2 {
+  test : ok
+}
+
 body {
   background : #606060;
   color : #000000
diff --git a/tests/testctl b/tests/testctl
index a9001fe..ff78c33 100755
--- a/tests/testctl
+++ b/tests/testctl
@@ -194,7 +194,7 @@ cleanup_tests ()
 
 run_test_report ()
 {
-    diff -Nur --exclude=*CVS* $HERE/$TEST_OUT_REF_DIR $HERE/$TEST_OUTPUT_DIR > /tmp/toto$$
+    diff -Nur --exclude=*CVS* --exclude=*cvs* $HERE/$TEST_OUT_REF_DIR $HERE/$TEST_OUTPUT_DIR > /tmp/toto$$
     NB_DIFF=`cat /tmp/toto$$ | wc -l`
 
     if test "$NB_DIFF" -eq 0 ; then