richter 01/08/01 01:02:37
Modified: . Tag: Embperl2c DOM.xs epdom.c epdom.h epparse.c
Embperl/Syntax Tag: Embperl2c RTF.pm
test/cmp Tag: Embperl2c rtfbasic.asc rtffull.asc rtfloop.asc
Log:
Embperl 2 - RTF syntax
Revision Changes Path
No revision
No revision
1.1.2.13 +6 -3 embperl/DOM.xs
Index: DOM.xs
===================================================================
RCS file: /home/cvs/embperl/DOM.xs,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- DOM.xs 2001/07/31 08:02:07 1.1.2.12
+++ DOM.xs 2001/08/01 08:02:36 1.1.2.13
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: DOM.xs,v 1.1.2.12 2001/07/31 08:02:07 richter Exp $
+# $Id: DOM.xs,v 1.1.2.13 2001/08/01 08:02:36 richter Exp $
#
###################################################################################
@@ -188,11 +188,14 @@
char *
-embperl_Node_iChildsText (xDomTree, xChild)
+embperl_Node_iChildsText (xDomTree, xChild, bDeep=0)
int xDomTree
int xChild
+ int bDeep
+PREINIT:
+ char * sText ;
CODE:
- char * sText = Node_childsText (DomTree_self (xDomTree), xChild) ;
+ sText = Node_childsText (DomTree_self (xDomTree), xChild, 0, bDeep) ;
RETVAL = sText?sText:"" ;
OUTPUT:
RETVAL
1.4.2.42 +12 -4 embperl/Attic/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.c,v
retrieving revision 1.4.2.41
retrieving revision 1.4.2.42
diff -u -r1.4.2.41 -r1.4.2.42
--- epdom.c 2001/07/31 08:02:07 1.4.2.41
+++ epdom.c 2001/08/01 08:02:36 1.4.2.42
@@ -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.41 2001/07/31 08:02:07 richter Exp $
+# $Id: epdom.c,v 1.4.2.42 2001/08/01 08:02:36 richter Exp $
#
###################################################################################*/
@@ -2182,27 +2182,35 @@
char * Node_childsText (/*in*/ tDomTree * pDomTree,
- /*in*/ tNode xNode)
+ /*in*/ tNode xNode,
+ /*i/o*/ char * * ppText,
+ /*in*/ int bDeep)
{
tNodeData * pParent = Node_self (pDomTree, xNode) ;
tNodeData * pNode ;
char * sNodeText ;
- char * sText = NULL ;
+ char * sText = ppText?*ppText:NULL ;
if (pParent)
{
- StringNew (&sText, 1024) ;
+ if (sText == NULL)
+ StringNew (&sText, 1024) ;
pNode = Node_selfFirstChild (pDomTree, pParent) ;
while (pNode)
{
sNodeText = Node_selfNodeName(pNode) ;
StringAdd (&sText, sNodeText, 0) ;
+ if (bDeep)
+ Node_childsText (pDomTree, pNode -> xNdx, &sText, 1) ;
+
pNode = Node_selfNextSibling (pDomTree, pNode) ;
}
}
+ if (ppText)
+ *ppText = sText ;
return sText ;
}
1.4.2.22 +4 -2 embperl/Attic/epdom.h
Index: epdom.h
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.h,v
retrieving revision 1.4.2.21
retrieving revision 1.4.2.22
diff -u -r1.4.2.21 -r1.4.2.22
--- epdom.h 2001/07/31 08:02:07 1.4.2.21
+++ epdom.h 2001/08/01 08:02:36 1.4.2.22
@@ -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.21 2001/07/31 08:02:07 richter Exp $
+# $Id: epdom.h,v 1.4.2.22 2001/08/01 08:02:36 richter Exp $
#
###################################################################################*/
@@ -350,7 +350,9 @@
/*in*/ int bFlags) ;
char * Node_childsText (/*in*/ tDomTree * pDomTree,
- /*in*/ tNode xNode) ;
+ /*in*/ tNode xNode,
+ /*i/o*/ char * * ppText,
+ /*in*/ int bDeep) ;
1.4.2.31 +20 -12 embperl/Attic/epparse.c
Index: epparse.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epparse.c,v
retrieving revision 1.4.2.30
retrieving revision 1.4.2.31
diff -u -r1.4.2.30 -r1.4.2.31
--- epparse.c 2001/07/31 08:02:07 1.4.2.30
+++ epparse.c 2001/08/01 08:02:36 1.4.2.31
@@ -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.30 2001/07/31 08:02:07 richter Exp $
+# $Id: epparse.c,v 1.4.2.31 2001/08/01 08:02:36 richter Exp $
#
###################################################################################*/
@@ -537,7 +537,7 @@
enum tNodeType nForceType,
int bUnescape,
int bInsideMustExist,
- const char * pParentNodeName,
+ tStringIndex nParentNodeName,
tNode xParentNode,
int level,
char * pCDATAStart,
@@ -576,7 +576,7 @@
if (pStartChars [*pCurr >> 3] & 1 << (*pCurr & 7))
{ /* valid token start char found */
struct tTokenTable * pNextTokenTab = pTokenTable ;
- const char * pNodeName = NULL ;
+ tStringIndex nNodeName = 0 ;
enum tNodeType nNodeType = 0 ;
char * pCurrTokenStart = pCurr ;
@@ -635,7 +635,7 @@
pCurr++ ;
if (pToken -> sNodeName)
- pNodeName = pToken -> sNodeName ;
+ nNodeName = pToken -> nNodeName ;
}
else
{
@@ -649,7 +649,7 @@
}
*/
if (pToken && pToken -> sNodeName)
- pNodeName = pToken -> sNodeName ;
+ nNodeName = pToken -> nNodeName ;
break ;
}
@@ -673,6 +673,13 @@
else if (pToken -> bRemoveSpaces & 4)
while (pEnd >= pCurrStart && (*pEnd == ' ' || *pEnd ==
'\t' || *pEnd == '\r'))
pEnd-- ;
+ else if (pToken -> bRemoveSpaces & 16)
+ {
+ while (pEnd >= pCurrStart && isspace (*pEnd))
+ pEnd-- ;
+ if (pEnd >= pCurrStart && pEnd < pCurrTokenStart - 1)
+ pEnd++ ;
+ }
if (bUnescape)
{
@@ -682,14 +689,15 @@
}
- if (!(xNewNode = Node_appendChild (pDomTree, nCDataType, 0,
pCurrStart, pEnd - pCurrStart + 1, xParentNode, level, GetLineNoOf (r, pCurrStart),
NULL)))
- return 1 ;
+ if (pEnd - pCurrStart + 1)
+ if (!(xNewNode = Node_appendChild (pDomTree, nCDataType,
0, pCurrStart, pEnd - pCurrStart + 1, xParentNode, level, GetLineNoOf (r, pCurrStart),
NULL)))
+ return 1 ;
}
pCurrStart = pCurrTokenStart ;
}
- if (pNodeName == NULL)
- pNodeName = pToken -> sText ;
+ if (nNodeName == 0)
+ nNodeName = pToken -> nNodeName ;
if (pToken -> nNodeType == ntypEndTag && level > 0)
{ /* end token found */
@@ -740,7 +748,7 @@
if (nType == ntypStartEndTag)
nType = ntypStartTag ;
- if (!(xNewNode = Node_appendChild (pDomTree, nType,
(nCDataType == ntypAttrValue && pToken -> nNodeType != ntypAttr)?(pToken ->
nForceType?2:1):0, pNodeName, strlen (pNodeName), xParentNode, level, GetLineNoOf (r,
pCurrTokenStart), pToken -> sText)))
+ if (!(xNewNode = Node_appendChild (pDomTree, nType,
(nCDataType == ntypAttrValue && pToken -> nNodeType != ntypAttr)?(pToken ->
nForceType?2:1):0, NULL, nNodeName, xParentNode, level, GetLineNoOf (r,
pCurrTokenStart), pToken -> sText)))
{
r -> Buf.pCurrPos = pCurrTokenStart ;
@@ -765,7 +773,7 @@
0,
pToken -> bUnescape,
pToken -> bInsideMustExist +
bInsideMustExist,
- pNodeName,
+ nNodeName,
xNewNode,
level+1,
pToken -> nNodeType ==
ntypCDATA?pCurrTokenStart:NULL,
@@ -963,7 +971,7 @@
pTokenTableSave = r -> pTokenTable ;
- if ((rc = ParseTokens (r, &pStart, pEnd, r -> pTokenTable, "", NULL, ntypCDATA,
0, 0, 0, "root", xDocNode, 0, NULL, NULL)) != ok)
+ if ((rc = ParseTokens (r, &pStart, pEnd, r -> pTokenTable, "", NULL, ntypCDATA,
0, 0, 0, String2Ndx("root", 4), xDocNode, 0, NULL, NULL)) != ok)
return rc ;
/* Add one child node end the end to catch loops that end at the very last node
*/
No revision
No revision
1.1.2.13 +22 -6 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.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- RTF.pm 2001/07/31 08:02:09 1.1.2.12
+++ RTF.pm 2001/08/01 08:02:37 1.1.2.13
@@ -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.12 2001/07/31 08:02:09 richter Exp $
+# $Id: RTF.pm,v 1.1.2.13 2001/08/01 08:02:37 richter Exp $
#
###################################################################################
@@ -84,7 +84,7 @@
#'cdatatype' => ntypAttrValue,
'forcetype' => 1,
'unescape' => 1,
- 'removespaces' => 1,
+ 'removespaces' => 16,
(ref($taginfo) eq 'HASH'?%$taginfo:()),
} ;
if ($procinfo)
@@ -411,6 +411,7 @@
'end' => '}',
'unescape' => 1,
'nodetype' => ntypStartEndTag,
+ 'removespaces' => 2,
#'cdatatype' => ntypCDATA,
#'cdatatype' => ntypAttrValue,
'nodename' => ':',
@@ -420,7 +421,7 @@
'RTF field' => {
'text' => '{\field',
'end' => '}',
- 'nodename' => ':{:}',
+ 'nodename' => ':{:::}',
'nodetype' => ntypStartEndTag,
'insidemustexist' => 1,
'inside' => \%FieldStart,
@@ -487,11 +488,15 @@
'RTF field' => {
'text' => '{\field',
'end' => '}',
- 'nodename' => ':{:}:',
+ 'nodename' => ':{:::}',
'nodetype' => ntypStartEndTag,
#'cdatatype' => ntypAttrValue,
'insidemustexist' => 1,
'inside' => \%FieldStart,
+ 'procinfo' => {
+ 'embperl' => {
+ },
+ },
},
) ;
@@ -521,14 +526,25 @@
'RTF field' => {
'text' => '{\field',
'end' => '}',
- 'nodename' => ':{:}',
+ 'nodename' => ':{:::}',
'nodetype' => ntypStartEndTag,
'insidemustexist' => 1,
'inside' => \%FieldStart,
'procinfo' => {
'embperl' => {
compiletimeperlcode => q[$_ep_rtf_inside++ if ($_ep_rtf_inside) ; ],
- compiletimeperlcodeend => q[ if ($_ep_rtf_inside) {
$_ep_rtf_inside-- ; if ($_ep_rtf_inside == 0) { $_[0] -> Code ($_ep_rtf_code) ; } } ],
+ compiletimeperlcodeend => q[
+ if ($_ep_rtf_inside)
+ {
+ $_ep_rtf_inside-- ;
+ if ($_ep_rtf_inside == 0)
+ {
+ my ($op, $cmp, $a, $b) =
XML::Embperl::DOM::Node::iChildsText (%$q%,%$x%,1) =~
/\:([=<>])\s*\"(.*?)\"\s*\"(.*?)\"\s*\"(.*?)\"/ ;
+ print "op = $op cmp = $cmp a = $a b = $b\n" ;
+ $_[0] -> Code ($_ep_rtf_code) ;
+ }
+ }
+ ],
},
},
},
No revision
No revision
1.1.2.5 +1 -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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- rtfbasic.asc 2001/07/31 08:02:09 1.1.2.4
+++ rtfbasic.asc 2001/08/01 08:02:37 1.1.2.5
@@ -14,7 +14,7 @@
{1.4} {1}
{1.5} {1}
{1.6} {1}
-{1.7} {1}
+{1.7} {1 }
{2.1} {1}
{2.2} {1}
{2.3} {1}
1.1.2.5 +2 -1 embperl/test/cmp/Attic/rtffull.asc
Index: rtffull.asc
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Attic/rtffull.asc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- rtffull.asc 2001/07/31 08:02:09 1.1.2.4
+++ rtffull.asc 2001/08/01 08:02:37 1.1.2.5
@@ -10,7 +10,8 @@
\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 )}}\trowd \trrh-10199\trkeep \clvertalt\cltxtbrl
\cellx3986\clvertalt\cltxbtlr \cellx7973\clvertalt\cltxtbrl
\cellx11959\clvertalt\cltxbtlr \cellx15946\pard\plain
\li113\ri113\widctlpar\intbl\adjustright \fs20\lang1031\cgrid {\b\f1\fs80
-\par }\pard \li2124\ri113\widctlpar\intbl\adjustright {\b\f1\fs80
}{\b\f1\fs80\lang1036 Gerald}{\b\f1\fs80\lang1036 }{\b\f1\fs80\lang1036
Richter}{\b\f1\fs80\lang1036 \cell }\pard \ri113\widctlpar\intbl\adjustright
{\b\f1\fs48\lang1036
+\par }\pard \li2124\ri113\widctlpar\intbl\adjustright {\b\f1\fs80
}{\b\f1\fs80\lang1036 Gerald}{\b\f1\fs80\lang1036 }{\b\f1\fs80\lang1036 Richter
+}{\b\f1\fs80\lang1036 \cell }\pard \ri113\widctlpar\intbl\adjustright
{\b\f1\fs48\lang1036
\par }\pard \li2124\ri113\widctlpar\intbl\adjustright {\b\f1\fs80\lang1036
\par }{\b\f1\fs80 }{\b\f1\fs80\lang1036 Gerald}{\b\f1\fs80\lang1036
}{\b\f1\fs80\lang1036 Richter}
{\b\f1\fs80\lang1036 }{\b\f1\fs80\lang1036 \cell }\pard
\li113\ri113\widctlpar\intbl\adjustright {\b\f1\fs80\lang1036
1.1.2.4 +8 -5 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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- rtfloop.asc 2001/07/31 08:02:09 1.1.2.3
+++ rtfloop.asc 2001/08/01 08:02:37 1.1.2.4
@@ -52,10 +52,11 @@
\cltxlrtb\clftsWidth3\clwWidth2693 \cellx5103\clvertalt\clbrdrt\brdrs\brdrw10
\clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10
\cltxlrtb\clftsWidth3\clwWidth4111 \cellx9214\pard\plain
\s1\ql \li0\ri0\keepn\widctlpar\intbl\faauto\outlinelevel0\adjustright\rin0\lin0
\f121\fs24\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 {\f120\fs20 Richter}
{\f120\fs20 \cell }\pard\plain \ql
\li0\ri0\widctlpar\intbl\faauto\adjustright\rin0\lin0
\fs20\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 {\f120\fs24 Gerald}
-{\f120\fs24 }{\f120\fs24 \cell }{\f120\fs36 \cell }\pard \ql
\li0\ri0\widctlpar\intbl\faauto\adjustright\rin0\lin0 {\f120\fs40 \trowd
\trgaph70\trrh-440\trleft-70\trkeep\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10
+{\f120\fs24 }{\f120\fs24 \cell }{\f120\fs36 \cell }\pard \ql
\li0\ri0\widctlpar\intbl\faauto\adjustright\rin0\lin0 {\f120\fs40 \trowd
\trgaph70\trrh-440\trleft-70\trkeep\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10
\trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10
\trbrdrv\brdrs\brdrw10 \trftsWidth1\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3
\clvertalc\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10
\clbrdrr\brdrs\brdrw10
\cltxlrtb\clftsWidth3\clwWidth2480 \cellx2410\clvertalc\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\intbl\faauto\adjustright\rin0\lin0
{\f120\fs24 Richter2}{\f120\fs24 \cell }{\f120\fs24\lang1040\langfe1031\langnp1040
Gerald2}{\f120\fs24\lang1040\langfe1031\langnp1040
}{\f120\fs24\lang1040\langfe1031\langnp1040 \cell
}{\f120\fs36\lang1040\langfe1031\langnp1040 \cell }\pard \ql
\li0\ri0\widctlpar\intbl\faauto\adjustright\rin0\lin0
{\f120\fs40\lang1040\langfe1031\langnp1040 \trowd
\trgaph70\trrh-440\trleft-70\trkeep\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10
\trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10
\trbrdrv\brdrs\brdrw10
+\clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb\clftsWidth3\clwWidth4111
\cellx9214\row }\pard \ql \li0\ri0\widctlpar\intbl\faauto\adjustright\rin0\lin0
{\f120\fs24 Richter2}{\f120\fs24 \cell }{\f120\fs24\lang1040\langfe1031\langnp1040
Gerald2}{\f120\fs24\lang1040\langfe1031\langnp1040
}{\f120\fs24\lang1040\langfe1031\langnp1040 \cell
}{\f120\fs36\lang1040\langfe1031\langnp1040 \cell }\pard \ql
\li0\ri0\widctlpar\intbl\faauto\adjustright\rin0\lin0 {
+\f120\fs40\lang1040\langfe1031\langnp1040 \trowd
\trgaph70\trrh-440\trleft-70\trkeep\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10
\trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10
\trbrdrv\brdrs\brdrw10
\trftsWidth1\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3
\clvertalc\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10
\clbrdrr\brdrs\brdrw10 \cltxlrtb\clftsWidth3\clwWidth2480
\cellx2410\clvertalc\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 }\trowd \trgaph70\trrh-440\trleft-70\trkeep\trbrdrt\brdrs\brdrw10
\trbrdrl\brdrs\brdrw10 \trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10
\trbrdrh\brdrs\brdrw10 \trbrdrv\brdrs\brdrw10
\trftsWidth1\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3 \clvertalc
@@ -75,7 +76,8 @@
\par }\pard\plain \qc \li0\ri0\widctlpar\faauto\adjustright\rin0\lin0\itap0
\fs20\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 {\b\f120\fs32
\par
\par }{\b\f120\fs44 blabla}{\b\f120\fs44
-\par }{\b\f120\fs44 }{\b\f120\fs44 }{\b\f120\fs44 blubblub}{\b\f120\fs44
}{\b\f120\fs44 }{\b\f120\fs44
+\par }{\b\f120\fs44 }{\b\f120\fs44 }{\b\f120\fs44 blubblub}{
+\b\f120\fs44 }{\b\f120\fs44 }{\b\f120\fs44
\par }{\b\f120\fs36 }{\b\f120\fs40
\par
\par }\pard\plain \s1\ql
\li2124\ri0\keepn\widctlpar\faauto\outlinelevel0\adjustright\rin0\lin2124\itap0
\f121\fs24\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 {\f120\fs36 Referent:\tab
}{\f120\fs36 }{\f120\fs36
@@ -101,10 +103,11 @@
\cltxlrtb\clftsWidth3\clwWidth2693 \cellx5103\clvertalt\clbrdrt\brdrs\brdrw10
\clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10
\cltxlrtb\clftsWidth3\clwWidth4111 \cellx9214\pard\plain
\s1\ql \li0\ri0\keepn\widctlpar\intbl\faauto\outlinelevel0\adjustright\rin0\lin0
\f121\fs24\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 {\f120\fs20 Richter4}
{\f120\fs20 \cell }\pard\plain \ql
\li0\ri0\widctlpar\intbl\faauto\adjustright\rin0\lin0
\fs20\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 {\f120\fs24 Gerald4}
-{\f120\fs24 }{\f120\fs24 \cell }{\f120\fs36 \cell }\pard \ql
\li0\ri0\widctlpar\intbl\faauto\adjustright\rin0\lin0 {\f120\fs40 \trowd
\trgaph70\trrh-440\trleft-70\trkeep\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10
+{\f120\fs24 }{\f120\fs24 \cell }{\f120\fs36 \cell }\pard \ql
\li0\ri0\widctlpar\intbl\faauto\adjustright\rin0\lin0 {\f120\fs40 \trowd
\trgaph70\trrh-440\trleft-70\trkeep\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10
\trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10
\trbrdrv\brdrs\brdrw10 \trftsWidth1\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3
\clvertalc\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10
\clbrdrr\brdrs\brdrw10
\cltxlrtb\clftsWidth3\clwWidth2480 \cellx2410\clvertalc\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\intbl\faauto\adjustright\rin0\lin0
{\f120\fs24 Richter5}{\f120\fs24 \cell }{\f120\fs24\lang1040\langfe1031\langnp1040
Gerald5}{\f120\fs24\lang1040\langfe1031\langnp1040
}{\f120\fs24\lang1040\langfe1031\langnp1040 \cell
}{\f120\fs36\lang1040\langfe1031\langnp1040 \cell }\pard \ql
\li0\ri0\widctlpar\intbl\faauto\adjustright\rin0\lin0
{\f120\fs40\lang1040\langfe1031\langnp1040 \trowd
\trgaph70\trrh-440\trleft-70\trkeep\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10
\trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10
\trbrdrv\brdrs\brdrw10
+\clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb\clftsWidth3\clwWidth4111
\cellx9214\row }\pard \ql \li0\ri0\widctlpar\intbl\faauto\adjustright\rin0\lin0
{\f120\fs24 Richter5}{\f120\fs24 \cell }{\f120\fs24\lang1040\langfe1031\langnp1040
Gerald5}{\f120\fs24\lang1040\langfe1031\langnp1040
}{\f120\fs24\lang1040\langfe1031\langnp1040 \cell
}{\f120\fs36\lang1040\langfe1031\langnp1040 \cell }\pard \ql
\li0\ri0\widctlpar\intbl\faauto\adjustright\rin0\lin0 {
+\f120\fs40\lang1040\langfe1031\langnp1040 \trowd
\trgaph70\trrh-440\trleft-70\trkeep\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10
\trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10
\trbrdrv\brdrs\brdrw10
\trftsWidth1\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3
\clvertalc\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10
\clbrdrr\brdrs\brdrw10 \cltxlrtb\clftsWidth3\clwWidth2480
\cellx2410\clvertalc\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 }\trowd \trgaph70\trrh-440\trleft-70\trkeep\trbrdrt\brdrs\brdrw10
\trbrdrl\brdrs\brdrw10 \trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10
\trbrdrh\brdrs\brdrw10 \trbrdrv\brdrs\brdrw10
\trftsWidth1\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3 \clvertalc
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
