richter 01/08/29 01:25:23
Modified: . Tag: Embperl2c Embperl.xs EmbperlObject.pm ep.h
epdom.c epmain.c eputil.c
Embperl/Syntax Tag: Embperl2c RTF.pm
Added: test/cmp Tag: Embperl2c rtfadv.asc rtfmeta.asc
test/html/rtf Tag: Embperl2c rtfmeta.asc
Log:
Embperl 2 - RTF
Revision Changes Path
No revision
No revision
1.29.4.23 +3 -2 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.29.4.22
retrieving revision 1.29.4.23
diff -u -r1.29.4.22 -r1.29.4.23
--- Embperl.xs 2001/08/28 13:58:30 1.29.4.22
+++ Embperl.xs 2001/08/29 08:25:22 1.29.4.23
@@ -195,12 +195,13 @@
void
-embperl_GetPackageOfFile(sSourcefile, sPackage, mtime)
+embperl_GetPackageOfFile(sSourcefile, sPackage, mtime, bEP1Compat)
char * sSourcefile
char * sPackage
double mtime
+ int bEP1Compat
PPCODE:
- tFile * pFile = GetFileData (sSourcefile, sPackage, mtime) ;
+ tFile * pFile = GetFileData (sSourcefile, sPackage, mtime, bEP1Compat) ;
EXTEND(SP,2) ;
PUSHs(sv_2mortal(newSViv(pFile -> mtime == -1?1:0))) ;
PUSHs(sv_2mortal(newSVpv(pFile -> sCurrPackage, pFile -> nCurrPackage))) ;
1.36.4.6 +11 -5 embperl/EmbperlObject.pm
Index: EmbperlObject.pm
===================================================================
RCS file: /home/cvs/embperl/EmbperlObject.pm,v
retrieving revision 1.36.4.5
retrieving revision 1.36.4.6
diff -u -r1.36.4.5 -r1.36.4.6
--- EmbperlObject.pm 2001/05/15 14:19:25 1.36.4.5
+++ EmbperlObject.pm 2001/08/29 08:25:22 1.36.4.6
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: EmbperlObject.pm,v 1.36.4.5 2001/05/15 14:19:25 richter Exp $
+# $Id: EmbperlObject.pm,v 1.36.4.6 2001/08/29 08:25:22 richter Exp $
#
###################################################################################
@@ -256,7 +256,7 @@
{
print HTML::Embperl::LOG "[$$]EmbperlObject Found Base: $fn\n" if ($debug);
print HTML::Embperl::LOG "[$$]EmbperlObject path: $searchpath\n" if
($debug);
- my ($basenew, $basepackage) = HTML::Embperl::GetPackageOfFile ($fn, $req ->
{'package'} || '', -M _) ;
+ my ($basenew, $basepackage) = HTML::Embperl::GetPackageOfFile ($fn, $req ->
{'package'} || '', -M _, $ENV{EMBPERL_EP1COMPAT}) ;
if (!-f $filename && exists $req -> {object_fallback})
{
@@ -268,7 +268,7 @@
my ($new, $package) ;
- ($new, $package) = HTML::Embperl::GetPackageOfFile ($filename, $req ->
{'package'} || '', -M _) if (!$fallback) ;
+ ($new, $package) = HTML::Embperl::GetPackageOfFile ($filename, $req ->
{'package'} || '', -M _, $ENV{EMBPERL_EP1COMPAT}) if (!$fallback) ;
if ($basenew)
{
@@ -276,10 +276,16 @@
HTML::Embperl::Execute ({%$req, inputfile => $fn, import => 0 }) ;
- no strict ;
+ #no strict ;
+ #@{"$basepackage\:\:ISA"} = ($req -> {object_handler_class} ||
'HTML::Embperl::Req') ;
+ #use strict ;
+ }
+ no strict ;
+ if (!@{"$basepackage\:\:ISA"})
+ {
@{"$basepackage\:\:ISA"} = ($req -> {object_handler_class} ||
'HTML::Embperl::Req') ;
- use strict ;
}
+ use strict ;
if ($new || $fallback)
{
1.27.4.17 +2 -1 embperl/ep.h
Index: ep.h
===================================================================
RCS file: /home/cvs/embperl/ep.h,v
retrieving revision 1.27.4.16
retrieving revision 1.27.4.17
diff -u -r1.27.4.16 -r1.27.4.17
--- ep.h 2001/06/25 03:30:02 1.27.4.16
+++ ep.h 2001/08/29 08:25:22 1.27.4.17
@@ -220,7 +220,8 @@
tFile * GetFileData (/*in*/ char * sSourcefile,
/*in*/ char * sPackage,
- /*in*/ double mtime) ;
+ /*in*/ double mtime,
+ /*in*/ int bEP1Compat) ;
tConf * SetupConfData (/*in*/ HV * pReqInfo,
1.4.2.45 +8 -3 embperl/Attic/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.c,v
retrieving revision 1.4.2.44
retrieving revision 1.4.2.45
diff -u -r1.4.2.44 -r1.4.2.45
--- epdom.c 2001/08/28 13:58:30 1.4.2.44
+++ epdom.c 2001/08/29 08:25:22 1.4.2.45
@@ -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.44 2001/08/28 13:58:30 richter Exp $
+# $Id: epdom.c,v 1.4.2.45 2001/08/29 08:25:22 richter Exp $
#
###################################################################################*/
@@ -2272,6 +2272,7 @@
tNodeData * pNewNode ;
tNodeData * pNewParent ;
tNodeData * pNewParent2 = NULL ;
+ tNodeData * pParent2 = NULL ;
tNodeData * pParent ;
if (pCurrReq -> bDebug & dbgParse)
@@ -2289,7 +2290,9 @@
if ((pNode -> bFlags & nflgSubCheckpoint) == 0 && (pNewNode -> bFlags
& nflgSubCheckpoint) == 0 && (pParent = pLastStartTag))
{
- while (pNewParent != pParent && pNewParent2 != pParent)
+ if (pParent)
+ pParent2 = Node_selfParentNode (pDomTree, pParent) ;
+ while (pNewParent != pParent && (!pNewParent2 || !pParent2 ||
pNewParent2 != pParent2))
{
if (pParent)
{
@@ -2307,7 +2310,7 @@
else
{
oputs (r, "</") ;
- oputs (r, Node_selfNodeName (pNode)) ;
+ oputs (r, Node_selfNodeName (pParent)) ;
oputc (r, '>') ;
}
}
@@ -2317,6 +2320,8 @@
break ;
}
pParent = Node_selfParentNode (pDomTree, pParent) ;
+ if (pParent)
+ pParent2 = Node_selfParentNode (pDomTree, pParent) ;
}
}
pLastStartTag = NULL ;
1.75.4.40 +5 -4 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.39
retrieving revision 1.75.4.40
diff -u -r1.75.4.39 -r1.75.4.40
--- epmain.c 2001/07/09 07:49:05 1.75.4.39
+++ epmain.c 2001/08/29 08:25:22 1.75.4.40
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epmain.c,v 1.75.4.39 2001/07/09 07:49:05 richter Exp $
+# $Id: epmain.c,v 1.75.4.40 2001/08/29 08:25:22 richter Exp $
#
###################################################################################*/
@@ -1963,7 +1963,8 @@
tFile * GetFileData (/*in*/ char * sSourcefile,
/*in*/ char * sPackage,
- /*in*/ double mtime)
+ /*in*/ double mtime,
+ /*in*/ int bEP1Compat)
{
SV * * ppSV ;
@@ -2000,8 +2001,8 @@
strcat( cache_key, olddir );
-#ifdef EP2xxx
- if ( pConf->bEP1Compat )
+#ifdef EP2
+ if (bEP1Compat)
{
strcat( cache_key, "-1" ); /* make sure Embperl 1.x compatible files get
another namespace */
cache_key_len += 2 ;
1.15.4.14 +18 -1 embperl/eputil.c
Index: eputil.c
===================================================================
RCS file: /home/cvs/embperl/eputil.c,v
retrieving revision 1.15.4.13
retrieving revision 1.15.4.14
diff -u -r1.15.4.13 -r1.15.4.14
--- eputil.c 2001/08/28 08:01:27 1.15.4.13
+++ eputil.c 2001/08/29 08:25:22 1.15.4.14
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: eputil.c,v 1.15.4.13 2001/08/28 08:01:27 richter Exp $
+# $Id: eputil.c,v 1.15.4.14 2001/08/29 08:25:22 richter Exp $
#
###################################################################################*/
@@ -391,6 +391,23 @@
return nLen ;
}
+#ifdef EP2
+ if (bInUrl == 16)
+ {
+ /* Just remove \ for rtf */
+ if (nLen == 0)
+ nLen = strlen (sData) ;
+ e = sData + nLen ;
+ while (p < e)
+ {
+ if (*p == '\\' && p[1] != '\0')
+ *p++ = ' ' ;
+ p++ ;
+ }
+ return nLen ;
+ }
+#endif
+
s = NULL ;
if (nLen == 0)
nLen = strlen (sData) ;
No revision
No revision
1.1.2.17 +2 -2 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.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- RTF.pm 2001/08/28 13:58:31 1.1.2.16
+++ RTF.pm 2001/08/29 08:25:23 1.1.2.17
@@ -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.16 2001/08/28 13:58:31 richter Exp $
+# $Id: RTF.pm,v 1.1.2.17 2001/08/29 08:25:23 richter Exp $
#
###################################################################################
@@ -59,7 +59,7 @@
$Block{$k} = $v ;
}
- $self -> {-rtfBlocks} = $self -> CloneHash (\%Para) ;
+ $self -> {-rtfBlocks} = $self -> CloneHash (\%Para, { 'unescape' => 17 }) ;
$self -> AddToRoot ($self -> {-rtfBlocks}) ;
No revision
No revision
1.1.2.1 +57 -0 embperl/test/cmp/Attic/rtfadv.asc
1.1.2.1 +44 -0 embperl/test/cmp/Attic/rtfmeta.asc
No revision
No revision
1.1.2.1 +19 -0 embperl/test/html/rtf/Attic/rtfmeta.asc
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
