richter 01/08/28 06:58:31
Modified: . Tag: Embperl2c Embperl.xs epdom.c test.pl
Embperl/Syntax Tag: Embperl2c RTF.pm
Log:
Embperl - RTF
Revision Changes Path
No revision
No revision
1.29.4.22 +4 -2 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.29.4.21
retrieving revision 1.29.4.22
diff -u -r1.29.4.21 -r1.29.4.22
--- Embperl.xs 2001/06/25 03:30:02 1.29.4.21
+++ Embperl.xs 2001/08/28 13:58:30 1.29.4.22
@@ -793,12 +793,14 @@
RETVAL = r -> pCodeSV ;
if (items > 1)
{
+ if (r -> pCodeSV)
+ SvREFCNT_dec (r -> pCodeSV) ;
r -> pCodeSV = ST(1) ;
SvREFCNT_inc (r -> pCodeSV) ;
}
ST(0) = RETVAL;
- if (RETVAL != &sv_undef)
- sv_2mortal(ST(0));
+ /*if (RETVAL != &sv_undef)
+ sv_2mortal(ST(0));*/
1.4.2.44 +23 -5 embperl/Attic/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.c,v
retrieving revision 1.4.2.43
retrieving revision 1.4.2.44
diff -u -r1.4.2.43 -r1.4.2.44
--- epdom.c 2001/08/28 08:01:26 1.4.2.43
+++ epdom.c 2001/08/28 13:58:30 1.4.2.44
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epdom.c,v 1.4.2.43 2001/08/28 08:01:26 richter Exp $
+# $Id: epdom.c,v 1.4.2.44 2001/08/28 13:58:30 richter Exp $
#
###################################################################################*/
@@ -2271,6 +2271,7 @@
{
tNodeData * pNewNode ;
tNodeData * pNewParent ;
+ tNodeData * pNewParent2 = NULL ;
tNodeData * pParent ;
if (pCurrReq -> bDebug & dbgParse)
@@ -2283,15 +2284,32 @@
pSavedNode = NULL ;
pNewNode = Node_self (pDomTree, xNextNode) ;
pNewParent = Node_selfParentNode (pDomTree, pNewNode) ;
+ if (pNewParent)
+ pNewParent2 = Node_selfParentNode (pDomTree, pNewParent) ;
+
if ((pNode -> bFlags & nflgSubCheckpoint) == 0 && (pNewNode -> bFlags
& nflgSubCheckpoint) == 0 && (pParent = pLastStartTag))
{
- while (pNewParent != pParent)
+ while (pNewParent != pParent && pNewParent2 != pParent)
{
if (pParent)
{
- oputs (r, "</") ;
- oputs (r, Node_selfNodeName (pParent)) ;
- oputc (r, '>') ;
+ char * pNodeName = Node_selfNodeName (pParent) ;
+
+ if (*pNodeName == ':')
+ {
+ int i = 4 ;
+ while (i > 0 && *pNodeName)
+ if (*pNodeName++ == ':')
+ i-- ;
+ if (*pNodeName)
+ oputs (r, pNodeName) ;
+ }
+ else
+ {
+ oputs (r, "</") ;
+ oputs (r, Node_selfNodeName (pNode)) ;
+ oputc (r, '>') ;
+ }
}
else
{
1.70.4.65 +13 -1 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.64
retrieving revision 1.70.4.65
diff -u -r1.70.4.64 -r1.70.4.65
--- test.pl 2001/07/31 08:02:07 1.70.4.64
+++ test.pl 2001/08/28 13:58:30 1.70.4.65
@@ -11,7 +11,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: test.pl,v 1.70.4.64 2001/07/31 08:02:07 richter Exp $
+# $Id: test.pl,v 1.70.4.65 2001/08/28 13:58:30 richter Exp $
#
###################################################################################
@@ -623,6 +623,18 @@
{ 'Kunde' => 'blabla', Kurs => 'blubblub', 'Nachname' =>
'Richter3', Vorname => 'Gerald3' },
{ 'Kunde' => 'blabla', Kurs => 'blubblub', 'Nachname' =>
'Richter4', Vorname => 'Gerald4' },
{ 'Kunde' => 'blabla', Kurs => 'blubblub', 'Nachname' =>
'Richter5', Vorname => 'Gerald5' },
+ ]
+ },
+ 'rtf/rtfmeta.asc' => {
+ 'version' => 2,
+ 'syntax' => 'RTF',
+ 'offline' => 1,
+ 'param' => [
+ { 'adressen_anrede' => 'Herr', 'adressen_name' =>
'Richter', 'nr' => 11 },
+ { 'adressen_anrede' => 'Herr', 'adressen_name' =>
'Richter', 'nr' => 12 },
+ { 'adressen_anrede' => 'Herr', 'adressen_name' =>
'Richter', 'nr' => 13 },
+ { 'adressen_anrede' => 'Frau', 'adressen_name' => 'Weis',
'nr' => 21 },
+ { 'adressen_anrede' => 'Frau', 'adressen_name' => 'Weis',
'nr' => 22 },
]
},
) ;
No revision
No revision
1.1.2.16 +13 -1 embperl/Embperl/Syntax/Attic/RTF.pm
Index: RTF.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/RTF.pm,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- RTF.pm 2001/08/28 08:01:28 1.1.2.15
+++ RTF.pm 2001/08/28 13:58:31 1.1.2.16
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: RTF.pm,v 1.1.2.15 2001/08/28 08:01:28 richter Exp $
+# $Id: RTF.pm,v 1.1.2.16 2001/08/28 13:58:31 richter Exp $
#
###################################################################################
@@ -50,6 +50,15 @@
if (!$self -> {-rtfBlocks})
{
+ my $eb = $self -> {-epbBlocks} ;
+ my $k ;
+ my $v ;
+
+ while (($k, $v) = each %$eb)
+ {
+ $Block{$k} = $v ;
+ }
+
$self -> {-rtfBlocks} = $self -> CloneHash (\%Para) ;
$self -> AddToRoot ($self -> {-rtfBlocks}) ;
@@ -545,6 +554,9 @@
'cdatatype' => ntypCDATA,
'removespaces' => 0,
'inside' => \%Block,
+ 'procinfo' => {
+ 'embperl' => {},
+ },
},
'RTF field' => {
'text' => '{\field',
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
