[Vennerable-commits] r39 - in pkg/Vennerable: . R inst/doc tests
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun Aug 2 13:05:58 CEST 2009
Author: js229
Date: 2009-08-02 13:05:56 +0200 (Sun, 02 Aug 2009)
New Revision: 39
Modified:
pkg/Vennerable/DESCRIPTION
pkg/Vennerable/R/02TissueDrawing.R
pkg/Vennerable/R/03VennDrawing.R
pkg/Vennerable/inst/doc/TissueDrawingTest.Rnw
pkg/Vennerable/inst/doc/TissueDrawingTest.pdf
pkg/Vennerable/inst/doc/Venn.Rnw
pkg/Vennerable/tests/bug0521JuneAprilMay.R
Log:
fix bug 521 probably
Modified: pkg/Vennerable/DESCRIPTION
===================================================================
--- pkg/Vennerable/DESCRIPTION 2009-08-01 23:34:10 UTC (rev 38)
+++ pkg/Vennerable/DESCRIPTION 2009-08-02 11:05:56 UTC (rev 39)
@@ -1,6 +1,6 @@
Package: Vennerable
Title: Venn and Euler area-proportional diagrams
-Version: 1.0
+Version: 2.0
Author: Jonathan Swinton
Description: A package for drawing various species of Venn diagrams.
Maintainer: Jonathan Swinton <jonathan at swintons.net>
Modified: pkg/Vennerable/R/02TissueDrawing.R
===================================================================
--- pkg/Vennerable/R/02TissueDrawing.R 2009-08-01 23:34:10 UTC (rev 38)
+++ pkg/Vennerable/R/02TissueDrawing.R 2009-08-02 11:05:56 UTC (rev 39)
@@ -979,9 +979,9 @@
centroid.xy <- matrix(c(cx,cy),ncol=2)
}
-.PlotFace.TissueDrawing <- function(drawing,faceName,dx=0.05,gp=gpar()) {
+.PlotFace.TissueDrawing <- function(drawing,faceName,dx=0.05,gp=gpar(),doDarkMatter=FALSE) {
#cat(faceName,"\n")
- if (faceName=="DarkMatter") {
+ if (!doDarkMatter & faceName=="DarkMatter") {
return()
}
all.xy <- .face.toxy(drawing,faceName,dx=dx)
@@ -1324,6 +1324,9 @@
# so further subdivision takes us back out of the Set
newFaceSigP <- inFaceSignature
newFaceSigM <- paste(substr(inFaceSignature ,1,nSets-1),"0",sep="")
+ # if (newFaceSigM==paste(rep("0",nSets),collapse="")) {
+ # newFaceSigM <- "DarkMatter"
+ # }
}
}
@@ -2006,9 +2009,7 @@
# then negative ones
if (fedges[1]==inneg){ fedges <- fedges[c(2:length(fedges),1)] }
revName <- paste("-",newEdgeName,sep="")
-#if (fname=="10") {cat(sprintf("(%s): %s, %s -> %s\n",paste(fedges,collapse=","),inneg,outneg,revName))}
fedges <- spliceinstead(fedges,c(outneg,inneg),revName)
-#if (fname=="10") {cat(sprintf("(%s)\n",paste(fedges,collapse=",")))}
drawing at faceList[[fname]] <- fedges
}
drawing at nodeList[[inedge at to]] <- NULL
@@ -2016,7 +2017,10 @@
}
.merge.faces.invisibly.split <- function(diagram) {
- fsigs <- data.frame(cbind(Name=unlist(.faceNames(diagram)),Signature=unlist(.faceSignatures(diagram))),stringsAsFactors=FALSE);rownames(fsigs)<- 1:nrow(fsigs)
+ fsigs <- data.frame(cbind(Name=unlist(.faceNames(diagram)),Signature=unlist(.faceSignatures(diagram))),stringsAsFactors=FALSE);
+ rownames(fsigs)<- 1:nrow(fsigs)
+ nSets <- unique(nchar(setdiff(fsigs$Signature,"DarkMatter")))
+ fsigs$Signature[fsigs$Signature==paste(rep("0",nSets),collapse="")] <- "DarkMatter"
w <- lapply(split(fsigs$Name,fsigs$Signature),length)
w <- w[w>1]
if (length(w)>0) {
@@ -2034,7 +2038,6 @@
firstVisibleIx <- min(which(faceVisible1))
firstVisibleFrom <- faceEdges1[[firstVisibleIx ]]@from
diagram<- .startFaceAtPoint(diagram,wnames[1],firstVisibleFrom )
- #diagram<- .startFaceAtPoint(diagram,wnames[2],firstVisibleFrom )
faceEdges1 <- .face.to.faceEdges(diagram,wnames[1])
faceVisible1 <- sapply(faceEdges1,function(x)x at visible)
faceEdges2 <- .face.to.faceEdges(diagram,wnames[2])
Modified: pkg/Vennerable/R/03VennDrawing.R
===================================================================
--- pkg/Vennerable/R/03VennDrawing.R 2009-08-01 23:34:10 UTC (rev 38)
+++ pkg/Vennerable/R/03VennDrawing.R 2009-08-02 11:05:56 UTC (rev 39)
@@ -193,7 +193,7 @@
PlotVennGeometry <- function(C3,gpList,show=list(FaceText="weight")) {
show.default <- list(universe=TRUE,Sets=TRUE,SetLabels=TRUE,
- dark.matter=FALSE,
+ DarkMatter=FALSE,
Faces=TRUE,
FaceText="weight")
unshown <- names(show)[! names(show) %in% names(show.default)]
@@ -216,6 +216,9 @@
if(show.default$universe) {
PlotUniverse(C3)
}
+ if(show.default$DarkMatter) {
+ PlotDarkMatter(C3)
+ }
if (show.default$Faces) {
PlotFaces(C3,gp=gp[["Face"]])
}
@@ -229,7 +232,7 @@
if (length(show.default$FaceText)>0) {
PlotIntersectionText(C3,element.plot=show.default$FaceText,
gp=gp[["FaceText"]],
- show.dark.matter=show.default$dark.matter)
+ show.dark.matter=show.default$DarkMatter)
}
UpViewports()
@@ -337,6 +340,10 @@
pushViewport(viewport(name="Vennvp",layout.pos.row=1,layout.pos.col=1,xscale=xrange,yscale=yrange))
}
+PlotDarkMatter <- function(VD) {
+ ur <- UniverseRange(VD)
+ grey <- brewer.pal(8,"Greys")[2]
+ grid.polygon(x=ur[c(1,1,2,2),1],y=ur[c(1,2,2,1),2],gp=gpar(fill=grey))
+ .PlotFace.TissueDrawing(VD,"DarkMatter",gp=gpar(fill="white"),doDarkMatter=TRUE)
+ }
-
-
Modified: pkg/Vennerable/inst/doc/TissueDrawingTest.Rnw
===================================================================
--- pkg/Vennerable/inst/doc/TissueDrawingTest.Rnw 2009-08-01 23:34:10 UTC (rev 38)
+++ pkg/Vennerable/inst/doc/TissueDrawingTest.Rnw 2009-08-02 11:05:56 UTC (rev 39)
@@ -49,7 +49,14 @@
<<loadmore,echo=FALSE>>=
options(width=80)
-shoar <- function(VDI) {lapply(VDI at edgeList,function(lh){xy <- .edge.to.xy(lh); grid.lines(xy[,1],xy[,2],default.units="native",arrow=arrow())})}
+shoar <- function(VDI) {
+ res <- lapply(VDI at edgeList,function(lh){
+ xy <- .edge.to.xy(lh);
+ grid.lines(xy[,1],xy[,2],default.units="native",arrow=arrow())
+ }
+ )
+ invisible(res)
+}
@
\tableofcontents
@@ -805,7 +812,7 @@
@
\end{center}\end{figure}
-\section{One tangent point}
+\subsection{One tangent point}
<<circ33a>>=
r <- c( 1.261566 ,0.977205, 1.492705)
x <- c(0.000000, 1.350138 ,-1.086542)
@@ -824,28 +831,28 @@
makevp.eqsc(c(-3,3),c(-3,3))
grid.xaxis()
grid.yaxis()
-PlotFaces(TM3)
-PlotSetBoundaries(VDC1);PlotSetBoundaries(VDC2);
-PlotNodes(VDC1);PlotNodes(VDC2);
-.PlotFaceNames.TissueDrawing (TM3)
-PlotNodes(TM3)
-
+PlotFaces(TM)
+PlotSetBoundaries(VDC1);PlotSetBoundaries(VDC2);PlotSetBoundaries(VDC3);
+#PlotNodes(VDC1);PlotNodes(VDC2);PlotNodes(VDC3);
+.PlotFaceNames.TissueDrawing (TM)
+PlotNodes(TM)
+shoar(TM)
@
\end{center}\end{figure}
-\section{Three circles}
+\subsection{Three circles one tangent}
<<circ33b>>=
r <- c( 1.492705, 0.977205, 1.128379)
x <- c(0.000000, 1.384666, -1.028597 )
y <- c(1.49270533, -0.55257134, -0.02662434 )
centres <- matrix(c(x,y),ncol=2,byrow=FALSE)
- VDC1 <- newTissueFromCircle(centres[1,],radius=r[1],Set=1,nodes=6);
- VDC2 <- newTissueFromCircle(centres[2,],radius=r[2],Set=2,nodes=2);
- TM <- addSetToDrawing (drawing1=VDC1,drawing2=VDC2,set2Name="Set2")
- VDC3 <- newTissueFromCircle(centres[3,],radius=r[3],Set=3);
- TM3 <- addSetToDrawing (drawing1=TM,drawing2=VDC3,set2Name="Set3")
- TV3 <- .merge.faces.invisibly.split(TM3)
+ VDC1b <- newTissueFromCircle(centres[1,],radius=r[1],Set=1,nodes=6);
+ VDC2b <- newTissueFromCircle(centres[2,],radius=r[2],Set=2,nodes=2);
+ TMb <- addSetToDrawing (drawing1=VDC1b,drawing2=VDC2b,set2Name="Set2")
+ VDC3b <- newTissueFromCircle(centres[3,],radius=r[3],Set=3);
+ TM3b <- addSetToDrawing (drawing1=TMb,drawing2=VDC3b,set2Name="Set3")
+ TV3b <- .merge.faces.invisibly.split(TM3b)
@
\begin{figure}[H]\begin{center}
@@ -853,15 +860,10 @@
grid.newpage();pushViewport(plotViewport(c(1,1,1,1)))
makevp.eqsc(c(-3,3),c(-3,3))
grid.xaxis();grid.yaxis()
-PlotFaces(TV3)
-PlotSetBoundaries(TV3)
-#PlotSetBoundaries(VDC3)
-#shoar(TM3)
+PlotFaces(TV3b)
+PlotSetBoundaries(TV3b)
+PlotNodes(TV3b)
-#PlotNodes(VDC1);PlotNodes(VDC2);
-#.PlotFaceNames.TissueDrawing (TM3)
-PlotNodes(TM3)
-
@
\end{center}\end{figure}
Modified: pkg/Vennerable/inst/doc/TissueDrawingTest.pdf
===================================================================
--- pkg/Vennerable/inst/doc/TissueDrawingTest.pdf 2009-08-01 23:34:10 UTC (rev 38)
+++ pkg/Vennerable/inst/doc/TissueDrawingTest.pdf 2009-08-02 11:05:56 UTC (rev 39)
@@ -91,43 +91,43 @@
(Canonical)
endobj
65 0 obj
-<< /S /GoTo /D (section.12) >>
+<< /S /GoTo /D (subsection.11.2) >>
endobj
68 0 obj
(One tangent point)
endobj
69 0 obj
-<< /S /GoTo /D (section.13) >>
+<< /S /GoTo /D (subsection.11.3) >>
endobj
72 0 obj
-(Three circles)
+(Three circles one tangent)
endobj
73 0 obj
-<< /S /GoTo /D (section.14) >>
+<< /S /GoTo /D (section.12) >>
endobj
76 0 obj
(Triangles)
endobj
77 0 obj
-<< /S /GoTo /D (section.15) >>
+<< /S /GoTo /D (section.13) >>
endobj
80 0 obj
(Three squares)
endobj
81 0 obj
-<< /S /GoTo /D (section.16) >>
+<< /S /GoTo /D (section.14) >>
endobj
84 0 obj
(Noncontigous subsets)
endobj
85 0 obj
-<< /S /GoTo /D (section.17) >>
+<< /S /GoTo /D (section.15) >>
endobj
88 0 obj
(Ellipses)
endobj
89 0 obj
-<< /S /GoTo /D (section.18) >>
+<< /S /GoTo /D (section.16) >>
endobj
92 0 obj
(This document)
@@ -136,22 +136,20 @@
<< /S /GoTo /D [94 0 R /Fit ] >>
endobj
118 0 obj <<
-/Length 802
+/Length 846
/Filter /FlateDecode
>>
stream
-xÚÝVÉnÛ0½ç+t¤%û±MR Ú"ôRô ÛÆ\KNÛ¿ïP¤äkr±dbæÍòÞõ±¸zÿI³
-\ɬxÈ@J*Ê´¬Îeö¹P¤jÛ½¿Ù9WäOU¯òÅ]6³
-¥³pê¸Ì
-#~±®«E¹Ég Yú®¬6müSÖËø²ólµóm[5u<[¬ýâ±
-à15ÄU
-Bj¨
-CYjÄPwM]vë2ùÞc^
Ì8
ÞXQ¥1¨:,0*êÍ$2Ú`j¡9P©D6;Ø}دöm÷.ÆÆ\rFºwq¹*ª¡×MÝùºkGÙ
-ÚDKÏ8ck}¿ñË¿÷®ÙÅfþÿá;×\ÑÎf(û¥È¹éì©<§ûpHKsRbY¡3© }è»ÙTÛÖ#ÉÆ
-Bó où¡«fÆÙШcD¢ásÚ<v}ÛTA§XgÌjF8;a5
-Lp_ÊÇ«¶zÚn×ËcvùæéÄzQõ§àK 4áz* J¯Gû¡cÜn.E%Q,_yoÂ
-x?~·)·Û1YÌ+Æ¿&Uðð³Óòa¿å£æ!>ç90²Oå+°Xº×;±pq>¾ô ¯p$½æ È°éºa}á¼ø]fhÔPj`÷'çAQÇ3ÆmrJÒ&
,Ë{ß¹Ò¬ÄÀm³ù·jêi¥&ÇÄ^Â,OÐÎj&¥FTÃD07î\2ò\µÕ|Õ°B±6u1àbé¹ê,ëÈrilçÉcÝççýyºÁ_+ì°/\ ø@庬ôÉ ¥zÓ7G?c.èùN
-ï"[G7¾J0ÈäM¼7É'ýå #É®ÂèÑÅ2t0é¢&C¶¿÷e<èÅé ROSG¼(øÁT}º%Ûý¼õ½R!\ÒL7ÑýðQÖ 'rRÚQ¡ñkQÊG`xu[\ýR
+xÚÝWMoÛ0½÷Wø(&Q[Û+°íPcaÇQ¯©ÙN»ýûQì|Ì@{m/µ#ä#ù¬~Ì/ÞÒ,á®dß% %V%ZK
+F'ù*ùAòT(RuÝÞ]µEÊyªêuú3¿IFP¡t² N-7£yÆ+7uUÛtëjÛ
E½
+/ó`ëÖu]ÕÔá¬Ü¸ò¾óà!5ÄU
+|j¨
+Cj,P7M]ô"úÞb^=ùÌ8
ÁXQ¥£1L¨Z,Ð*j3H*d°ÁÔfBs Rdq°û°_ï»þ]Ùè&îôà¶àsUU#MÝ»ºï&Ùö
+:<]pÆÉ7.ú~åVkwëʾiÃI³ü
¿ðk.C
oG6}§ÜLíZyV9ñpHK³RbYX
+Ð!Kô¿Þn«]ç°É¦
Aßò<«z¦¨ã6Øϵ§yb}×T~NÃwÙq¡±'M;&#Úâ~*£«vÛØêÕqïZßøæáĺ¬ÓÒ{ &\ÍT1àådï´[Âõs³¢"Æ4+_Çuo¼<ú?®Ý»Ý,æb¿¦¡àþɳÂÓòa\?Å¡GÍ]x.S`dËW`°t¯w;æÙõó¥Çùòúç5EF¡ëGõÂuqmçWh¡H`ÿr?QÇ+#bln¤³²Xn]§Hs¢'»fûwÝÔÓHZsæ9ÌâílïçvRjÄ 9ÌNJF«®ZC5*Ê% ç¾
^
+IõÚ2\ffEóè±òsî<]ï¯r&Ä%ß=(¢\uoZª7ýáV#P4iøÀÇ·:ÒÛÞ}.Ð ðm° çßE`GíhÌâùÿ
+¯©lýR]ä0ni&I[aµÃpåD6»ØbvM»ßû"Z%ä³k.?~¤K¼«VëfYïöËÎ
+*ÿ0"g%ïûá>&N¤µÖc²U²jÊýCx-³×m©ÐxÁ( 07¼¸Î/þØ¿Üd
endstream
endobj
94 0 obj <<
@@ -160,7 +158,7 @@
/Resources 117 0 R
/MediaBox [0 0 595.276 841.89]
/Parent 124 0 R
-/Annots [ 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R ]
+/Annots [ 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 116 0 R ]
>> endobj
95 0 obj <<
/Type /Annot
@@ -270,45 +268,52 @@
110 0 obj <<
/Type /Annot
/Border[0 0 1]/H/I/C[1 0 0]
-/Rect [123.806 230.126 217.683 241.005]
+/Rect [138.75 239.954 235.048 250.858]
/Subtype /Link
-/A << /S /GoTo /D (section.12) >>
+/A << /S /GoTo /D (subsection.11.2) >>
>> endobj
111 0 obj <<
/Type /Annot
/Border[0 0 1]/H/I/C[1 0 0]
-/Rect [123.806 210.111 195.436 219.088]
+/Rect [138.75 227.999 264.079 238.903]
/Subtype /Link
-/A << /S /GoTo /D (section.13) >>
+/A << /S /GoTo /D (subsection.11.3) >>
>> endobj
112 0 obj <<
/Type /Annot
/Border[0 0 1]/H/I/C[1 0 0]
-/Rect [123.806 186.291 180.413 197.17]
+/Rect [123.806 206.216 180.413 217.095]
/Subtype /Link
-/A << /S /GoTo /D (section.14) >>
+/A << /S /GoTo /D (section.12) >>
>> endobj
113 0 obj <<
/Type /Annot
/Border[0 0 1]/H/I/C[1 0 0]
-/Rect [123.806 164.373 200.986 175.252]
+/Rect [123.806 184.298 200.986 195.177]
/Subtype /Link
-/A << /S /GoTo /D (section.15) >>
+/A << /S /GoTo /D (section.13) >>
>> endobj
114 0 obj <<
/Type /Annot
/Border[0 0 1]/H/I/C[1 0 0]
-/Rect [123.806 142.455 231.8 153.334]
+/Rect [123.806 162.38 231.8 173.259]
/Subtype /Link
-/A << /S /GoTo /D (section.16) >>
+/A << /S /GoTo /D (section.14) >>
>> endobj
115 0 obj <<
/Type /Annot
/Border[0 0 1]/H/I/C[1 0 0]
-/Rect [123.806 120.537 173.409 131.416]
+/Rect [123.806 140.462 173.409 151.342]
/Subtype /Link
-/A << /S /GoTo /D (section.17) >>
+/A << /S /GoTo /D (section.15) >>
>> endobj
+116 0 obj <<
+/Type /Annot
+/Border[0 0 1]/H/I/C[1 0 0]
+/Rect [123.806 120.448 204.124 129.424]
+/Subtype /Link
+/A << /S /GoTo /D (section.16) >>
+>> endobj
119 0 obj <<
/D [94 0 R /XYZ 124.802 740.998 null]
>> endobj
@@ -322,46 +327,49 @@
/Font << /F60 121 0 R /F63 122 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
-127 0 obj <<
-/Length 111
+128 0 obj <<
+/Length 265
/Filter /FlateDecode
>>
stream
-xÚMÌ¡1a¿§¨ÜÄJÛѲZèºË)r' ¼?\0È?ùóí#mÖÀÑMâ
-,[ì$°#C`ÈÜKU¢óò,Uòô8¿oûk-k=+1N_þ-sl¦PÍùÉz¦C¤¤
+xÚMPÁNÄ ¼÷+8B",P`£F=xxQÝ-èZL!6þ½PÚÄÓ¼÷7̼;ÓU P`\åàHa\3WÈfRhEK
+_îí0ÚgÛ§0×I8佧¬H&ZqU)À®Uê6?×-ûj®}¬Øíb_vJu.ÅÎ÷~î¯öá
+8Ø7JùdÊ+¦±ì©6ßÁO)n)69»}½øä¶5ZþÙÏmUb0F´5Fr]ªÁ»
+³]®ÕKÄ׵ꯡÿ\|´deJVI塶{óÂ5¦ùâ3m/
endstream
endobj
-126 0 obj <<
+127 0 obj <<
/Type /Page
-/Contents 127 0 R
-/Resources 125 0 R
+/Contents 128 0 R
+/Resources 126 0 R
/MediaBox [0 0 595.276 841.89]
/Parent 124 0 R
-/Annots [ 116 0 R ]
>> endobj
-116 0 obj <<
-/Type /Annot
-/Border[0 0 1]/H/I/C[1 0 0]
-/Rect [123.806 705.013 204.124 713.989]
-/Subtype /Link
-/A << /S /GoTo /D (section.18) >>
+129 0 obj <<
+/D [127 0 R /XYZ 124.802 740.998 null]
>> endobj
-128 0 obj <<
-/D [126 0 R /XYZ 124.802 740.998 null]
+6 0 obj <<
+/D [127 0 R /XYZ 124.802 716.092 null]
>> endobj
-125 0 obj <<
+126 0 obj <<
/Font << /F63 122 0 R /F60 121 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
132 0 obj <<
-/Length 265
+/Length 789
/Filter /FlateDecode
>>
stream
-xÚMPMOÄ ¼÷WpDX¾w9jÔWõÐmÙ®Åbã¿6ñ4ï½á
-3ïÎ6G- DHͽ Æ%9QTÆ
-°=x
aF)
Ö;¹¢ðåÞõ{v]SÄóGéл}*b4× sÂõ±JÝçFÀ´¯:¤íN!¦àðåÆ\ñ² Üù.LÝÕÝ ,¨½{£®¯Üù·b+jóÃÓ¶ãà²wÛ×sÈ~ÛX£-òqDÂÅD±J[B-1#F©#û6×àm
)>cßýê¥LÒ¿ëÑ¥Zu×Ø}Î!9²Ê2mÐ
-`ubDêíÞbáÛüâ<m0
+xÚíW]OÛ0}ﯰxJ5ì|¶Ó:M&mBÓ&*öÀx¨Òª
¦4eÀ¿k'¶0ñÀÃT]Åu®Ï½>öu§£Ïñ½qìÇdzMz#ê=$d:'ÎÇ¡ù³2§ä6çq;ã¶àVqÛH¼éÊfa¼eÎ/QþXqcÒc"·¼g§5=6·÷Ü|n
+d
+ËãXã»C_0ùq5ýJ(qóÆQ$³ñnèú1÷c!- HiT.5>6Ì\dEÝð×ÜRÜ=åv)7"
+öªyX¢QÄ<$é í
+|TÛD)ïs.aµ2dû
+v¸/Má+o>lÿUÃ.1;Ä%?p;·}çx¦Zë&WQiÝs\- Es2«;ÙR1÷hlîQLÛp¿þ2éë]whpÒåUñw-Ý=é [uÝÙÆ<@Þ'R»x<MÔk=ç^#ìû¢Ú/¦!vð¸à.'MxFÈÀ<@ê
+ùÉ ¢r÷ mïÜ@â6éãÙX®9R¦´×¼Ùì´uU+Bf÷3è¨å®6VXÝ=¥¦ºw¶¯ÕÔ¥×ÒÖoðøþß!Ì´ÏöøIÙãÇòL¦t͸sAýQD¿õkC{úg´ïÖ²~³$«!5û¬U¶£!³ê]*U }ÙÐBÛÁV$jKsEµzÚâá*A×Hý=¦Tw{L½@_µS[ÚírõfæQ3C\ª< »oÍUïy3çVÕNêç%þÁßÆïýÉÅñ¨æZ±nq»ß*Ú½rÚΧÓãÓS¶ß
a#NÅg$½Ü
+¨q
+½-^ªè8úrËÈI9øÁê«P]
+öX|RýÛ4{I<d~Gt{õ#ꤳ¥l̪jU,6²yqÍóì<K7åºeQè
|67J¼I¼@EüÒx@?
endstream
endobj
131 0 obj <<
@@ -371,50 +379,20 @@
/MediaBox [0 0 595.276 841.89]
/Parent 124 0 R
>> endobj
-133 0 obj <<
-/D [131 0 R /XYZ 124.802 740.998 null]
->> endobj
-6 0 obj <<
-/D [131 0 R /XYZ 124.802 716.092 null]
->> endobj
-130 0 obj <<
-/Font << /F63 122 0 R /F60 121 0 R >>
-/ProcSet [ /PDF /Text ]
->> endobj
-136 0 obj <<
-/Length 790
-/Filter /FlateDecode
->>
-stream
-xÚíW]OÛ0}ﯰxJ5bâ4í´NIд=t<TiÕBS2àßϵÛ
-M:ñÀÃT]Åu®Ï½>öuN'½ÏÑè(ò#2¹!ÌèÐóIì(c2©ó±ïþÀYöSpsK¹]p[p+¹m¤ËÞte37Þ2çzü±âƤÇX>îxÏNkzª0nï¹ùÜk" Èä/DZÚw%0ùãzòxÄeÂPfã]ßõ#6êÆB<@Ò©\j|R+©¹È"Ûáo ¹¥¸
-{ÂíSnDìU£X¢QÄ(ôö>ªm¢V÷K9SØQ¥Ù¾ïKSkøäÛÕ°sAÌqÁÜÎÁ-Cß%âºçUTZõÜ"WKABGÑLåêN¶TÌ={TÓ4ܯ²SÆ]½+à
-Û¼* 5þΡ¥¡'d«®{0Ûè óÔ,ªz gâÜ«
b_ûÅ#ÄWÜ嬮/GH¢R"?)@TîµíèPÜÆ]<[Ë´²3GÊôVàÕÝkG]UÙ½Â:j±«¤@wÇa©®ãík5uéµ¢´õ<þÅÿ{4òÙ?q={¼süX¾¡ÉÔÛC3j]Ç'PÒ$ÑmýÐÿí»µ¬ß,ÉjHõ>kE
°éhHzbJUB;rk;ØDM25WT«§
-¾é¡tÔ?`JuxÀÔô;µe©Ý.Poj53Ä¥*È£²ûÖ\õ'8s>áiÕZméd©~Yâÿüm,øÞÏL:`¦Uë·ûr¤Ý+ç mé¬w>é1>½Gaáö»p@ØSñIîz÷=F(Þ/ÕHt|¹cä¬èýà?õÊU¨®{*¾M=ýÛt0¢q©e~öÞö2ê̲1ËËB¶ÊU¾ØÈæÕY:ÏÒË4ÙëRd
-ølnÓI¼@EüÒ@@
-endstream
-endobj
-135 0 obj <<
-/Type /Page
-/Contents 136 0 R
-/Resources 134 0 R
-/MediaBox [0 0 595.276 841.89]
-/Parent 124 0 R
->> endobj
-129 0 obj <<
+125 0 obj <<
/Type /XObject
/Subtype /Form
/FormType 1
/PTEX.FileName (TDT-defVDedgeSector.pdf)
/PTEX.PageNumber 1
-/PTEX.InfoDict 139 0 R
+/PTEX.InfoDict 135 0 R
/BBox [0 0 432 432]
/Resources <<
/ProcSet [ /PDF /Text ]
-/Font << /F2 140 0 R>>
+/Font << /F2 136 0 R>>
/ExtGState <<
>>>>
-/Length 141 0 R
+/Length 137 0 R
>>
stream
q
@@ -967,80 +945,83 @@
Q
endstream
endobj
-139 0 obj
+135 0 obj
<<
-/CreationDate (D:20090802001254)
-/ModDate (D:20090802001254)
+/CreationDate (D:20090802104835)
+/ModDate (D:20090802104835)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
>>
endobj
-140 0 obj
+136 0 obj
<<
/Type /Font
/Subtype /Type1
/Name /F2
/BaseFont /Helvetica
-/Encoding 142 0 R
+/Encoding 138 0 R
>>
endobj
-141 0 obj
+137 0 obj
9031
endobj
-142 0 obj
+138 0 obj
<<
/Type /Encoding
/BaseEncoding /WinAnsiEncoding
/Differences [ 45/minus]
>>
endobj
-137 0 obj <<
-/D [135 0 R /XYZ 124.802 740.998 null]
+133 0 obj <<
+/D [131 0 R /XYZ 124.802 740.998 null]
>> endobj
-134 0 obj <<
-/Font << /F68 138 0 R /F60 121 0 R >>
-/XObject << /Im1 129 0 R >>
+130 0 obj <<
+/Font << /F68 134 0 R /F60 121 0 R >>
+/XObject << /Im1 125 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
-145 0 obj <<
-/Length 1471
+141 0 obj <<
+/Length 1468
/Filter /FlateDecode
>>
stream
-xÚíZKoã6¾çW9ÙhÄò!QRQ/Ú"»bÛË{ÙhÖVb·ÚJ Ûÿ^I$Mí:{È0MÃy~ôÓäìÛw
-HXÈé`r3 4D ¦sDh:Ìtñp2ÏFDgDáb³yÌ.××ÛÅò¶^}þ#棫ÉÏ,¤(åTñ QôÞ-Ö¼\²yVLWËMþ8Íkªù<»/{7ëô6Óõu>#Ø+Ñ÷"1b,*÷z3
-"ÊGdx)m)ÚJ´hhïE[¶-/§/ºAÙ½Óáo8ÂâçA4RÎ?÷bä&aÑS³öhT´rEÁȹÓhÑriæ>È¥=ö£°4¤fJ#ÐÌ7B¤½¹`}¸6Ý ¤ðñNÈ4`ç
-Øt
-,ø-þß×ÏL[³ÁC*
-Xµl$qmrÑPQ÷áj¦"ÛAP9ó6ë¹xùaGh°ÍÓ=·°ë±m!iªAD@ Kk(úTö IýJ6¾¯I}Ã9ÌÏ¥ólÚ
)
,BãúÕNU_§Z{[7]Õ~Õ&Ë-ÍZª»¼^ºzCEî
-ÚÉõdÓÃRÙ±Põ¤É@~$ja´ààߵˮ¢±Ó#ÛÖ\#ÿâáÔÕmÎëC¾ìîÓ×EÞèÀW/6=ªØw1·¢½ÞnaìC»ãÅKë9èj)P©÷±î0á¸ëlOZæñ±Ïj¾×ðwVW>ððë+ëyÙMÜ/«·¾q@3aªwÏõ½Bõr³Ðܾá+ªb¯_öë×+YsuíhÞ÷WgàÖÄ_åÕÊeÌÈôeØìwWúÌW¼B2Ò}º`ÒgJ[[mâ¤Å|ÜY%ÊêQ%Å©X-¢$LÅörÛß-õ«QZO¨üE£/rl6ã(
-YiQUÆ/r@ºÝgzÞ@ÖÔ4Q^¦¦ÉW®ij×490jlqÄi".bzÔÌ|þL]Z¦'Òòú¤ §Ýe)QJÒ]îí²
-2KÒXOÂxcÈ¡MtHb²hofÐgÇSu±~á
-2Ö[fq#rû¿¥4L?*Ø(¶;;Û!ÇËv,ùÉÅNRLOµxsO54n@ÀéK&/²?+qNú»bs÷õìhJéò´áEÈi/ÑÉA¢ïD\GÙ©;~çÆJ=ëñª$e¢w=øñIb?
-ΰ§ä}CSÅAs:é¾)JD~aM»Ïµú¹aèD2q SÀ×¢ý¢j¸³vU"T3´mé aæÞî-WlÒ7Jâ8ÈSÄidÞ¥QL8~XhtVXiJö kóÑ£A0;ZB²#¾ÔÈÇÞZî|°¹
,´¥G½@jÚ5°õ ø³^4¾»ÒvO»L íøµÉS÷AZßùz1jO)ýÚV0ê¢ÇÒªyÛj²7OÚ!^ªòV¹ßÜê^ÞáÓ²qÿìEsCôT$Ç}ë3ÐsRûmß{.'ã¾W'ñP0>¨xëËÙ¿¯=f
-)§ÁQí&@_@&Hà¸ÜúcË~
-mɼU99Kx]¦Wr0r´nãÓMÁxZâwWÌ XV(Y-å¨Ôg ø¬ XÛËÅ÷ý¯þºLW5GåÝ9Q@¢XûTùij²pÖée`ÀHÈ¿þ@µ)[/^Ó¨Jú´s OãQ¦ $-FÅij·³ÿ VK
+xÚíZKâ6¾Ï¯ æ¬èág*l%©Ù=¤6¹,µÍT
Ï@20a¦²ùïí¶- =l °9¨²Ôêç§VÛ?¯¾}²ñóCÚßõõQi/Â!"4ég½O}:ðƸ?§¼3 q±ÙlÓõd·XÞëϤÓlp;þŽ%!
+sª¸çQhôÞ-Ö¬\²YZLWËM¶f5Õl>½»õ
+zézMçöå½Hʽ޼²þÇéßðx[ò¶âmÆ[ÊÛ{Þ¼mxËÊéßó®Wv¤§¤ÿ0ÿyâ3FåÏ#À¤5,znÞ¾ãò6,WäL-×fîS±´Ã~öc
+®§B3%hæ®Ê$¹`]¸6] ¤ðñV?iÀΰéXZ[wðÿ¬©¶ÎgmÁC*
+Xµl$1m2l¨{Áp5SÖì
h1óõL¼ü°'´NØæé[èõXZHª*BQ+PÂR.}¦R¿-ÈNx¨I}ý9ÌÏ
+çWÙÔS
+Æô«ª¾Lµö¶vºªýÊ&Ë-
M-AÕÞ. ¶ÞP»
vv=éô°v¬ T<iRßÄ¥,æükAP½ì"1=ÐmJä/NmÝæº>ä˾â>]]ä||õbÓýP0¦Ãó|ñ··ÀÛ=}°;þI¼´®"b>Ö
+&µíHË2rùSÍ÷þÎÀâÛÂê"Üþ~39ce3/½»åcõÖ Æ¢2Låáö¹¾S¨NnækÛW |BQìõEз]¿^AðxL«kKó¾¼:7Ô&þ"¯<.cÊD&O,Ãæ°k¼àÔe¾üàÅì{Ð=²( >TÚÚIÇó
Æ*Qj0T*QQÄB!>ýo_lû»¦~å£$®W6þ"`Ñbl4Qà3eŤ1ºÈëÞ#!ç5bzé|zYUÓØG>»h
+&_»¦©^ÓäÈT¨±Q"¨j#6bºôL\.MM¦çRôú¬9§Þk)ãÊ"ɱ^KöÚS«²ð%&(ã½x÷#É¡Ut#°àPfÐg§Òs
+>4ëÂ*Ó¸ÄÉXýß&TP}½Ó3rºLG÷bzÅwaqN/¸Hü´¤¤3ª¹V|[Nö`ijL¯PÇ>? #ÚEtrè Nm᣼ï¸VÖÊS# ãݨõÏ ý)ht
ïè
+¢-
+IvLPL
+ ÷µ²V>5LÜ Âäàõ'o¿ê¬M5Ѷ-ÌÜÓí>a¹¶º@Cñؼª§ÁeÌS+Ú÷IÒ3¢ñQá¹vI[aé
U&<q©=èl>z:fgÒ%(["LK^qð³N£¦; pî!i+GP [O¿Èã Üs¤¶}Ú¥BhË/MÛòl}ßëD©¥tk[@©J«.ìµÕco´7 C
+¼Tõãpù½¼Åge£îØasAtT#G]kSÐqVºnß;.'£®W#ñP0:¨8kË9Ù¿/=f)§)ÁQíÆQ(_?Æy±õGË~
+í=x£23rP<.á©è2¹B9¡ÍpK
+mrÆ£D¿ûbúE!dÕ JPW^ àÓ&`u/7Îw¿ò«²â¸ª9,oÎ<DÒ7¤Âç
ÓV/=F|Öÿ÷ªMÙ"éâQUÞ'}K°A¨ 8-úùÄ«·ã«ÿ
endstream
endobj
-144 0 obj <<
+140 0 obj <<
/Type /Page
-/Contents 145 0 R
-/Resources 143 0 R
+/Contents 141 0 R
+/Resources 139 0 R
/MediaBox [0 0 595.276 841.89]
/Parent 124 0 R
>> endobj
-146 0 obj <<
-/D [144 0 R /XYZ 124.802 740.998 null]
+142 0 obj <<
+/D [140 0 R /XYZ 124.802 740.998 null]
>> endobj
10 0 obj <<
-/D [144 0 R /XYZ 124.802 716.092 null]
+/D [140 0 R /XYZ 124.802 716.092 null]
>> endobj
-143 0 obj <<
-/Font << /F63 122 0 R /F60 121 0 R /F68 138 0 R /F70 147 0 R /F71 148 0 R >>
+139 0 obj <<
+/Font << /F63 122 0 R /F60 121 0 R /F68 134 0 R /F70 143 0 R /F71 144 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
-152 0 obj <<
+148 0 obj <<
/Length 619
/Filter /FlateDecode
>>
@@ -1050,24 +1031,24 @@
ñqKã
êÒºÚº{ï¼FÐ;?NMFÂj½°ý6q6PLkè¼èsáRhEêk"]*-Á?e*q´ø"pÎW@ɸ¬ú®¯¶¢ºñëwr£\puãjJ@¿©î²ïç¾MÓY(ÙÍ «}ûÒÛOÄ;½·úã-Ø×?iNêï:©Ó¯æHvO)Wwo×4¾'\ùo³öÎLpR¼ì:ÄCdPLj¼_p1JPoUL0Þ_:[2¤È|@æcdJêÌw*`z£ºm³²l+×°!
Ít(|'¬(So~ÿHÀè`tÔBbÄéXçG÷p:©Ïu\¸Ý%ÚOqâÚúKpÛä¾£ð·gMÙ[²ÏgÒg®øÎQå¼?í_í9ÐÚºXåûe¿/ GÝù9Ôl×÷ñ;)èþZON«îÞísîý¹ô4ß#>ºpúdñðîª
-Z¡ºdFw¢-svÖÌ cCO
+Z¡ºdFw¢,svÖÌ c:O
endstream
endobj
-151 0 obj <<
+147 0 obj <<
/Type /Page
-/Contents 152 0 R
-/Resources 150 0 R
+/Contents 148 0 R
+/Resources 146 0 R
/MediaBox [0 0 595.276 841.89]
/Parent 124 0 R
>> endobj
-153 0 obj <<
-/D [151 0 R /XYZ 124.802 740.998 null]
+149 0 obj <<
+/D [147 0 R /XYZ 124.802 740.998 null]
>> endobj
-150 0 obj <<
-/Font << /F71 148 0 R /F68 138 0 R /F60 121 0 R >>
+146 0 obj <<
+/Font << /F71 144 0 R /F68 134 0 R /F60 121 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
-157 0 obj <<
+153 0 obj <<
/Length 736
/Filter /FlateDecode
>>
@@ -1076,30 +1057,30 @@
FÐQ+ܨ½¹Àöòcñ 2w*óªL~ü9_Êðóøyظ~À2ãÉ|,îaÑrâë3¥§9uOúÚÅÅ÷7
vøo´o'׺A¤[¨!õ7¾Bô^EüH½~
ö'9Áh6LD|½kÔ#ÎÖá,%0·qÀö¹CâýìaFmÏñÜ
tÑu¹y<ù='«jö~Ç-ëji°W¨N~ ^qtåmò¬kRÓâ.5Ø{Ór5>W¥h.nó2S;¡é¸F.D®è¥k<>oUw÷iÜ
µØ6Õ^i"n¢6ÞõõCQ-å}ëØïkÑtÄmfZRj¬"¯E*ð¨^A5
Ü&<;Z2«®HzuaÜ¥GS&J}ÌÛÒDÆyTô=(ó-¥¼LTU°lªJÖÕVº¨ióXÀóäw&§Fת½¤*ß,0ZÚ]Ú¨¨L¦ù¾êT)ô
-ï b#ìi]nûôV|<ªýüúAÒTuRµ',ð©¤ø0ì½DQC_ þÚÁV®ðñ£ÑÍèæ«ñ¿!®1Ôd18§#'¤ØrâѾ
Öyl ïþü1iCw¼omü+´ö¦Eж3¶çÈHÙ+ÖZ´ùÆgãæáÄß¼p ùaåÉÙäv%X³üIökJ5V/*ó6±ø.Êß?Òá_¿Sò
+ï b#ìi]nûôV|<ªýüúAÒTuRµ',ð©¤ø0ì½DQC_ þÚÁV®ðñ£ÑÍèæ«ñ¿!®1Ôd18§#'¤ØrâѾ
Öyl ïþü1iCw¼omü+´ö¦Eж3¶çÈHÙ+ÖZ´ùÆgãæáÄß¼p ùaåÉÙäv%X³üIökJ5V/*ó6±ø.Êß;Òá_¿Jò
endstream
endobj
-156 0 obj <<
+152 0 obj <<
/Type /Page
-/Contents 157 0 R
-/Resources 155 0 R
+/Contents 153 0 R
+/Resources 151 0 R
/MediaBox [0 0 595.276 841.89]
-/Parent 160 0 R
+/Parent 124 0 R
>> endobj
-149 0 obj <<
+145 0 obj <<
/Type /XObject
/Subtype /Form
/FormType 1
/PTEX.FileName (TDT-shoVD4.pdf)
/PTEX.PageNumber 1
-/PTEX.InfoDict 161 0 R
+/PTEX.InfoDict 156 0 R
/BBox [0 0 432 432]
/Resources <<
/ProcSet [ /PDF /Text ]
-/Font << /F2 162 0 R>>
+/Font << /F2 157 0 R>>
/ExtGState <<
>>>>
-/Length 163 0 R
+/Length 158 0 R
>>
stream
q
@@ -3086,49 +3067,49 @@
Q
endstream
endobj
-161 0 obj
+156 0 obj
<<
-/CreationDate (D:20090802001255)
-/ModDate (D:20090802001255)
+/CreationDate (D:20090802104837)
+/ModDate (D:20090802104837)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
>>
endobj
-162 0 obj
+157 0 obj
<<
/Type /Font
/Subtype /Type1
/Name /F2
/BaseFont /Helvetica
-/Encoding 164 0 R
+/Encoding 159 0 R
>>
endobj
-163 0 obj
+158 0 obj
33588
endobj
-164 0 obj
+159 0 obj
<<
/Type /Encoding
/BaseEncoding /WinAnsiEncoding
/Differences [ 45/minus]
>>
endobj
-158 0 obj <<
-/D [156 0 R /XYZ 124.802 740.998 null]
+154 0 obj <<
+/D [152 0 R /XYZ 124.802 740.998 null]
>> endobj
-159 0 obj <<
-/D [156 0 R /XYZ 217.52 328.76 null]
+155 0 obj <<
+/D [152 0 R /XYZ 217.52 328.76 null]
>> endobj
14 0 obj <<
-/D [156 0 R /XYZ 124.802 290.115 null]
+/D [152 0 R /XYZ 124.802 290.115 null]
>> endobj
-155 0 obj <<
-/Font << /F68 138 0 R /F60 121 0 R /F63 122 0 R /F71 148 0 R >>
-/XObject << /Im2 149 0 R >>
+151 0 obj <<
+/Font << /F68 134 0 R /F60 121 0 R /F63 122 0 R /F71 144 0 R >>
+/XObject << /Im2 145 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
-167 0 obj <<
+162 0 obj <<
/Length 622
/Filter /FlateDecode
>>
@@ -3136,30 +3117,30 @@
xÚÍUßoÚ0~Ï_añ*qm8´îHÛôjÑ^º>P ¶Àÿý.Îe¾ü¦U5!ô Ǿû|þî|ÇÎåD,âVÅ?T#
Åq,NØmÿýÀõ×_dÿð H ð0ü<¦Î}¾Èþäà.þÄs¥äïXS¯=`X¾áu;ï,k:½Â¥Ýén3;aCóÐ_ük>ÊøqüÆ88~?á1gµñ¸ ewWv[9ɶ#ĺ0ìÎoOÎ]ÛñÕl_J) Óå#Li¶¯ëu+ãWdJÇcßc'¸Û3)¤öäÙðÎXô[a=&cUÌêÆRëÎ1ÈõM÷¸ÉM²å/®Ò22Â9Gz/-÷²ºqtç˹ ´I&ý´ÕxÌSÐfkçÉ\{Ú:6¹'N\~\{ìÃƹ_¾äæ¬.¡7¶;)FÕÆ´4Å`>ßkgK=l'áPñè´nî}¬x+ôö[öV¼ôÒ-^óÆsF-^é5ÏR«²DÿJ×5g謱¬pÊô+Ò[v-ý¥*ê¡ñª3
Ù¿E¤)¼3(³Ñ÷0&QnÉ
-àåKïÊWì"ÛâJT¾¨(,¬ª¢òh¸H¸DòaìÅÔ~ÚIûìê*DÜ+*÷¶Úª³ÒÖ^ãÛõíÔVý7m½³ÒÖ%úHtêõµ\Ór9ë³à#x½GgZËÔàE(ªBÀ{*è{ª#o5¼º>á('Ì_ü¿³OÉ
+àåKïÊWì"ÛâJT¾¨(,¬ª¢òh¸H¸DòaìÅÔ~ÚIûìê*DÜ+*÷¶Úª³ÒÖ^ãÛõíÔVý7m½³ÒÖ%úHtêõµ\Ór9ë³à#x½GgZËÔàE(ªBÀ{*è{ª#o5¼º>á('È_ü¿³FÈ
endstream
endobj
-166 0 obj <<
+161 0 obj <<
/Type /Page
-/Contents 167 0 R
-/Resources 165 0 R
+/Contents 162 0 R
+/Resources 160 0 R
/MediaBox [0 0 595.276 841.89]
-/Parent 160 0 R
+/Parent 164 0 R
>> endobj
-154 0 obj <<
+150 0 obj <<
/Type /XObject
/Subtype /Form
/FormType 1
/PTEX.FileName (TDT-shoVE1.pdf)
/PTEX.PageNumber 1
-/PTEX.InfoDict 169 0 R
+/PTEX.InfoDict 165 0 R
/BBox [0 0 432 432]
/Resources <<
/ProcSet [ /PDF /Text ]
-/Font << /F2 170 0 R>>
+/Font << /F2 166 0 R>>
/ExtGState <<
>>>>
-/Length 171 0 R
+/Length 167 0 R
>>
stream
q
@@ -3731,43 +3712,43 @@
Q
endstream
endobj
-169 0 obj
+165 0 obj
<<
-/CreationDate (D:20090802001258)
-/ModDate (D:20090802001258)
+/CreationDate (D:20090802104839)
+/ModDate (D:20090802104839)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
>>
endobj
-170 0 obj
+166 0 obj
<<
/Type /Font
/Subtype /Type1
/Name /F2
/BaseFont /Helvetica
-/Encoding 172 0 R
+/Encoding 168 0 R
>>
endobj
-171 0 obj
+167 0 obj
9715
endobj
-172 0 obj
+168 0 obj
<<
/Type /Encoding
/BaseEncoding /WinAnsiEncoding
/Differences [ 45/minus]
>>
endobj
-168 0 obj <<
-/D [166 0 R /XYZ 124.802 740.998 null]
+163 0 obj <<
+/D [161 0 R /XYZ 124.802 740.998 null]
>> endobj
-165 0 obj <<
-/Font << /F68 138 0 R /F60 121 0 R >>
-/XObject << /Im3 154 0 R >>
+160 0 obj <<
+/Font << /F68 134 0 R /F60 121 0 R >>
+/XObject << /Im3 150 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
-176 0 obj <<
+172 0 obj <<
/Length 781
/Filter /FlateDecode
>>
@@ -3778,30 +3759,30 @@
¡\¡ÖwâSû<þr(ÅïKï¥ZÌUN$û³dO9{Ìér:4dZlÏZH
¤2¡bGÆéSΩÒÛqZrÚpZÈ𠨨tÛñ±&¾F¥ÐUâÏà`-Öu¤n at Rö\¹·"+ûL°:YÉ:ÃÙ¬²<±:Ôr_SÖ«ûOqíÀ¡ÓÝàoàê½$®n?®Þÿ«÷§¸®«ÜAx+@'
÷:Ôß@ÐÓ<Î&T¢ÿTº?}ħ²nÆcwBW²{õ©xÜC)4ÊFèw at _7ðD`¼AMl¥¨Ê(i¡JÕ¥ó
4Ð(LûáZoà©ÖcÕ÷¿D¬¦}c{Mæ!¸Uyä,ä÷jd4äÊ\7n*#Ë^¥
yÚü®à¹æt
-t«xÞ*«5F,?q[¢Xªk?«ÕÁI¸ ~Bw÷[H3éGoª³àV[{Â^ýp»êy)ÜÃzñH=<ÛÚVyg{Mþèë鵶U}¼Oa½®®Ç^®5V×
9ðÚ©ÈÕÞôhj(3³ÂPÔónÊ`|KUì%8)AeðêñmÎÝ4wÚ`y«æ*±yi«"Ö©Ð|æ]8:GIEÔ0¸üéa7pQ²ÝÜÀ÷Îa½?®=t¾ò_-rj«fv*þÉýÌ$äZ!¢.ÃpÍ2ç_,Ì'{m;.%ÖlSló2Ù.7)m×·EQÎr½oíQvùclùrgkÉI~±M®E
(õqFÈñ&d"G54¿ L*àB
+t«xÞ*«5F,?q[¢Xªk?«ÕÁI¸ ~Bw÷[H3éGoª³àV[{Â^ýp»êy)ÜÃzñH=<ÛÚVyg{Mþèë鵶U}¼Oa½®®Ç^®5V×
9ðÚ©ÈÕÞôhj(3³ÂPÔónÊ`|KUì%8)AeðêñmÎÝ4wÚ`y«æ*±yi«"Ö©Ð|æ]8:GIEÔ0¸üéa7pQ²ÝÜÀ÷Îa½?®=t¾ò_-rj«fv*þÉýÌ$äZ!¢.ÃpÍ2ç_,Ì'{m;.%ÖlSló2Ù.7)m×·EQÎr½oíQvùclùrgkÉI~±M®E
(õqFÈñ&d"54¿ L!àA
endstream
endobj
-175 0 obj <<
+171 0 obj <<
/Type /Page
-/Contents 176 0 R
-/Resources 174 0 R
+/Contents 172 0 R
+/Resources 170 0 R
/MediaBox [0 0 595.276 841.89]
-/Parent 160 0 R
+/Parent 164 0 R
>> endobj
-173 0 obj <<
+169 0 obj <<
/Type /XObject
/Subtype /Form
/FormType 1
/PTEX.FileName (TDT-shoVE4.pdf)
/PTEX.PageNumber 1
-/PTEX.InfoDict 179 0 R
+/PTEX.InfoDict 175 0 R
/BBox [0 0 432 432]
/Resources <<
/ProcSet [ /PDF /Text ]
-/Font << /F2 180 0 R>>
+/Font << /F2 176 0 R>>
/ExtGState <<
>>>>
-/Length 181 0 R
+/Length 177 0 R
>>
stream
q
@@ -4798,81 +4779,78 @@
Q
endstream
endobj
-179 0 obj
+175 0 obj
<<
-/CreationDate (D:20090802001321)
-/ModDate (D:20090802001321)
+/CreationDate (D:20090802104902)
+/ModDate (D:20090802104902)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
>>
endobj
-180 0 obj
+176 0 obj
<<
/Type /Font
/Subtype /Type1
/Name /F2
/BaseFont /Helvetica
-/Encoding 182 0 R
+/Encoding 178 0 R
>>
endobj
-181 0 obj
+177 0 obj
16438
endobj
-182 0 obj
+178 0 obj
<<
/Type /Encoding
/BaseEncoding /WinAnsiEncoding
/Differences [ 45/minus]
>>
endobj
-177 0 obj <<
-/D [175 0 R /XYZ 124.802 740.998 null]
+173 0 obj <<
+/D [171 0 R /XYZ 124.802 740.998 null]
>> endobj
-178 0 obj <<
-/D [175 0 R /XYZ 217.52 144.4 null]
+174 0 obj <<
+/D [171 0 R /XYZ 217.52 144.4 null]
>> endobj
-174 0 obj <<
-/Font << /F68 138 0 R /F71 148 0 R /F60 121 0 R >>
-/XObject << /Im4 173 0 R >>
+170 0 obj <<
+/Font << /F68 134 0 R /F71 144 0 R /F60 121 0 R >>
+/XObject << /Im4 169 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
-185 0 obj <<
+181 0 obj <<
/Length 936
/Filter /FlateDecode
>>
stream
-xÚíXßoÓ0~ß_í©Ì¿1ihLB¢ªÍJÇH«%&ñÇãØØIìvØxááäKs>w÷ùb÷ÅäàøBг2A¢Éu KRD"DIMæѧÇ!4zUÜä³jY,Æ1áh´^-ª4ú´%/òrüeòZyFQdÚ1bB"¤qùq*[3¥ÊËÊhKïÆYÚuÕáÆÙé8æÖc<bF=QjlÔïJ*©Ü)Y*ù¥ä3âH
-3«J%GfR¬TbÞ`ûkö+%·æ§çfhmV'?©Æ+)-xëÇrènXëR½?÷fc «ßÀÊ3ÈÌ{@×¼¯,¢9$n
-àE'ͪ&.`wÝMLu
-A':ÎNþs at 1ì:íd1§Dü d·àlîð% üá·²é¶+_HÜ£¿Z§fýË
-öò;5Ã*¬ô£V©JÀ_¿Ì!&¹Þ½æ"0l+ÃT]¥3íà¯4´J?ÆLb®õ{(~n½ö°²4¯g^álmùÒTèèêêÇ
-$.Ñ\ªm¹lØÒtïüCoC4¦bF5ùÏÀk«)áªÍ¡¼
-í ±ðð?çËy¬ìi( !/4áFA§~húëÆdÛ¦YÇTÙº;öv¦ä~3Ï´QOU]l´SÕ½°}±¹cÁ§öqKê@cÞ
ÆþæfØ
-óDÜÅwe½Ò°t×ñYºUmFb1i
-ÌHÃj-SΣ1îQ§¶%'ôð^C3µÓ¡ym±ÎÎNSA7´X<z66Ý&ÜH<ø1×+d4fÂ]ÔräxgBâ
-;ÂzgsßvÜ"@PDo|¶Yþ~âñ~µ¬¿ß¼uNÍqçβ"ì;\=°Ù5K,`ãgSkFÕDv.¡=.i}&geÊ3çy3ýZc<0²I#¯ñ°ð1
-±d:>ÌT·50æiVS8?6Öõ±ß³¤½B¥ÊÝPL¿ô@P )Æ[[ÉN]õSÕÀ²»ÇÃ÷¿§j4ÉN[úAóµ9¼í}ÁQïrûäa¾í"Ìò"ì^óö¾æ8¼÷5ÿ¿æ>Ù5·ó"I%bÊá-¬»ûÁËÉÁ×u#Ã
+xÚíXÝoÓ0ß_ñÔJKæï$bL@¨Æ$à¡j³Ò1Òi©øøã¹ØØIìvØxááäKs>ÿîîçÝç£sÅ#*.&We"ÉR¢Êòh2>ø8¦ÑËòºåb3IF·«e¹®>-çF)梼Ï$Ê\1U;&QÌXÂTj\~g`k¦¬jm´¥wã,ë:£ðĤqv2%ã£Û1 £õ¨S5ÈÈä'È'" 3«¦ fR*3o¨ýµDûÈùéZ[ÀªÑÑ$]tw8ñHjlHeA Ð[?'Á
+k]Àû3o6¸ú5®<Ã̼CtÍûµE4ÇÄM|c²èd YSUàÄ®ó¶±;±©NáoÔ)êLÇÙÉ(]§,óÉwDvÎæ_
+Ê~!n»âÑyJ{ôõifÖ¿Ø°h/¿S3l©ÂJ?j¡BükäW9&Ò$×»×\ä
+c4I¡«t¦]!üæv±Ö±H©Ôú/,~a}ëaee^Ï0¼ÒÙÚ8ó¦©ÔÑÕÕH.\¢¹mGeÚ±¥ëÞ'øûÞZiL1§kò¢×W=ÐæH.G^öYxôÀóe=Tö4ÐòCã¨s?4ýuiÛk¦YÇ\©´uwííä3Ï´qOU]l¼SÕ½°±}±¹²Á§öaKê@Þ
&þæfØ ÊD)ÚÅwi½Ô°t×ñYºUmFb1k
+ÌÈÃj-SΣ1HÝ£NmËMëá½Âf:k¦CóÚR+/eoh±tôtlºM¸xðS4®WÈynmVwQOÊã]¨nØÖ»[Üø¶#Á"zã³½Ì"ð÷÷3¬eýü
+òÆ9u4Ç;Ë°ïpõxÀf×,Mu¬9HÚ
+¸Âö¸0¤õ8M3;Ïé×ÓñMÚx
oI%;Ôñ~¦ºDO³âù±±®Ïý¦Ð%íåÈÈ+Uõìbú¥$Denm%;mtè§ÐÀò»Çý÷¿§j<ÉN[ú^ó[sxÛû"#ÃÞåöÑ/ÂrÛEX>æEؽæí}Í
+qxïk®üÍ}´knç-ªò+Å\&âÿZymxðbrð´#
endstream
endobj
-184 0 obj <<
+180 0 obj <<
/Type /Page
-/Contents 185 0 R
-/Resources 183 0 R
+/Contents 181 0 R
+/Resources 179 0 R
/MediaBox [0 0 595.276 841.89]
-/Parent 160 0 R
+/Parent 164 0 R
>> endobj
-186 0 obj <<
-/D [184 0 R /XYZ 124.802 740.998 null]
+182 0 obj <<
+/D [180 0 R /XYZ 124.802 740.998 null]
>> endobj
18 0 obj <<
-/D [184 0 R /XYZ 124.802 716.092 null]
+/D [180 0 R /XYZ 124.802 716.092 null]
>> endobj
-183 0 obj <<
-/Font << /F63 122 0 R /F60 121 0 R /F68 138 0 R /F71 148 0 R >>
+179 0 obj <<
+/Font << /F63 122 0 R /F60 121 0 R /F68 134 0 R /F71 144 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
-190 0 obj <<
+186 0 obj <<
/Length 633
/Filter /FlateDecode
>>
@@ -4881,55 +4859,61 @@
Û¿qÚøî¬÷°MØ^xd\¾'¿¹á·Õ×î}Q+`ÖÈ¢`ÖRï\8û¡ªA[À}ï1lûáµ^âÝKg·8þÏò¹ój JÜø
zñ¦WÎtUÞj7ïIò}zÐÛR =ôÄÉô<
Ô8IÍÐÔ$%M_æÊf¹}H2¼
ÆØ»·8Bù×Â<6Id5å&Y}7ñTn©âÒDqê%RPSDØRjê9aµTm¨ÓDmú¥ê4)MÔiJO?g¡ÃÞÄÝx¾)RÈ´&¶O×ò2_þî:qÎó* Ï|Üw9 +yÃ8WCïkü.,vµìÃ@bÁ«Ò+ZÙØ*ò|´6AدG
5léD, Á}m(àòÀéÈþÞyôßîMÑ;Ý ï7A`y¿øUèÎN¨ãsÝÿ,øáì#ÎÐV¡®¶êÉûÎgOf0S£¤2©jÒh·Òý ³ÃoðcvOAÝÛF·Éü°Dw`ÈùÌQ;0ßSÒô\?êÛ(gJÍqîGD3gãÆÂÐØÀ¢Í1SnßB&(ôÕb =¹M*U¹ôXz|!.u
-Ý4 §µ
³+ÃGMëZ½ÐqúÿÒ³wÝì?G³Ò
+Ý4 §µ
³+ÃGMëZ½Ðqú/ÁÙ»nö>³Ñ
endstream
endobj
-189 0 obj <<
+185 0 obj <<
/Type /Page
-/Contents 190 0 R
-/Resources 188 0 R
+/Contents 186 0 R
+/Resources 184 0 R
/MediaBox [0 0 595.276 841.89]
-/Parent 160 0 R
+/Parent 164 0 R
>> endobj
-191 0 obj <<
-/D [189 0 R /XYZ 124.802 740.998 null]
+187 0 obj <<
+/D [185 0 R /XYZ 124.802 740.998 null]
>> endobj
-188 0 obj <<
-/Font << /F71 148 0 R /F60 121 0 R >>
+184 0 obj <<
+/Font << /F71 144 0 R /F60 121 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
-194 0 obj <<
-/Length 922
+190 0 obj <<
+/Length 921
/Filter /FlateDecode
>>
stream
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/vennerable -r 39
More information about the Vennerable-commits
mailing list