richter 01/09/10 03:06:09
Modified: . Tag: Embperl2c epcomp.c epdom.c epdom.h test.pl
Embperl Tag: Embperl2c Syntax.pm
Embperl/Syntax Tag: Embperl2c EmbperlHTML.pm RTF.pm
test/cmp Tag: Embperl2c rtfadv.asc rtfbasic.asc rtfloop.asc
rtfmeta.asc
test/html/rtf Tag: Embperl2c rtfadv.asc rtfbasic.asc
rtfmeta.asc
Log:
Embperl 2 - RTF syntax
Revision Changes Path
No revision
No revision
1.4.2.57 +21 -5 embperl/Attic/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcomp.c,v
retrieving revision 1.4.2.56
retrieving revision 1.4.2.57
diff -u -r1.4.2.56 -r1.4.2.57
--- epcomp.c 2001/09/09 19:05:11 1.4.2.56
+++ epcomp.c 2001/09/10 10:06:07 1.4.2.57
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epcomp.c,v 1.4.2.56 2001/09/09 19:05:11 richter Exp $
+# $Id: epcomp.c,v 1.4.2.57 2001/09/10 10:06:07 richter Exp $
#
###################################################################################*/
@@ -582,12 +582,28 @@
{
const char * eq = strchr (p, ':') ;
int nChildNo = atoi (p) ;
- struct tNodeData * pChildNode = Node_selfNextSibling (pDomTree, pNode) ;
+ struct tNodeData * pChildNode ;
const char * sText = NULL ;
- while (pChildNode && nChildNo-- > 0)
- pChildNode = Node_selfNextSibling (pDomTree, pChildNode) ;
-
+ if (nChildNo == 0)
+ pChildNode = pNode ;
+ else if (nChildNo > 0)
+ {
+ nChildNo-- ;
+ pChildNode = Node_selfNextSibling (pDomTree, pNode) ;
+ while (pChildNode && nChildNo-- > 0)
+ pChildNode = Node_selfNextSibling (pDomTree, pChildNode) ;
+
+ }
+ else
+ {
+ nChildNo++ ;
+ pChildNode = Node_selfPreviousSibling (pDomTree, pNode) ;
+ while (pChildNode && nChildNo++ < 0)
+ pChildNode = Node_selfPreviousSibling (pDomTree, pChildNode) ;
+
+ }
+
if (pChildNode)
sText = Node_selfNodeName(pChildNode) ;
1.4.2.46 +3 -3 embperl/Attic/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.c,v
retrieving revision 1.4.2.45
retrieving revision 1.4.2.46
diff -u -r1.4.2.45 -r1.4.2.46
--- epdom.c 2001/08/29 08:25:22 1.4.2.45
+++ epdom.c 2001/09/10 10:06:08 1.4.2.46
@@ -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.45 2001/08/29 08:25:22 richter Exp $
+# $Id: epdom.c,v 1.4.2.46 2001/09/10 10:06:08 richter Exp $
#
###################################################################################*/
@@ -2137,7 +2137,7 @@
return 0 ;
pParent = Node_self (pDomTree, pNode -> xParent) ;
- if (pParent -> xChilds == pNode -> xPrev)
+ if (pParent -> xChilds == pNode -> xNdx)
return 0 ;
return Node_self (pDomTree, pNode -> xPrev) ;
@@ -2165,7 +2165,7 @@
return 0 ;
pParent = Node_self (pDomTree, pNode -> xParent) ;
- if (pParent -> xChilds == pNode -> xPrev)
+ if (pParent -> xChilds == pNode -> xNdx)
return 0 ;
return pNode -> xPrev ;
1.4.2.23 +8 -1 embperl/Attic/epdom.h
Index: epdom.h
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.h,v
retrieving revision 1.4.2.22
retrieving revision 1.4.2.23
diff -u -r1.4.2.22 -r1.4.2.23
--- epdom.h 2001/08/01 08:02:36 1.4.2.22
+++ epdom.h 2001/09/10 10:06:08 1.4.2.23
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epdom.h,v 1.4.2.22 2001/08/01 08:02:36 richter Exp $
+# $Id: epdom.h,v 1.4.2.23 2001/09/10 10:06:08 richter Exp $
#
###################################################################################*/
@@ -284,6 +284,13 @@
tNode Node_nextSibling (/*in*/ tDomTree * pDomTree,
/*in*/ tNode xNode) ;
+
+tNodeData * Node_selfPreviousSibling (/*in*/ tDomTree * pDomTree,
+ /*in*/ tNodeData * pNode) ;
+
+tNode Node_previousSibling (/*in*/ tDomTree * pDomTree,
+ /*in*/ tNode xNode) ;
+
#define DomTree_self(xDomTree) (&pDomTrees[xDomTree])
1.70.4.67 +5 -2 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.66
retrieving revision 1.70.4.67
diff -u -r1.70.4.66 -r1.70.4.67
--- test.pl 2001/09/09 19:05:11 1.70.4.66
+++ test.pl 2001/09/10 10:06:08 1.70.4.67
@@ -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.66 2001/09/09 19:05:11 richter Exp $
+# $Id: test.pl,v 1.70.4.67 2001/09/10 10:06:08 richter Exp $
#
###################################################################################
@@ -607,10 +607,13 @@
'syntax' => 'RTF',
'offline' => 1,
'param' => [
- { 'adressen_anrede' => 'Herr', 'adressen_name' =>
'Richter', 'adressen_vorname' => 'Gerald', anschreiben_typ => 'Dienstadresse',
adressen_dienststelle => 'adrdienst' },
+ { 'adressen_anrede' => 'Herr', 'adressen_name' =>
'Richter', 'adressen_vorname' => 'Gerald', anschreiben_typ => 'Dienstadresse',
adressen_dienststelle => 'adr dienst', adressen_dienstbezeichnung => 'DBEZ',
adressen_dienst_strasse => 'dstr 1', adressen_priv_strasse => 'pstr 1' },
+ { 'adressen_anrede' => 'Herr', 'adressen_name' =>
'Richter2', 'adressen_vorname' => 'Gerald2', anschreiben_typ => 'Dienstadresse',
adressen_dienststelle => 'adr dienst 2', adressen_dienstbezeichnung => 'DBEZ2' },
{ 'adressen_anrede' => 'Frau', 'adressen_name' => 'Weis',
'adressen_vorname' => 'Ulrike' },
{ 'adressen_anrede' => 'Frau', 'adressen_name' => 'Weis',
'adressen_vorname' => 'Sarah' },
{ 'adressen_anrede' => 'Frau', 'adressen_name' => 'Weis',
'adressen_vorname' => 'Marissa' },
+ { 'adressen_anrede' => 'Frau', 'adressen_name' => 'Weis',
'adressen_vorname' => 'Gerald2', anschreiben_typ => 'Dienstadresse',
adressen_dienststelle => 'adr dienst 2', adressen_dienstbezeichnung => 'DBEZ2' },
+ { 'adressen_anrede' => 'Frau', 'adressen_name' => 'Weis',
'adressen_vorname' => 'Gerald2', anschreiben_typ => 'Privatadresse',
adressen_dienststelle => 'adr dienst 2', adressen_dienstbezeichnung => 'DBEZ2',
adressen_dienst_strasse => 'dstr 2', adressen_priv_strasse => 'pstr 2' },
]
},
'rtf/rtfloop.asc' => {
No revision
No revision
1.1.4.43 +5 -2 embperl/Embperl/Attic/Syntax.pm
Index: Syntax.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Syntax.pm,v
retrieving revision 1.1.4.42
retrieving revision 1.1.4.43
diff -u -r1.1.4.42 -r1.1.4.43
--- Syntax.pm 2001/09/09 19:05:12 1.1.4.42
+++ Syntax.pm 2001/09/10 10:06:09 1.1.4.43
@@ -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.42 2001/09/09 19:05:12 richter Exp $
+# $Id: Syntax.pm,v 1.1.4.43 2001/09/10 10:06:09 richter Exp $
#
###################################################################################
@@ -639,7 +639,10 @@
=item %><N>%
-Text of sibling node number <N> (starting with zero)
+Text of sibling node number <N> .
+0 gives the current node,
+> 0 gives the Nth next node,
+< 0 gives the Nth previous node.
=item %&<attr>%
No revision
No revision
1.1.2.7 +2 -2 embperl/Embperl/Syntax/Attic/EmbperlHTML.pm
Index: EmbperlHTML.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/EmbperlHTML.pm,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- EmbperlHTML.pm 2001/04/26 13:13:07 1.1.2.6
+++ EmbperlHTML.pm 2001/09/10 10:06:09 1.1.2.7
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: EmbperlHTML.pm,v 1.1.2.6 2001/04/26 13:13:07 richter Exp $
+# $Id: EmbperlHTML.pm,v 1.1.2.7 2001/09/10 10:06:09 richter Exp $
#
###################################################################################
@@ -128,7 +128,7 @@
perlcode =>
[
'_ep_opt (%$n%, %^*htmlselect%, %&*\'value%, %&\'selected%);',
- '_ep_opt (%$n%, %^*htmlselect%, %>*\'0%, %&\'selected%);',
+ '_ep_opt (%$n%, %^*htmlselect%, %>*\'1%, %&\'selected%);',
]
}) ;
$self -> AddTagWithStart ('/option', 'option') ;
1.1.2.20 +96 -16 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.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- RTF.pm 2001/09/09 19:05:12 1.1.2.19
+++ RTF.pm 2001/09/10 10:06:09 1.1.2.20
@@ -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.19 2001/09/09 19:05:12 richter Exp $
+# $Id: RTF.pm,v 1.1.2.20 2001/09/10 10:06:09 richter Exp $
#
###################################################################################
@@ -22,7 +22,7 @@
use HTML::Embperl::Syntax::EmbperlBlocks ;
use strict ;
-use vars qw{@ISA %Para %Block %BlockInside %FieldStart %CmdStart %Var %Spaces
%Inside} ;
+use vars qw{@ISA %RTF %Para %ParaBlockInside %Block %BlockInside %FieldStart
%CmdStart %Var %Spaces %Inside} ;
require Text::ParseWords ;
@@ -61,13 +61,14 @@
$Block{$k} = $v ;
}
- $self -> {-rtfBlocks} = $self -> CloneHash (\%Para) ;
+ $self -> {-rtfBlocks} = $self -> CloneHash (\%RTF) ;
$self -> AddToRoot ($self -> {-rtfBlocks}) ;
- #$self -> {-rtfCmds} = $self -> {-rtfBlocks}{'RTF field'}{'follow'}{'RTF
fieldstart'}{'follow'}{'RTF block cmd'}{'follow'} ;
- $self -> {-rtfCmds} = $self -> {-rtfBlocks}{'RTF first
paragraph'}{'inside'}{'RTF field'}{'inside'}{'RTF fieldstart'}{'inside'}{'RTF block
cmd'}{'inside'} ;
- $self -> {-rtfCmds2} = $self -> {-rtfBlocks}{'RTF first
paragraph'}{'inside'}{'RTF field'}{'inside'}{'RTF fieldstart'}{'inside'} ;
+# $self -> {-rtfCmds} = $self -> {-rtfBlocks}{'RTF mainblock'}{'inside'}{'RTF
first paragraph'}{'inside'}{'RTF field'}{'inside'}{'RTF fieldstart'}{'inside'}{'RTF
block cmd'}{'inside'} ;
+# $self -> {-rtfCmds2} = $self -> {-rtfBlocks}{'RTF mainblock'}{'inside'}{'RTF
first paragraph'}{'inside'}{'RTF field'}{'inside'}{'RTF fieldstart'}{'inside'} ;
+ $self -> {-rtfCmds} = $self -> {-rtfBlocks}{'RTF mainblock'}{'inside'}{'RTF
field'}{'inside'}{'RTF fieldstart'}{'inside'}{'RTF block cmd'}{'inside'} ;
+ $self -> {-rtfCmds2} = $self -> {-rtfBlocks}{'RTF mainblock'}{'inside'}{'RTF
field'}{'inside'}{'RTF fieldstart'}{'inside'} ;
Init ($self) ;
}
@@ -188,9 +189,9 @@
) ;
$self -> AddRTFCmd ('MERGEFIELD',
{
- perlcode => '_ep_rp(%$x%,scalar(esc(join(\'\',',
+ perlcode => '_ep_rp(%$x%,scalar(esc(join(\'\', ',
perlcodeend => '))));',
- compiletimeperlcode => q[if ($_ep_rtf_inside) { my $tmp
= $_[0] -> Code () ; $tmp =~ s/_ep_rp\(.*?\,/push \@_ep_rtf_tmp,(/ ; $_[0] -> Code
($tmp) } ; $_ep_rtf_cmd = 1 ;],
+ compiletimeperlcode => q[if ($_ep_rtf_inside) { my $tmp
= $_[0] -> Code () ; $tmp =~ s/_ep_rp\(.*?\,/push \@_ep_rtf_tmp,(/ ; $tmp .= '\'' .
(%>'-1%) . '\'' . ',' ; $_[0] -> Code ($tmp) } ; $_ep_rtf_cmd = 1 ;],
},
{
'inside' => \%Var,
@@ -239,8 +240,8 @@
$self -> AddRTFCmd ('IF',
{
- perlcode => '@_ep_rtf_tmp=();',
- compiletimeperlcode => q[$_ep_rtf_inside = 1 ;
$_ep_rtf_code = '_ep_rp($x, \'{\'.($true?$_ep_rtf_tmp[3]:$_ep_rtf_tmp[4]).\'}\');' ;
$_ep_rtf_cmd = 1 ; ],
+ perlcode => '@_ep_rtf_tmp=();%>\'-1% =~ /^\s*(.*?)\s*$/
; $_ep_rtf_preif=$1;',
+ compiletimeperlcode => q[$_ep_rtf_inside = 1 ;
$_ep_rtf_code = '{ my $itmp = $true?$_ep_rtf_tmp[3]:$_ep_rtf_tmp[4]; _ep_rp($x,
\'{\'.$_ep_rtf_preif.(($itmp =~ /^\\\\\\\\/) || !$_ep_rtf_preif?$itmp:"
$itmp").\'}\');}' ; $_ep_rtf_cmd = 1 ; ],
},
{
'nodename' => '::::IF',
@@ -453,7 +454,7 @@
'procinfo' => {
'embperl' => {
compiletimeperlcodeend => q[ $_[0] -> Code ('') if
(!$_ep_rtf_inside || $_ep_rtf_cmd) ; $_ep_rtf_cmd = 0 ;],
- perlcodeend => q[ if (%#'0% =~ /\"\s*$/) { push @_ep_rtf_tmp,
Text::ParseWords::quotewords('\s+', 0, %#'0%) } else { push @_ep_rtf_tmp,%#'0% } ],
+ perlcodeend => q[ { my $tmp = %#'0% ; if ($tmp =~ /\"\s*$/) { $tmp
=~ s/\\\\/\\\\\\\\/g ; push @_ep_rtf_tmp, Text::ParseWords::quotewords('\s+', 0, $tmp)
} else { push @_ep_rtf_tmp,$tmp } }],
},
},
# 'procinfo' => {'embperl' => {}},
@@ -506,15 +507,42 @@
},
) ;
-
-# Finds the first paragraph
-%Para = (
+%ParaBlockInside = (
'-lsearch' => 1,
+ 'RTF block' => {
+ 'text' => '{',
+ 'end' => '}',
+ 'nodename' => '!:{:::}',
+ 'nodetype' => ntypStartEndTag,
+ 'cdatatype' => ntypCDATA,
+ 'removespaces' => 0,
+ 'inside' => \%ParaBlockInside,
+ 'procinfo' => {
+ 'embperl' => {
+ },
+ },
+ },
+ 'RTF field' => {
+ 'text' => '{\field',
+ 'end' => '}',
+ 'nodename' => '!:{:::}',
+ 'nodetype' => ntypStartEndTag,
+ #'cdatatype' => ntypAttrValue,
+ 'insidemustexist' => 1,
+ 'inside' => \%FieldStart,
+ 'procinfo' => {
+ 'embperl' => {
+ },
+ },
+ },
+ ) ;
+
+=pod
'RTF first paragraph' => {
'text' => '\pard',
'end' => '}',
- 'nodename' => '!:::\pard:}',
+ 'nodename' => '!:::\pard:',
'nodetype' => ntypStartTag,
'inside' => \%Block,
'procinfo' => {
@@ -525,6 +553,13 @@
},
},
},
+
+=cut
+
+# Finds the first paragraph
+
+%Para = (
+ '-lsearch' => 1,
'RTF field' => {
'text' => '{\field',
'end' => '}',
@@ -538,11 +573,47 @@
},
},
},
+ %ParaBlockInside,
) ;
+%RTF = (
+ '-lsearch' => 1,
+ 'RTF mainblock' => {
+ 'text' => '{\rtf1',
+ 'end' => '}',
+ 'nodename' => '!:{\rtf1:::}',
+ 'nodetype' => ntypStartEndTag,
+ 'cdatatype' => ntypCDATA,
+ 'removespaces' => 0,
+ 'inside' => \%Block,
+ 'procinfo' => {
+ 'embperl' => {
+ perlcode => q[ my @_ep_rtf_stack ; do { ],
+ perlcodeend => q[ $_ep_rtf_ndx++;} while ($param[$_ep_rtf_ndx]) ; ],
+ mayjump => 1,
+ },
+ },
+ },
+ 'RTF field' => {
+ 'text' => '{\field',
+ 'end' => '}',
+ 'nodename' => '!:{:::}',
+ 'nodetype' => ntypStartEndTag,
+ 'insidemustexist' => 1,
+ 'inside' => \%FieldStart,
+ 'procinfo' => {
+ 'embperl' => {
+ },
+ },
+ },
+ ) ;
+
# Basic definition of Block in a RTF file
+#print "---------\n" ;
+#foreach (@_ep_rtf_tmp) { print "<$_>\n" ; } ;
+
%Block = (
'-lsearch' => 1,
# 'RTF block' => {
@@ -602,7 +673,16 @@
$_ep_rtf_tmp[1] = $1 ;
$_ep_rtf_tmp[2] = $2 ;
}
-
+ if (!$_ep_rtf_tmp[1])
+ {
+ my $tmp = shift @_ep_rtf_tmp ;
+ $_ep_rtf_tmp[0] = $tmp ;
+ }
+ if ($_ep_rtf_tmp[4] =~
/^(\\\\\\\\[0-9a-zA-Z]+\s*)+$/)
+ {
+ $_ep_rtf_tmp[4] = $_ep_rtf_tmp[5] ;
+ }
+
my $op = $_ep_rtf_tmp[1] ;
if ($op eq '=')
{ $true = $_ep_rtf_tmp[0] eq
$_ep_rtf_tmp[2] }
No revision
No revision
1.1.2.3 +124 -13 embperl/test/cmp/Attic/rtfadv.asc
Index: rtfadv.asc
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Attic/rtfadv.asc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- rtfadv.asc 2001/09/09 19:05:12 1.1.2.2
+++ rtfadv.asc 2001/09/10 10:06:09 1.1.2.3
@@ -1,13 +1,39 @@
-{\pard{ Sehr }
+{\rtf1
+{ Sehr }
{geehreter}
{ }
{Herr}
{ }{Richter}
-{adrdienst}
+{\f1\fs22\f1\fs22 adr dienst}
+{\f1\fs22\f1\fs22 adr dienst}
+
+
+
+{\f1\fs22 n}
+{\f1\fs22 }
+{\f1\fs22\f1\fs22 DBEZ}
+
+{\f1\fs22\par }
+{\f1\fs22
+
+}
+{\f1\fs22 }
+{\f1\fs22 Gerald
+
+}{\f1\fs22 }
+{\f1\fs22 Richter
+
+}
+{\f1\fs22\f1\fs22 dstr 1}
+
+{\f1\fs22
+\par Sehr }{\f1\fs22 geehrter}{\f1\fs22 }{\f1\fs22 Herr}{\f1\fs22 }{\f1\fs22
}{\f1\fs22 }{\f1\fs22 Richter}{\f1\fs22 ,
+\par
+
{,
\par
\par dies ist ein Anschreiben
@@ -19,49 +45,134 @@
\par Sq }{1 }{
\par
\par NEXT }{ }
-{Ulrike}
+{Gerald2}
{
\par
\par NEXTIF }{ {<MERGEFIELD>{full_var}<adressen_anrede></MERGEFIELD>}= "Herr" }
-{Ulrike}
+{Sarah}
{
\par
\par SKIPIF }{ {<MERGEFIELD>{full_var}<adressen_anrede></MERGEFIELD>}= "Herr" }
-{Ulrike}
+{Sarah}
{
\par
\par
-\par }{ Sehr }
+\par }}
+{ Sehr }
{geehrte}
{ }
{Frau}
{ }{Weis}
-{}
+{\f1\fs22 }
+{\f1\fs22 }
+
+
+
+{\f1\fs22 }
+{\f1\fs22 }
+{\f1\fs22 }
+{\f1\fs22\par }
+{\f1\fs22
+
+}
+{\f1\fs22 }
+{\f1\fs22 Marissa
+
+}{\f1\fs22 }
+{\f1\fs22 Weis
+
+}
+
+{\f1\fs22\f1\fs22 }
+
+{\f1\fs22
+\par Sehr }{\f1\fs22 geehrte}{\f1\fs22 }{\f1\fs22 Frau}{\f1\fs22 }{\f1\fs22
}{\f1\fs22 }{\f1\fs22 Weis}{\f1\fs22 ,
+\par
+
{,
\par
\par dies ist ein Anschreiben
\par
\par Mit freundlichen Gr\'fc\'dfen.
\par
-\par Datensatz }{3 }{
+\par Datensatz }{5 }{
\par
-\par Sq }{3 }{
+\par Sq }{5 }{
\par
\par NEXT }{ }
-{Marissa}
+{Gerald2}
{
\par
\par NEXTIF }{ {<MERGEFIELD>{full_var}<adressen_anrede></MERGEFIELD>}= "Herr" }
-{Marissa}
+{Gerald2}
{
\par
\par SKIPIF }{ {<MERGEFIELD>{full_var}<adressen_anrede></MERGEFIELD>}= "Herr" }
-{Marissa}
+{Gerald2}
+{
+\par
+\par
+\par }}
+{ Sehr }
+{geehrte}
+{ }
+{Frau}
+{ }{Weis}
+
+{\f1\fs22 }
+
+
+{\f1\fs22 }
+
+
+
+{\f1\fs22 }
+{\f1\fs22 }
+{\f1\fs22 }
+
+{\f1\fs22\par }
+{\f1\fs22
+
+}
+{\f1\fs22 }
+{\f1\fs22 Gerald2
+
+}{\f1\fs22 }
+{\f1\fs22 Weis
+
+}
+
+{\f1\fs22\f1\fs22 pstr 2}
+
+{\f1\fs22
+\par Sehr }{\f1\fs22 geehrte}{\f1\fs22 }{\f1\fs22 Frau}{\f1\fs22 }{\f1\fs22
}{\f1\fs22 }{\f1\fs22 Weis}{\f1\fs22 ,
+\par
+
+{,
+\par
+\par dies ist ein Anschreiben
+\par
+\par Mit freundlichen Gr\'fc\'dfen.
+\par
+\par Datensatz }{7 }{
+\par
+\par Sq }{7 }{
+\par
+\par NEXT }{ }
+{}
+{
+\par
+\par NEXTIF }{ {<MERGEFIELD>{full_var}<adressen_anrede></MERGEFIELD>}= "Herr" }
+{}
+{
+\par
+\par SKIPIF }{ {<MERGEFIELD>{full_var}<adressen_anrede></MERGEFIELD>}= "Herr" }
+{}
{
\par
\par
-\par }}
+\par }}}
1.1.2.6 +4 -1 embperl/test/cmp/Attic/rtfbasic.asc
Index: rtfbasic.asc
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Attic/rtfbasic.asc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- rtfbasic.asc 2001/08/01 08:02:37 1.1.2.5
+++ rtfbasic.asc 2001/09/10 10:06:09 1.1.2.6
@@ -1,3 +1,4 @@
+{\rtf1
{one: }{1}
{hash.b: }{222}
{array.2: }{33}
@@ -28,10 +29,12 @@
{ Here we have some spaces: } { } { ok }
-{\pard{ Here we have some spaces: } { } { ok }
+{\pard
+{ Here we have some spaces: } { } { ok }
{1}{ }{���}
+}
}
1.1.2.5 +21 -1 embperl/test/cmp/Attic/rtfloop.asc
Index: rtfloop.asc
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Attic/rtfloop.asc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- rtfloop.asc 2001/08/01 08:02:37 1.1.2.4
+++ rtfloop.asc 2001/09/10 10:06:09 1.1.2.5
@@ -69,7 +69,27 @@
\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10
\clbrdrr\brdrs\brdrw10 \cltxlrtb\clftsWidth3\clwWidth2693
\cellx5103\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10
\clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10
\cltxlrtb\clftsWidth3\clwWidth4111 \cellx9214\row }\pard \ql
\li0\ri0\widctlpar\faauto\adjustright\rin0\lin0\itap0 {\f120
\par
-\par }\plain \qc \li0\ri0\widctlpar\faauto\adjustright\rin0\lin0\itap0
\fs20\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 {- }{\field{\*\fldinst { PAGE
\\* MERGEFORMAT }}{\fldrslt {\lang1024\langfe1024\noproof 1}}}{ -
+\par }\ansi\ansicpg1252\uc1
\deff0\deflang1031\deflangfe1031{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose
02020603050405020304}Times New Roman;}{\f27\fswiss\fcharset0\fprq2{\*\panose
020b0604030504040204}Tahoma;}
+{\f120\fswiss\fcharset0\fprq2{\*\panose 00000000000000000000}Helvetica
(PCL6);}{\f121\fnil\fcharset0\fprq2{\*\panose 00000000000000000000}Stonehenge{\*\falt
Times New Roman};}
+{\f122\fnil\fcharset0\fprq2{\*\panose 00000000000000000000}Metro{\*\falt Times New
Roman};}{\f127\froman\fcharset238\fprq2 Times New Roman
CE;}{\f128\froman\fcharset204\fprq2 Times New Roman
Cyr;}{\f130\froman\fcharset161\fprq2 Times New Roman Greek;}
+{\f131\froman\fcharset162\fprq2 Times New Roman
Tur;}{\f134\froman\fcharset186\fprq2 Times New Roman
Baltic;}{\f343\fswiss\fcharset238\fprq2 Tahoma CE;}{\f344\fswiss\fcharset204\fprq2
Tahoma Cyr;}{\f346\fswiss\fcharset161\fprq2 Tahoma Greek;}
+{\f347\fswiss\fcharset162\fprq2 Tahoma Tur;}{\f348\fswiss\fcharset177\fprq2 Tahoma
(Hebrew);}{\f349\fswiss\fcharset178\fprq2 Tahoma
(Arabic);}{\f350\fswiss\fcharset186\fprq2 Tahoma
Baltic;}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;
+\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;
+\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\ql
\li0\ri0\widctlpar\faauto\adjustright\rin0\lin0\itap0
\fs20\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 \snext0 Normal;}{
+\s1\ql \li0\ri0\keepn\widctlpar\faauto\adjustright\rin0\lin0\itap0
\f121\fs24\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 \sbasedon0 \snext0
heading 1;}{\s2\qc \li0\ri0\keepn\widctlpar\faauto\adjustright\rin0\lin0\itap0
+\b\f121\fs44\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 \sbasedon0 \snext0
heading 2;}{\s3\ql \li2124\ri0\keepn\widctlpar\faauto\adjustright\rin0\lin2124\itap0
\f122\fs40\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 \sbasedon0 \snext0
+heading 3;}{\s4\ql
\li2124\ri0\keepn\widctlpar\faauto\adjustright\rin0\lin2124\itap0
\b\f122\fs40\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 \sbasedon0 \snext0
heading 4;}{\s5\qc \li0\ri0\keepn\widctlpar\faauto\adjustright\rin0\lin0\itap0
+\b\f120\fs36\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 \sbasedon0 \snext0
heading 5;}{\*\cs10 \additive Default Paragraph Font;}{\s15\ql
\li0\ri0\widctlpar\tqc\tx4536\tqr\tx9072\faauto\adjustright\rin0\lin0\itap0
+\fs20\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 \sbasedon0 \snext15
header;}{\s16\ql
\li0\ri0\widctlpar\tqc\tx4536\tqr\tx9072\faauto\adjustright\rin0\lin0\itap0
\fs20\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 \sbasedon0 \snext16 footer;}{
+\s17\qc \li0\ri0\widctlpar\faauto\adjustright\rin0\lin0\itap0
\b\f121\fs44\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 \sbasedon0 \snext17
Title;}{\s18\ql \li0\ri0\widctlpar\faauto\adjustright\rin0\lin0\itap0 \cbpat9
+\f27\fs20\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 \sbasedon0 \snext18
Document Map;}{\s19\qc \li0\ri0\widctlpar\faauto\adjustright\rin0\lin0\itap0
\b\f122\fs40\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 \sbasedon0 \snext19
Subtitle;}}
+{\info{\title Teilnehmerliste}{\author gr}{\operator
gr}{\creatim\yr2001\mo5\dy8\hr5\min56}{\revtim\yr2001\mo5\dy8\hr14\min8}{\printim\yr2000\mo10\dy30\hr15\min53}{\version6}{\edmins0}{\nofpages1}{\nofwords93}{\nofchars534}
+{\*\company
ecos}{\nofcharsws655}{\vern8249}}\paperw11907\paperh16840\margl851\margr397\margt3119\margb1134
+\deftab708\widowctrl\ftnbj\aenddoc\hyphhotz425\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\formshade\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3
+\jcompress\viewkind1\viewscale50\pgbrdrhead\pgbrdrfoot\nolnhtadjtbl \fet0\sectd
\psz9\linex0\headery709\footery284\colsx709\endnhere\sectdefaultcl
{\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl2
+\pnucltr\pnstart1\pnindent720\pnhang{\pntxta
.}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang{\pntxta
.}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang{\pntxta
)}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl6
+\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta
)}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta
)}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta
)}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang
+{\pntxtb (}{\pntxta )}}\pard\plain \qc
\li0\ri0\widctlpar\faauto\adjustright\rin0\lin0\itap0
\fs20\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 {- }{\field{\*\fldinst { PAGE
\\* MERGEFORMAT }}{\fldrslt {\lang1024\langfe1024\noproof 1}}}{ -
\par }{\expnd23\expndtw116
\par }\pard\plain \s17\qc \li0\ri0\widctlpar\faauto\adjustright\rin0\lin0\itap0
\b\f121\fs44\lang1031\langfe1031\cgrid\langnp1031\langfenp1031
{\f120\fs48\expnd23\expndtw116 Teilnehmerliste
\par
1.1.2.2 +2 -1 embperl/test/cmp/Attic/rtfmeta.asc
Index: rtfmeta.asc
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Attic/rtfmeta.asc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- rtfmeta.asc 2001/08/29 08:25:23 1.1.2.1
+++ rtfmeta.asc 2001/09/10 10:06:09 1.1.2.2
@@ -1,4 +1,5 @@
-{\pard{}
+{\rtf1
+{}
{l=, p=Richter}
{ Sehr }
{geehrter}
No revision
No revision
1.1.2.3 +118 -1 embperl/test/html/rtf/Attic/rtfadv.asc
Index: rtfadv.asc
===================================================================
RCS file: /home/cvs/embperl/test/html/rtf/Attic/rtfadv.asc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- rtfadv.asc 2001/09/09 19:05:12 1.1.2.2
+++ rtfadv.asc 2001/09/10 10:06:09 1.1.2.3
@@ -1,4 +1,4 @@
-{\pard
+{\rtf1
{ Sehr }
{\field{\*\fldinst { IF }{\field{\*\fldinst { MERGEFIELD adressen_anrede
}}{\fldrslt {\lang1024 Herr}}}{ = "Herr" "geehreter" "geehrte" }}{\fldrslt {\lang1024
geehreter}}}
{ }
@@ -22,6 +22,123 @@
}{\fldrslt {\f1\fs22\lang1024 Mittelrheinische Treuhand GmbH}}}
+{\field
+ {\*\fldinst
+ {\f1\fs22 IF }
+ {\field
+ {\*\fldinst
+ {\f1\fs22 MERGEFIELD anschreiben_typ }
+ }
+ {\fldrslt
+ {\f1\fs22\lang1024 Dienstadresse}
+ }
+ }
+ {\f1\fs22 = Dienstadresse }
+ {\field
+ {\*\fldinst
+ {\f1\fs22 MERGEFIELD adressen_dienststelle }
+ }
+ {\fldrslt
+ {\f1\fs22\lang1024 Mittelrheinische Treuhand GmbH}
+ }
+ }
+ {\f1\fs22 "" }
+ }
+ {\fldrslt
+ {\f1\fs22\lang1024 Mittelrheinische Treuhand GmbH}
+ }
+}
+
+
+
+{\field
+ {\*\fldinst
+ {\f1\fs22 IF }
+ {\field
+ {\*\fldinst
+ {\f1\fs22 MERGEFIELD adressen_anrede }}
+ {\fldrslt
+ {\f1\fs22\lang1024 Herr}}}
+ {\f1\fs22 = "Herr" "n" "" }
+ }
+ {\fldrslt {\f1\fs22\lang1024 n}}}
+{\f1\fs22 }
+{\field
+ {\*\fldinst
+ {\f1\fs22 IF }
+ {\field
+ {\*\fldinst
+ {\f1\fs22 MERGEFIELD anschreiben_typ }}
+ {\fldrslt
+ {\f1\fs22\lang1024 Dienstadresse}}
+ }
+ {\f1\fs22 = Dienstadresse }
+ {\field
+ {\*\fldinst
+ {\f1\fs22 MERGEFIELD adressen_dienstbezeichnung }}
+ {\fldrslt
+ {\f1\fs22\lang1024 Wirtschaftspr\'fcfer}}
+ }
+ {\f1\fs22 "" }
+ }
+ {\fldrslt
+ {\f1\fs22\lang1024 Wirtschaftspr\'fcfer}}
+}
+
+{\f1\fs22\par }
+{\field
+ {\*\fldinst
+ {\f1\fs22 MERGEFIELD adressen_titel }}
+ {\fldrslt {\f1\fs22\lang1024 Dr.}}
+}
+{\field
+ {\*\fldinst
+ {\f1\fs22 IF }
+ {\field
+ {\*\fldinst {\f1\fs22 MERGEFIELD adressen_titel }}
+ {\fldrslt {\f1\fs22\lang1024 Dr.}}
+ }
+ {\f1\fs22 <> "" " " "" }
+ }
+ {\fldrslt {\f1\fs22\lang1024 }}
+}
+{\field
+ {\*\fldinst {\f1\fs22 MERGEFIELD adressen_vorname }}
+ {\fldrslt {\f1\fs22\lang1024 Horst}}
+}{\f1\fs22 }
+{\field
+ {\*\fldinst {\f1\fs22 MERGEFIELD adressen_name }}
+ {\fldrslt {\f1\fs22\lang1024 Bremser}}
+}
+
+{\field
+ {\*\fldinst
+ {\f1\fs22 IF }
+ {\field
+ {\*\fldinst
+ {\f1\fs22 MERGEFIELD anschreiben_typ }}
+ {\fldrslt {\f1\fs22\lang1024 Dienstadresse}}
+ }
+ {\f1\fs22 = Dienstadresse }
+ {\field
+ {\*\fldinst
+ {\f1\fs22 MERGEFIELD adressen_dienst_strasse }}
+ {\fldrslt {\f1\fs22\lang1024 Hohenzollernstra\'dfe 104-106}}}
+ {\f1\fs22 }
+ {\field
+ {\*\fldinst
+ {\f1\fs22 MERGEFIELD adressen_priv_strasse }}
+ {\fldrslt {\f1\fs22\lang1024 Reinerzer Ring 29}}
+ }
+ {\f1\fs22 }}
+ {\fldrslt {\f1\fs22\lang1024 Hohenzollernstra\'dfe 104-106}}
+}
+
+{\f1\fs22
+\par Sehr }{\field{\*\fldinst {\f1\fs22 IF }{\field{\*\fldinst {\f1\fs22
MERGEFIELD adressen_anrede }}{\fldrslt {\f1\fs22\lang1024 Herr}}}{\f1\fs22 = "Herr"
"geehrter" "geehrte" }}{\fldrslt {\f1\fs22\lang1024 geehrter}}}{\f1\fs22
}{\field{\*\fldinst {
+\f1\fs22 MERGEFIELD adressen_anrede }}{\fldrslt {\f1\fs22\lang1024
Herr}}}{\f1\fs22 }{\field{\*\fldinst {\f1\fs22 MERGEFIELD adressen_titel }}{\fldrslt
{\f1\fs22\lang1024 Dr.}}}{\field{\*\fldinst {\f1\fs22 IF }{\field{\*\fldinst
{\f1\fs22 MERGEFIELD
+ adressen_titel }}{\fldrslt {\f1\fs22\lang1024 Dr.}}}{\f1\fs22 <> "" " " ""
}}{\fldrslt {\f1\fs22\lang1024 }}}{\field{\*\fldinst {\f1\fs22 MERGEFIELD
adressen_name }}{\fldrslt {\f1\fs22\lang1024 Bremser}}}{\f1\fs22 ,
+\par
{,
\par
1.1.2.9 +2 -0 embperl/test/html/rtf/Attic/rtfbasic.asc
Index: rtfbasic.asc
===================================================================
RCS file: /home/cvs/embperl/test/html/rtf/Attic/rtfbasic.asc,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- rtfbasic.asc 2001/07/31 08:02:09 1.1.2.8
+++ rtfbasic.asc 2001/09/10 10:06:09 1.1.2.9
@@ -1,3 +1,4 @@
+{\rtf1
{one: }{\field{\*\fldinst { DOCVARIABLE one \\* MERGEFORMAT }}{\fldrslt }}
{hash.b: }{\field{\*\fldinst { DOCVARIABLE hash.b \\* MERGEFORMAT }}{\fldrslt }}
{array.2: }{\field{\*\fldinst { DOCVARIABLE array.2 }}{\fldrslt }}
@@ -34,3 +35,4 @@
{\field{\*\fldinst {MERGEFIELD one}}{\fldrslt {\b\f1\fs80\lang1024 ----}}}{
}{\field{\*\fldinst {MERGEFIELD uml}}{\fldrslt {\b\f1\fs80\lang1024 ----}}}
}
+}
\ No newline at end of file
1.1.2.2 +1 -1 embperl/test/html/rtf/Attic/rtfmeta.asc
Index: rtfmeta.asc
===================================================================
RCS file: /home/cvs/embperl/test/html/rtf/Attic/rtfmeta.asc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- rtfmeta.asc 2001/08/29 08:25:23 1.1.2.1
+++ rtfmeta.asc 2001/09/10 10:06:09 1.1.2.2
@@ -1,4 +1,4 @@
-{\pard
+{\rtf1
{[$ if $param[$_ep_rtf_ndx]{'adressen_name'} ne $lastnr $]}
{[+ "l=$lastnr, p=$param[$_ep_rtf_ndx]{'adressen_name'}" +][- $lastnr =
$param[$_ep_rtf_ndx]{'adressen_name'} -]}
{ Sehr }
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
