You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2002/06/27 08:30:04 UTC
cvs commit: embperl Embperl.pm epdom.c eputil.c
richter 2002/06/26 23:30:04
Modified: . Tag: Embperl2c Embperl.pm epdom.c eputil.c
Log:
rtf bugfixes
Revision Changes Path
No revision
No revision
1.118.4.118 +2 -2 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.117
retrieving revision 1.118.4.118
diff -u -r1.118.4.117 -r1.118.4.118
--- Embperl.pm 25 Jun 2002 06:09:59 -0000 1.118.4.117
+++ Embperl.pm 27 Jun 2002 06:30:02 -0000 1.118.4.118
@@ -46,7 +46,7 @@
@ISA = qw(Exporter DynaLoader);
-$VERSION = '2.0b8' ;
+$VERSION = '2.0b9_dev-1' ;
if ($modperl = $ENV{MOD_PERL})
1.4.2.96 +25 -1 embperl/Attic/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.c,v
retrieving revision 1.4.2.95
retrieving revision 1.4.2.96
diff -u -r1.4.2.95 -r1.4.2.96
--- epdom.c 19 Jun 2002 04:22:43 -0000 1.4.2.95
+++ epdom.c 27 Jun 2002 06:30:02 -0000 1.4.2.96
@@ -1561,6 +1561,7 @@
tNodeData * pPrevNode = Node_selfPreviousSibling (a, pDomTree, pCompileNode, r -> Component.nCurrRepeatLevel) ;
tNodeData * pCompileParent = NodeAttr_selfParentNode (pDomTree, pCompileNode, r -> Component.nCurrRepeatLevel) ;
+ tNodeData * pCompileParent2= NodeAttr_selfParentNode (pDomTree, pCompileParent, r -> Component.nCurrRepeatLevel) ;
tNodeData * pRunParent = NodeAttr_selfParentNode (pDomTree, pRunNode, r -> Component.nCurrRepeatLevel) ;
tNodeData * pRunParent2 = NodeAttr_selfParentNode (pDomTree, pRunParent, r -> Component.nCurrRepeatLevel) ;
@@ -1584,6 +1585,29 @@
if ((a -> pCurrReq?a -> pCurrReq -> Component.Config.bDebug:a -> Config.bDebug) & dbgCheckpoint)
lprintf (a, "[%d]Checkpoint: jump backward DomTree=%d Index=%d Node=%d RepeatLevel=%d Line=%d -> Index=%d Node=%d Line=%d SVs=%d\n", a -> pThread -> nPid, r -> Component.xCurrDomTree, nCompileCheckpoint, pPrevNode -> xNdx, r -> Component.nCurrRepeatLevel, pPrevNode -> nLinenumber, nRunCheckpoint, pRunNode -> xNdx, pRunNode -> nLinenumber, sv_count) ;
+
+ }
+ else if (pRunParent2 && pCompileParent2 && pCompileParent2 -> xNdx == pRunParent2 -> xNdx)
+ {
+ pPrevNode = Node_selfPreviousSibling (a, pDomTree, pCompileParent, r -> Component.nCurrRepeatLevel) ;
+ if (pPrevNode)
+ pPrevNode = Node_selfCondCloneNode (a, pDomTree, pPrevNode, r -> Component.nCurrRepeatLevel) ;
+ else
+ {
+ pPrevNode = Node_selfCondCloneNode (a, pDomTree, pCompileParent, r -> Component.nCurrRepeatLevel) ;
+ pPrevNode -> bFlags |= nflgIgnore ;
+ }
+
+ r -> Component.nCurrRepeatLevel++ ;
+ pRunNode = Node_selfCondCloneNode (a, pDomTree, pRunParent, r -> Component.nCurrRepeatLevel) ;
+
+ pRunNode -> xPrev = pPrevNode -> xNdx ;
+ pPrevNode -> xNext = pRunNode -> xNdx ;
+ pRunNode -> bFlags |= nflgNewLevelPrev ;
+ pPrevNode -> bFlags |= nflgNewLevelNext ;
+
+ if ((a -> pCurrReq?a -> pCurrReq -> Component.Config.bDebug:a -> Config.bDebug) & dbgCheckpoint)
+ lprintf (a, "[%d]Checkpoint: jump backward parent DomTree=%d Index=%d Node=%d RepeatLevel=%d Line=%d -> Index=%d Node=%d Line=%d SVs=%d\n", a -> pThread -> nPid, r -> Component.xCurrDomTree, nCompileCheckpoint, pPrevNode -> xNdx, r -> Component.nCurrRepeatLevel, pPrevNode -> nLinenumber, nRunCheckpoint, pRunNode -> xNdx, pRunNode -> nLinenumber, sv_count) ;
}
else if (xNode_selfLevelNull(pDomTree,pPrevNode) == xNode_selfLevelNull(pDomTree,pRunParent))
1.15.4.54 +4 -2 embperl/eputil.c
Index: eputil.c
===================================================================
RCS file: /home/cvs/embperl/eputil.c,v
retrieving revision 1.15.4.53
retrieving revision 1.15.4.54
diff -u -r1.15.4.53 -r1.15.4.54
--- eputil.c 20 May 2002 07:04:25 -0000 1.15.4.53
+++ eputil.c 27 Jun 2002 06:30:03 -0000 1.15.4.54
@@ -387,12 +387,14 @@
if (bInUrl == 16)
{
- /* Just remove \ for rtf */
+ /* Just remove \ and }{ for rtf */
if (nLen == 0)
nLen = strlen (sData) ;
e = sData + nLen ;
while (p < e)
{
+ if (*p == '}' && p[1] == '{')
+ *p++ = ' ', *p++ = ' ' ;
if (*p == '\\' && p[1] != '\0')
*p++ = ' ' ;
p++ ;
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org