richter 02/02/16 10:00:48
Modified: . Tag: Embperl2c Embperl.xs epparse.c
Embperl Tag: Embperl2c Syntax.pm
Embperl/Syntax Tag: Embperl2c POD.pm
eg/web Tag: Embperl2c base.epl config.pl menuleft.epl
test/cmp Tag: Embperl2c pod.asc
test/conf Tag: Embperl2c httpd.conf.src
test/html/pod Tag: Embperl2c pod.asc
Log:
pod
Revision Changes Path
No revision
No revision
1.29.4.45 +4 -0 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.29.4.44
retrieving revision 1.29.4.45
diff -u -r1.29.4.44 -r1.29.4.45
--- Embperl.xs 10 Feb 2002 21:26:14 -0000 1.29.4.44
+++ Embperl.xs 16 Feb 2002 18:00:47 -0000 1.29.4.45
@@ -28,8 +28,12 @@
RETVAL
+#ifdef APACHE
+
void
embperl_ApacheAddModule ()
+
+#endif
1.4.2.51 +16 -4 embperl/Attic/epparse.c
Index: epparse.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epparse.c,v
retrieving revision 1.4.2.50
retrieving revision 1.4.2.51
diff -u -r1.4.2.50 -r1.4.2.51
--- epparse.c 24 Jan 2002 08:37:05 -0000 1.4.2.50
+++ epparse.c 16 Feb 2002 18:00:47 -0000 1.4.2.51
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epparse.c,v 1.4.2.50 2002/01/24 08:37:05 richter Exp $
+# $Id: epparse.c,v 1.4.2.51 2002/02/16 18:00:47 richter Exp $
#
###################################################################################*/
@@ -885,9 +885,21 @@
}
else
{
- pEndCurr = strstr (pCurr, pToken -> sEndText) ;
- nSkip = strlen (pToken -> sEndText) ;
- if (pToken -> nNodeType == ntypCDATA && pEndCurr &&
!pToken -> sNodeName)
+ pEndCurr = NULL ;
+ if (strcmp (pToken -> sEndText, "\n\n") == 0)
+ {
+ if (pEndCurr = strstr (pCurr, "\n\r\n"))
+ nSkip = pCurr[3] == '\r'?4:3 ;
+ }
+ if (!pEndCurr)
+ {
+ pEndCurr = strstr (pCurr, pToken -> sEndText) ;
+ nSkip = strlen (pToken -> sEndText) ;
+ }
+ if (pToken -> bDontEat & 2)
+ nSkip = 0 ;
+
+ if (pToken -> nNodeType == ntypCDATA && pEndCurr &&
!pToken -> sNodeName)
{
pEndCurr += nSkip ;
nSkip = 0 ;
No revision
No revision
1.1.4.55 +7 -1 embperl/Embperl/Attic/Syntax.pm
Index: Syntax.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Syntax.pm,v
retrieving revision 1.1.4.54
retrieving revision 1.1.4.55
diff -u -r1.1.4.54 -r1.1.4.55
--- Syntax.pm 10 Feb 2002 21:26:16 -0000 1.1.4.54
+++ Syntax.pm 16 Feb 2002 18:00:48 -0000 1.1.4.55
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Syntax.pm,v 1.1.4.54 2002/02/10 21:26:16 richter Exp $
+# $Id: Syntax.pm,v 1.1.4.55 2002/02/16 18:00:48 richter Exp $
#
###################################################################################
@@ -637,6 +637,12 @@
when the token found, the parser stop searching in the current level and continues
with the tokens that are defined in the hash from there the current one was "called"
via inside
+
+=item donteat
+
+set to 1 to don't eat the start text, so it will be matched again, by any tokens
+set under C<inside>. Set 2 to don't the end text. Set to 3 for both.
+
=item 'procinfo' =>
No revision
No revision
1.1.2.10 +21 -3 embperl/Embperl/Syntax/Attic/POD.pm
Index: POD.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/POD.pm,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- POD.pm 11 Feb 2002 17:01:08 -0000 1.1.2.9
+++ POD.pm 16 Feb 2002 18:00:48 -0000 1.1.2.10
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: POD.pm,v 1.1.2.9 2002/02/11 17:01:08 richter Exp $
+# $Id: POD.pm,v 1.1.2.10 2002/02/16 18:00:48 richter Exp $
#
###################################################################################
@@ -262,6 +262,7 @@
%CDATA =
(
+ '-lsearch' => 1,
'verbatim2' =>
{
'text' => " ",
@@ -269,7 +270,8 @@
'cdatatype' => ntypCDATA,
'nodename' => ':::<![CDATA[:]]>',
'removespaces' => 0,
- 'inside' => \%Format,
+ #'inside' => { 'X' => { removespaces => 0, cdatatype => ntypCDATA }},
+ #'inside' => \%Format,
'nodetype' => ntypStartEndTag,
'donteat' => 3,
},
@@ -302,12 +304,26 @@
'nodetype' => ntypStartEndTag,
'donteat' => 1,
},
- 'skip' =>
+ 'pic' => {
+ 'text' => '=pic',
+ 'end' => $paraend,
+ 'nodename' => 'pic',
+ 'nodetype' => ntypStartEndTag,
+ 'cdatatype' => ntypText,
+ },
+
+ 'skip1' =>
{
'text' => "\n",
'contains' => "\r\n",
'nodetype' => ntypCDATA,
},
+ 'skip2' =>
+ {
+ 'text' => "\r",
+ 'contains' => "\r\n",
+ 'nodetype' => ntypCDATA,
+ },
) ;
%ParaTitle =
@@ -354,6 +370,8 @@
'donteat' => 1,
'exitinside' => 1,
},
+
+
) ;
%Tags =
No revision
No revision
1.1.2.4 +2 -0 embperl/eg/web/Attic/base.epl
Index: base.epl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/base.epl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- base.epl 12 Feb 2002 16:55:01 -0000 1.1.2.3
+++ base.epl 16 Feb 2002 18:00:48 -0000 1.1.2.4
@@ -12,6 +12,8 @@
.cSectionText {background: #ddaaaa; }
.cTabsOn {background: #ddaaaa; font-size: 14px; }
.cTabsOff {background: #DDDDDD; font-size: 14px; }
+ .cMenu {font-family: Geneva,Arial,Helvetica; font-size:
10px; }
+ .cNews {font-family: Geneva,Arial,Helvetica; font-size:
10px; }
body {font-family: Geneva,Arial,Helvetica; font-size:
12px; }
table {font-family: Geneva,Arial,Helvetica; font-size:
12px; }
</style>
1.1.2.5 +3 -3 embperl/eg/web/Attic/config.pl
Index: config.pl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/config.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- config.pl 13 Feb 2002 05:37:14 -0000 1.1.2.4
+++ config.pl 16 Feb 2002 18:00:48 -0000 1.1.2.5
@@ -8,8 +8,8 @@
'Documentation' => 'Dokumentation',
'Examples' => 'Beispiele',
'Changes' => '�nderungen',
- 'Sites using Embperl' => 'Websites mit Embperl',
- 'Add info about Embperl' => 'Hinzuf�gen �ber Embperl',
+ 'Sites using Embperl' => 'Sites mit Embperl',
+ 'Add info about Embperl' => 'Hinzuf�gen Infos',
}
) ;
@@ -56,7 +56,7 @@
{ menu => 'Tips & Tricks', uri => 'pod/TipsAndTricks.htm',
file => 'TipsAndTricks.pod' },
{ menu => 'Examples', uri => 'examples/' },
{ menu => 'Changes', uri => 'pod/Changes.htm',
file => 'Changes.pod' },
- { menu => 'Sites using Embperl', uri => 'pod/Sites.htm',
file => 'Sites.pod' },
+ #{ menu => 'Sites using Embperl', uri => 'pod/Sites.htm',
file => 'Sites.pod' },
{ menu => 'News', uri => 'db/news/news.htm',
file => 'eg/web/db/data.epd', fdat => { 'category_id' => 1 } },
{ menu => 'Sites using Embperl', uri => 'db/sites/sites.htm',
file => 'eg/web/db/data.epd', fdat => { 'category_id' => 2 } },
{ menu => 'Add info about Embperl', uri => 'db/addsel.epl',
same =>
1.1.2.2 +1 -1 embperl/eg/web/Attic/menuleft.epl
Index: menuleft.epl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/menuleft.epl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- menuleft.epl 12 Feb 2002 07:20:35 -0000 1.1.2.1
+++ menuleft.epl 16 Feb 2002 18:00:48 -0000 1.1.2.2
@@ -10,7 +10,7 @@
<tr>
<td nowrap align=left width=[+ $ndx * 15 + 2 +]><img = src="[+ $r ->
{imageuri} +]/transp.gif" width="1"></td>
<td nowrap align=left width=15><img src="[+ $r -> {imageuri}
+]/i-sub-[+ $state>1?($state>2?'on':'open'):'off' +].gif" width="11" height="11"
vspace="6" hspace="5"></td>
- <td nowrap align=left><a href="[+ $url +]"><font size="1"
face="Verdana, Arial, Helvetica, sans-serif" color="0"><b>[+ $r -> gettext ($txt)
+]</a></b></font></td>
+ <td nowrap align=left><a href="[+ $url +]"><font size="1"
face="Verdana, Arial, Helvetica, sans-serif" color="0"><div class="cMenu"><b>[+ $r ->
gettext ($txt) +]</b></div></font></a></td>
</tr>
</table>
</td>
No revision
No revision
1.1.2.3 +11 -4 embperl/test/cmp/Attic/pod.asc
Index: pod.asc
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Attic/pod.asc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- pod.asc 29 Nov 2001 07:32:40 -0000 1.1.2.2
+++ pod.asc 16 Feb 2002 18:00:48 -0000 1.1.2.3
@@ -2,10 +2,17 @@
</head><sect1><title>HEAD1</title>
<para>some text under HEAD1</para><para>more text under HEAD1</para>
-<verbatim> some verbatim
- paragraph
</verbatim><para>normal text
-wraps around</para>
-
+<verbatim><![CDATA[ some verbatim
+ paragraph
+]]></verbatim><para>normal text
+wraps around</para><verbatim><![CDATA[ verbatim col 1
+ line 2
+ line 3
+]]></verbatim><verbatim><![CDATA[ verbatim col 3
+ lin2
+ lin3
+]]></verbatim><verbatim><![CDATA[ again col 3
+]]></verbatim><para>para text goes here</para>
<sect2><title>HEAD2</title><para>some text under
HEAD2</para></sect2><sect2><title>second HEAD2 which
wraps to the next line</title><para>some text under HEAD2 which
also warps to the next line</para><para>another paragraph is
No revision
No revision
1.24.4.39 +17 -0 embperl/test/conf/httpd.conf.src
Index: httpd.conf.src
===================================================================
RCS file: /home/cvs/embperl/test/conf/httpd.conf.src,v
retrieving revision 1.24.4.38
retrieving revision 1.24.4.39
diff -u -r1.24.4.38 -r1.24.4.39
--- httpd.conf.src 13 Feb 2002 05:26:30 -0000 1.24.4.38
+++ httpd.conf.src 16 Feb 2002 18:00:48 -0000 1.24.4.39
@@ -543,6 +543,23 @@
Options ExecCGI
</Location>
+<Location /eg/web/conf>
+PerlSetEnv EMBPERL_RECIPE EmbperlLibXSLT
+PerlSetEnv EMBPERL_XSLTSTYLESHEET \"$EPPATH/eg/web/conf/pod.xsl\"
+PerlSetEnv EMBPERL_SYNTAX POD
+sethandler perl-script
+perlhandler Embperl
+</Location>
+
+#Alias /eg/web/xml/ \"$EPPATH/eg/web/conf/\"
+#<Location /eg/web/xml>
+#SetEnv EMBPERL_RECIPE Embperl
+#PerlSetEnv EMBPERL_RECIPE Embperl
+#ForceType text/xml
+#PerlSetEnv EMBPERL_SYNTAX POD
+#sethandler perl-script
+#perlhandler Embperl
+#</Location>
<Location /eg/xml>
No revision
No revision
1.1.2.5 +39 -14 embperl/test/html/pod/Attic/pod.asc
Index: pod.asc
===================================================================
RCS file: /home/cvs/embperl/test/html/pod/Attic/pod.asc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- pod.asc 29 Nov 2001 09:07:45 -0000 1.1.2.4
+++ pod.asc 16 Feb 2002 18:00:48 -0000 1.1.2.5
@@ -21,6 +21,17 @@
normal text
wraps around
+ verbatim col 1
+ line 2
+ line 3
+
+ verbatim col 3
+ lin2
+ lin3
+
+ again col 3
+
+para text goes here
=head2 HEAD2
@@ -75,20 +86,34 @@
text 2
two lines
-
-=over 4
-
-=item nested list item 1
-
-text 1
-line 2
-
-=item nested list item 2
-
-text 2
-line 2
-
-=back
+
+
+=over 4
+
+
+
+=item nested list item 1
+
+
+
+text 1
+
+line 2
+
+
+
+=item nested list item 2
+
+
+
+text 2
+
+line 2
+
+
+
+=back
+
=back
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
