[SCM] Render HTML and CSS content with tk branch, debian, updated. e68fcaac016a9e83434726cde652570a865cdff0

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 02b9d69cddc77c42c913b1692b189758253d34fe
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Feb 22 18:53:48 2012 +0100

    Add all patches that appeared on the mailing list yet

diff --git a/debian/patches/dont_ignore_bgcolor.patch b/debian/patches/dont_ignore_bgcolor.patch
new file mode 100644
index 0000000..f6a1108
--- /dev/null
+++ b/debian/patches/dont_ignore_bgcolor.patch
@@ -0,0 +1,18 @@
+Origin: http://groups.google.com/group/tkhtml3/browse_thread/thread/74ccb54074bec7d5
+Description: Fix the problem that tkhtml seems to ignore 'background-color' 
+ on tbody-tags.
+--- a/src/htmlprop.c
++++ b/src/htmlprop.c
+@@ -2045,6 +2045,12 @@ HtmlComputedValuesInit(pTree, pNode, pParent, p)
+         memcpy(&p->fontKey, pValues->fFont->pKey, sizeof(HtmlFontKey));
+         pValues->mask = 
+             (pValues->mask & iCopyMask) | (pParentValues->mask & !iCopyMask);
++        /* inherit background from parent */
++        p->values.cBackgroundColor->nRef++;
++        decrementColorRef(pTree, p->values.cBackgroundColor );
++
++        p->values.cBackgroundColor = 
++	    ((HtmlElementNode *)pParent)->pPropertyValues->cBackgroundColor;
+     }
+ 
+     p->values.cColor->nRef++;
diff --git a/debian/patches/dont_resize_fixed_table_columns.patch b/debian/patches/dont_resize_fixed_table_columns.patch
new file mode 100644
index 0000000..a1eb6aa
--- /dev/null
+++ b/debian/patches/dont_resize_fixed_table_columns.patch
@@ -0,0 +1,38 @@
+Origin: http://groups.google.com/group/tkhtml3/browse_thread/thread/ff9221f6ea2ba16d
+Description: If I have a html-table like ... <TD width=120px> ...
+ all the columns are resized if the widget ist smaller then it should be. 
+--- a/src/htmltable.c
++++ b/src/htmltable.c
+@@ -1480,14 +1480,12 @@ tableCalculateCellWidths(pData, availablewidth, isAuto)
+     logWidthStage(2, pStageLog, pData->nCol, aWidth);
+ 
+     /* Allocate pixels to explicit width columns */
+-    if (iRemaining > 0) {
+-        for (ii = 0; ii < pData->nCol; ii++) {
+-            if (aReqWidth[ii].eType == CELL_WIDTH_PIXELS) {
+-                int iReq = MAX(0, aReqWidth[ii].x.iVal - aWidth[ii]);
+-                aWidth[ii] += iReq;
+-                iRemaining -= iReq;
+-            }
+-        }
++    for (ii = 0; ii < pData->nCol; ii++) {
++	if (aReqWidth[ii].eType == CELL_WIDTH_PIXELS) {
++	    int iReq = MAX(0, aReqWidth[ii].x.iVal - aWidth[ii]);
++	    aWidth[ii] += iReq;
++	    iRemaining -= iReq;
++	}
+     }
+     logWidthStage(3, pStageLog, pData->nCol, aWidth);
+ 
+@@ -1560,6 +1558,11 @@ tableCalculateCellWidths(pData, availablewidth, isAuto)
+     assert(CELL_WIDTH_PERCENT == 2);
+     for (jj = 0; iRemaining < 0 && jj < 3; jj++) {
+         
++        /* Only reduce columns with CELL_WIDTH_AUTO or CELL_WIDTH_PERCENT */
++        if (jj != CELL_WIDTH_AUTO || jj != CELL_WIDTH_PERCENT )	{
++            continue;
++        };
++
+         /* Total allocated, less the total min-content-width, for the cols */
+         int iAllocLessMin = 0;
+ 
diff --git a/debian/patches/fix_empty_offset.patch b/debian/patches/fix_empty_offset.patch
new file mode 100644
index 0000000..bb80296
--- /dev/null
+++ b/debian/patches/fix_empty_offset.patch
@@ -0,0 +1,36 @@
+Origin: http://groups.google.com/group/tkhtml3/browse_thread/thread/9a624679a76e73cf
+Description: The problem is that the get_selection method doesn't account for 
+ when the "html text offset" command returns the empty string (it does, and 
+ the C source says it can).
+--- a/hv/hv3.tcl
++++ b/hv/hv3.tcl
+@@ -786,11 +786,11 @@
+     $me motion $N $x $y
+   }
+
+   # get_selection OFFSET MAXCHARS
+   #
+-  #     This command is invoked whenever the current selection is selected
++  #     This command is invoked whenever the current selection is requested
+   #     while it is owned by the html widget. The text of the
+selected
+   #     region is returned.
+   #
+   proc get_selection {me offset maxChars} {
+     upvar $me O
+@@ -801,10 +801,13 @@
+     set n2 $O(myToNode)
+     set i2 $O(myToIdx)
+
+     set stridx_a [$O(myHv3) html text offset $O(myFromNode)
+$O(myFromIdx)]
+     set stridx_b [$O(myHv3) html text offset $O(myToNode)
+$O(myToIdx)]
++    if {$stridx_a eq "" || $stridx_b eq ""} {
++      return ""
++    }
+     if {$stridx_a > $stridx_b} {
+       foreach {stridx_a stridx_b} [list $stridx_b $stridx_a] {}
+     }
+
+     if {$O(myMode) eq "word"} {
diff --git a/debian/patches/series b/debian/patches/series
index ed48d57..a68a29f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,7 @@
 fix_state_sock.patch
 hv3_binary.patch
 install_manpages.patch
+fix_empty_offset.patch
+dont_resize_fixed_table_columns.patch
+dont_ignore_bgcolor.patch
+

-- 
Render HTML and CSS content with tk