[Adephylo-commits] r194 - in pkg: . R man vignettes vignettes/figs

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Fri Aug 9 16:35:59 CEST 2013


Author: jombart
Date: 2013-08-09 16:35:59 +0200 (Fri, 09 Aug 2013)
New Revision: 194

Modified:
   pkg/DESCRIPTION
   pkg/NAMESPACE
   pkg/R/abouheif.R
   pkg/R/bullseye.R
   pkg/R/dibas.R
   pkg/R/distances.R
   pkg/R/orthobasis.R
   pkg/R/orthogram.R
   pkg/R/partition.R
   pkg/R/ppca.R
   pkg/R/proximities.R
   pkg/R/table.phylo4d.R
   pkg/R/utils.R
   pkg/man/abouheif.Rd
   pkg/man/bullseye.Rd
   pkg/man/carni19.Rd
   pkg/man/carni70.Rd
   pkg/man/lizards.Rd
   pkg/man/maples.Rd
   pkg/man/mjrochet.Rd
   pkg/man/orthobasis.Rd
   pkg/man/orthogram.Rd
   pkg/man/palm.Rd
   pkg/man/ppca.Rd
   pkg/man/procella.Rd
   pkg/man/tithonia.Rd
   pkg/man/ungulates.Rd
   pkg/vignettes/adephylo.Rnw
   pkg/vignettes/adephylo.pdf
   pkg/vignettes/figs/adephylo-012.pdf
   pkg/vignettes/figs/adephylo-016.pdf
   pkg/vignettes/figs/adephylo-018.pdf
   pkg/vignettes/figs/adephylo-aboutest.pdf
   pkg/vignettes/figs/adephylo-figFourBas.pdf
   pkg/vignettes/figs/adephylo-lm1.pdf
   pkg/vignettes/figs/adephylo-loadings.pdf
   pkg/vignettes/figs/adephylo-orthobas1.pdf
   pkg/vignettes/figs/adephylo-pca1.pdf
   pkg/vignettes/figs/adephylo-pca2.pdf
   pkg/vignettes/figs/adephylo-phylo4d.pdf
   pkg/vignettes/figs/adephylo-resid.pdf
Log:
trying to fix the package for the new urgent release.

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/DESCRIPTION	2013-08-09 14:35:59 UTC (rev 194)
@@ -1,11 +1,12 @@
 Package: adephylo
-Version: 1.1-4
-Date: 2013/05/15
+Version: 1.1-5
+Date: 2013/08/09
 Title: adephylo: exploratory analyses for the phylogenetic comparative method.
 Author: Thibaut Jombart <t.jombart at imperial.ac.uk>, Stephane Dray <stephane.dray at univ-lyon1.fr>
 Maintainer: Thibaut Jombart <t.jombart at imperial.ac.uk>
 Suggests:
-Depends: methods, phylobase, ape, ade4, adegenet
+Depends: methods
+Imports: phylobase, ape, ade4, adegenet
 Description: Multivariate tools to analyze comparative data, i.e. a phylogeny and some traits measured for each taxa.
 License: GPL (>=2)
 LazyLoad: yes

Modified: pkg/NAMESPACE
===================================================================
--- pkg/NAMESPACE	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/NAMESPACE	2013-08-09 14:35:59 UTC (rev 194)
@@ -5,13 +5,18 @@
 exportPattern(".")
 
 # Import all packages listed as Imports or Depends
-import(
-  methods,
-  phylobase,
-  ape,
-  ade4
-)
+import(methods,phylobase)
 
+importFrom(ape, "as.character.DNAbin", "as.DNAbin", "as.DNAbin.alignment", "as.DNAbin.character",
+           "as.DNAbin.list", "as.list.DNAbin", "as.matrix.DNAbin", "cbind.DNAbin", "c.DNAbin",
+           "[.DNAbin", "labels.DNAbin", "print.DNAbin", "rbind.DNAbin", "dist.dna",
+           "plot.phylo", "root", "nj", "bionj", "read.tree", ".PlotPhyloEnv")
 
+importFrom(ade4, "as.krandtest", "as.dudi", "as.randtest", "orthobasis.mat", "dudi.acm", "redo.dudi",
+           "plot.randtest", "s.arrow", "s.label", "scatter", "scalewt", "dudi.pca")
+
+importFrom(adegenet, "bluepal", "redpal", "greenpal", "seasun", "spectral", "funky",
+           "num2col", "fac2col", "any2col", "transp")
+
 # Load DLL
 useDynLib(adephylo)

Modified: pkg/R/abouheif.R
===================================================================
--- pkg/R/abouheif.R	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/R/abouheif.R	2013-08-09 14:35:59 UTC (rev 194)
@@ -3,7 +3,7 @@
                             a=1, nrepet=999,alter=c("greater", "less", "two-sided")) {
 
     ## some checks
-    if(!require(ade4)) stop("The ade4 package is not installed.")
+    ## if(!require(ade4)) stop("The ade4 package is not installed.")
     alter <- match.arg(alter)
     method <- match.arg(method)
 

Modified: pkg/R/bullseye.R
===================================================================
--- pkg/R/bullseye.R	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/R/bullseye.R	2013-08-09 14:35:59 UTC (rev 194)
@@ -9,7 +9,7 @@
 ############
 ## bullseye
 ############
-bullseye <- function(phy, traits=NULL, col.tips.by=NULL, col.pal=seasun,
+bullseye <- function(phy, traits=NULL, col.tips.by=NULL, col.pal=spectral,
                      circ.n=6, circ.bg=transp("royalblue",.1), circ.unit=NULL,
                      legend=TRUE, leg.posi="bottomleft", leg.title="", leg.bg="white",
                      traits.inset=1.1, traits.space=0.05, traits.pch=19, traits.cex=1,

Modified: pkg/R/dibas.R
===================================================================
--- pkg/R/dibas.R	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/R/dibas.R	2013-08-09 14:35:59 UTC (rev 194)
@@ -238,7 +238,7 @@
 ###############
 dibas.phylo <- function(x, grp, method=c("default","leaveOneOut"), fromRoot=FALSE, metric=c("Abouheif", "nNodes", "patristic", "sumDD"),
                         n.items=NULL, ...){
-    if(!require(ape)) stop("ape package is required")
+    ## if(!require(ape)) stop("ape package is required")
     if(!inherits(x,"phylo")) stop("x is not a phylo object")
 
     metric <- match.arg(metric)

Modified: pkg/R/distances.R
===================================================================
--- pkg/R/distances.R	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/R/distances.R	2013-08-09 14:35:59 UTC (rev 194)
@@ -4,7 +4,7 @@
 distTips <- function(x, tips="all",
                       method=c("patristic","nNodes","Abouheif","sumDD"), useC=TRUE){
 
-    if(!require(phylobase)) stop("phylobase package is not installed")
+    ## if(!require(phylobase)) stop("phylobase package is not installed")
 
     if(useC){
         tre <- as(x, "phylo")
@@ -126,7 +126,7 @@
 # distRoot
 ###########
 distRoot <- function(x, tips="all", method=c("patristic","nNodes","Abouheif","sumDD") ){
-    if(!require(phylobase)) stop("phylobase package is not installed")
+    ## if(!require(phylobase)) stop("phylobase package is not installed")
 
     ## handle arguments
     x <- as(x, "phylo4")

Modified: pkg/R/orthobasis.R
===================================================================
--- pkg/R/orthobasis.R	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/R/orthobasis.R	2013-08-09 14:35:59 UTC (rev 194)
@@ -3,8 +3,8 @@
 ###################
 orthobasis.phylo <- function(x=NULL, prox=NULL,
                              method=c("patristic","nNodes","oriAbouheif","Abouheif","sumDD"), a=1){
-    if(!require(phylobase)) stop("phylobase package is not installed")
-    if(!require(ade4)) stop("ade4 package is not installed")
+    ## if(!require(phylobase)) stop("phylobase package is not installed")
+    ## if(!require(ade4)) stop("ade4 package is not installed")
 
     ## handle arguments
     method <- match.arg(method)

Modified: pkg/R/orthogram.R
===================================================================
--- pkg/R/orthogram.R	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/R/orthogram.R	2013-08-09 14:35:59 UTC (rev 194)
@@ -4,7 +4,7 @@
                         high.scores = 0,alter=c("greater", "less", "two-sided")){
 
     ## some checks and preliminary assignements
-    if(!require(ade4)) stop("The ade4 package is not installed.")
+    ## if(!require(ade4)) stop("The ade4 package is not installed.")
 
     nobs <- length(x)
     alter <- match.arg(alter)

Modified: pkg/R/partition.R
===================================================================
--- pkg/R/partition.R	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/R/partition.R	2013-08-09 14:35:59 UTC (rev 194)
@@ -11,7 +11,7 @@
 # listTips
 ############
 listTips <- function(x){
-    if(!require(phylobase)) stop("phylobase package is not installed")
+    ## if(!require(phylobase)) stop("phylobase package is not installed")
 
     ## conversion from phylo, phylo4 and phylo4d
     x <- as(x, "phylo4")
@@ -37,7 +37,7 @@
 # treePart
 ###########
 treePart <- function(x, result=c("dummy", "orthobasis")){
-    if(!require(phylobase)) stop("phylobase package is not installed")
+    ## if(!require(phylobase)) stop("phylobase package is not installed")
 
     ## conversion from phylo, phylo4 and phylo4d
     x <- as(x, "phylo4")

Modified: pkg/R/ppca.R
===================================================================
--- pkg/R/ppca.R	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/R/ppca.R	2013-08-09 14:35:59 UTC (rev 194)
@@ -10,7 +10,7 @@
                  center=TRUE, scale=TRUE, scannf=TRUE, nfposi=1, nfnega=0){
 
     ## handle arguments
-    if(!require(ade4)) stop("The package ade4 is not installed.")
+    ## if(!require(ade4)) stop("The package ade4 is not installed.")
     if (is.character(chk <- checkPhylo4(x))) stop("bad phylo4d object: ",chk)
     ##if (is.character(chk <- checkData(x))) stop("bad phylo4d object: ",chk) : no longer needed
 
@@ -234,7 +234,7 @@
 
     ## some checks
     if (!inherits(object, "ppca"))stop("to be used with 'ppca' object")
-    if(!require(ade4)) stop("The package ade4 is not installed.")
+    ## if(!require(ade4)) stop("The package ade4 is not installed.")
 
 
     norm.w <- function(X, w) {

Modified: pkg/R/proximities.R
===================================================================
--- pkg/R/proximities.R	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/R/proximities.R	2013-08-09 14:35:59 UTC (rev 194)
@@ -5,7 +5,7 @@
                       method=c("patristic","nNodes","oriAbouheif","Abouheif","sumDD"),
                      a=1, normalize=c("row","col","none"), symmetric=TRUE, useC=TRUE){
 
-    if(!require(phylobase)) stop("phylobase package is not installed")
+    ## if(!require(phylobase)) stop("phylobase package is not installed")
 
     ## handle arguments
     x <- as(x, "phylo4")

Modified: pkg/R/table.phylo4d.R
===================================================================
--- pkg/R/table.phylo4d.R	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/R/table.phylo4d.R	2013-08-09 14:35:59 UTC (rev 194)
@@ -14,7 +14,7 @@
     if (is.character(chk <- checkPhylo4(x))) stop("bad phylo4d object: ",chk)
                                         # if (is.character(chk <- checkData(x))) stop("bad phylo4d object: ",chk) <- needed?
 
-    if(!require(ape)) stop("the ape package is required")
+    ## if(!require(ape)) stop("the ape package is required")
     if(cex.label<0.1) {
         show.tip.label <- FALSE
         show.node.label <- FALSE

Modified: pkg/R/utils.R
===================================================================
--- pkg/R/utils.R	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/R/utils.R	2013-08-09 14:35:59 UTC (rev 194)
@@ -42,7 +42,7 @@
 # sp.tips
 ##########
 sp.tips <- function(x, tip1, tip2, useTipNames=FALSE, quiet=FALSE, include.mrca=TRUE){
-    if(!require(phylobase)) stop("phylobase package is not installed")
+    ## if(!require(phylobase)) stop("phylobase package is not installed")
 
     ## conversion from phylo, phylo4 and phylo4d
     x <- as(x, "phylo4")
@@ -163,7 +163,7 @@
 # listDD
 ############
 listDD <- function(x, nameBy=c("label","number")){
-    if(!require(phylobase)) stop("phylobase package is not installed")
+    ## if(!require(phylobase)) stop("phylobase package is not installed")
 
     ## conversion from phylo, phylo4 and phylo4d
     x <- as(x, "phylo4")
@@ -186,3 +186,6 @@
     return(res)
 } # end listDD
 
+
+
+

Modified: pkg/man/abouheif.Rd
===================================================================
--- pkg/man/abouheif.Rd	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/man/abouheif.Rd	2013-08-09 14:35:59 UTC (rev 194)
@@ -72,7 +72,8 @@
   classical Moran's I test. \cr
 }
 \examples{
-if(require(ade4)){
+
+if(require(ade4)&& require(ape) && require(phylobase)){
 ## load data
 data(ungulates)
 tre <- read.tree(text=ungulates$tre)

Modified: pkg/man/bullseye.Rd
===================================================================
--- pkg/man/bullseye.Rd	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/man/bullseye.Rd	2013-08-09 14:35:59 UTC (rev 194)
@@ -8,7 +8,7 @@
   uses and is compatible with ape's \code{\link[ape]{plot.phylo}}.
 }
 \usage{
-bullseye(phy, traits=NULL, col.tips.by=NULL, col.pal=seasun,
+bullseye(phy, traits=NULL, col.tips.by=NULL, col.pal=spectral,
          circ.n=6, circ.bg=transp("royalblue",.1), circ.unit=NULL,
          legend=TRUE, leg.posi="bottomleft", leg.title="", leg.bg="white",
          traits.inset=1.1, traits.space=0.05, traits.pch=19, traits.cex=1,
@@ -55,6 +55,7 @@
 }
 \author{Thibaut Jombart \email{tjombart at imperial.ac.uk}}
 \examples{
+if(require(ape) && require(phylobase) && require(adegenet)){
 
 data(lizards)
 tre <- read.tree(text=lizards$hprA) # make a tree
@@ -70,5 +71,6 @@
          edge.width=2)
 
 }
+}
 \keyword{hplot}
 \keyword{multivariate}

Modified: pkg/man/carni19.Rd
===================================================================
--- pkg/man/carni19.Rd	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/man/carni19.Rd	2013-08-09 14:35:59 UTC (rev 194)
@@ -23,9 +23,12 @@
   This dataset replaces the former version in ade4.
 }
 \examples{
+if(require(ape) && require(phylobase)){
+
 data(carni19)
 tre <- read.tree(text=carni19$tre)
 x <- phylo4d(tre, data.frame(carni19$bm))
 table.phylo4d(x, ratio=.5, center=FALSE)
 }
+}
 \keyword{datasets}

Modified: pkg/man/carni70.Rd
===================================================================
--- pkg/man/carni70.Rd	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/man/carni70.Rd	2013-08-09 14:35:59 UTC (rev 194)
@@ -26,7 +26,10 @@
   This dataset replaces the former version in ade4.
 }
 \examples{
+if(require(ape) && require(phylobase)){
+
 data(carni70)
+rownames(carni70$tab) <- gsub("_", ".", rownames(carni70$tab))
 tre <- read.tree(text=carni70$tre)
 x <- phylo4d(tre, carni70$tab)
 table.phylo4d(x)
@@ -41,9 +44,9 @@
 orthogram(size, tre)
 
 ## transform range and test for a phylogenetic signal
-yrange <- scalewt(carni70$tab)[,2]
+yrange <- scale(carni70$tab)[,2]
 names(yrange) <- row.names(carni70$tab)
 orthogram(yrange, tre)
-
 }
+}
 \keyword{datasets}

Modified: pkg/man/lizards.Rd
===================================================================
--- pkg/man/lizards.Rd	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/man/lizards.Rd	2013-08-09 14:35:59 UTC (rev 194)
@@ -33,6 +33,8 @@
   This dataset replaces the former version in ade4.
 }
 \examples{
+if(require(ape) && require(phylobase)){
+
 ## see data
 data(lizards)
 liz.tr <- read.tree(tex=lizards$hprA) # make a tree
@@ -62,4 +64,5 @@
 
 }
 }
+}
 \keyword{datasets}

Modified: pkg/man/maples.Rd
===================================================================
--- pkg/man/maples.Rd	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/man/maples.Rd	2013-08-09 14:35:59 UTC (rev 194)
@@ -27,6 +27,8 @@
   This dataset replaces the former version in ade4.
 }
 \examples{
+if(require(ape) && require(phylobase)){
+
 data(maples)
 
 ## see the tree
@@ -51,4 +53,5 @@
 pic.dom <- pic(dom, tre)
 cor.test(pic.bif, pic.dom) # correlation is no longer significant
 }
+}
 \keyword{datasets}

Modified: pkg/man/mjrochet.Rd
===================================================================
--- pkg/man/mjrochet.Rd	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/man/mjrochet.Rd	2013-08-09 14:35:59 UTC (rev 194)
@@ -44,6 +44,8 @@
   This dataset replaces the former version in ade4.
 }
 \examples{
+if(require(ape) && require(phylobase)){
+
 data(mjrochet)
 tre <- read.tree(text=mjrochet$tre) # make a tree
 traits <- log((mjrochet$tab))
@@ -58,6 +60,6 @@
 mjr.tests <- abouheif.moran(mjr, nrep=499)
 mjr.tests
 plot(mjr.tests)
-
 }
+}
 \keyword{datasets}

Modified: pkg/man/orthobasis.Rd
===================================================================
--- pkg/man/orthobasis.Rd	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/man/orthobasis.Rd	2013-08-09 14:35:59 UTC (rev 194)
@@ -74,6 +74,7 @@
 
 }
 \examples{
+if(require(ape) && require(phylobase)){
 
 ## make a tree
 x <- rtree(50)
@@ -102,6 +103,6 @@
 
 ## see the difference
 table.phylo4d(phylo4d(tre, cbind.data.frame(resid1, resid2)))
-
 }
+}
 \keyword{manip}

Modified: pkg/man/orthogram.Rd
===================================================================
--- pkg/man/orthogram.Rd	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/man/orthogram.Rd	2013-08-09 14:35:59 UTC (rev 194)
@@ -103,6 +103,8 @@
   never happen, since ade4 is loaded as a dependence by adephylo.
 }
 \examples{
+if(require(ape) && require(phylobase)){
+
 ## a phylogenetic example
 data(ungulates)
 tre <- read.tree(text=ungulates$tre)
@@ -132,5 +134,5 @@
 ## Abouheif's test
 W <- proxTips(tre, method="oriAbouheif") # proximity matrix
 abouheif.moran(resid, W)
-
 }
+}

Modified: pkg/man/palm.Rd
===================================================================
--- pkg/man/palm.Rd	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/man/palm.Rd	2013-08-09 14:35:59 UTC (rev 194)
@@ -34,6 +34,8 @@
   This dataset replaces the former version in ade4.
 }
 \examples{
+if(require(ape) && require(phylobase)){
+
 ## load data, make a tree and a phylo4d object
 data(palm)
 tre <- read.tree(text=palm$tre)
@@ -52,4 +54,5 @@
 plot(phylAutoTests)
 }
 }
+}
 \keyword{datasets}

Modified: pkg/man/ppca.Rd
===================================================================
--- pkg/man/ppca.Rd	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/man/ppca.Rd	2013-08-09 14:35:59 UTC (rev 194)
@@ -130,6 +130,7 @@
  }
 \author{ Thibaut Jombart \email{tjombart at imperial.ac.uk} }
 \examples{
+if(require(ape) && require(phylobase)){
 
 #### ORIGINAL EXAMPLE FROM JOMBART ET AL 2010 ####
 data(lizards)
@@ -246,4 +247,5 @@
 abouheif.moran(dat[, names(highContrib)], prox)
 
 }
+}
 \keyword{multivariate}
\ No newline at end of file

Modified: pkg/man/procella.Rd
===================================================================
--- pkg/man/procella.Rd	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/man/procella.Rd	2013-08-09 14:35:59 UTC (rev 194)
@@ -34,6 +34,7 @@
   This dataset replaces the former version in ade4.
 }
 \examples{
+if(require(ape) && require(phylobase)){
 ## load data, make tree and phylo4d object
 data(procella)
 tre <- read.tree(text=procella$tre)
@@ -56,6 +57,7 @@
 myTests <- gearymoran(prox, traits)
 plot(myTests)
 }
+}
 
 }
 \keyword{datasets}

Modified: pkg/man/tithonia.Rd
===================================================================
--- pkg/man/tithonia.Rd	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/man/tithonia.Rd	2013-08-09 14:35:59 UTC (rev 194)
@@ -39,6 +39,8 @@
   This dataset replaces the former version in ade4.
 }
 \examples{
+if(require(ape) && require(phylobase)){
+
 data(tithonia)
 tre <- read.tree(text=tithonia$tre)
 traits <- log(tithonia$tab + 1)
@@ -60,4 +62,5 @@
 gearymoran(prox2, traits)
 }
 }
+}
 \keyword{datasets}

Modified: pkg/man/ungulates.Rd
===================================================================
--- pkg/man/ungulates.Rd	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/man/ungulates.Rd	2013-08-09 14:35:59 UTC (rev 194)
@@ -32,6 +32,7 @@
   This dataset replaces the former version in ade4.
 }
 \examples{
+if(require(ape) && require(phylobase)){
 ## load data
 data(ungulates)
 tre <- read.tree(text=ungulates$tre)
@@ -49,6 +50,6 @@
 
 ## test phylogenetic inertia in residuals
 orthogram(residuals(lm1), x) 
-
 }
+}
 \keyword{datasets}

Modified: pkg/vignettes/adephylo.Rnw
===================================================================
--- pkg/vignettes/adephylo.Rnw	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/vignettes/adephylo.Rnw	2013-08-09 14:35:59 UTC (rev 194)
@@ -133,8 +133,11 @@
 (\url{http://r-forge.r-project.org/}).  In all cases, the latest version of \code{adephylo} can be
 found from \url{http://r-forge.r-project.org/R/?group_id=303}.  \\
 
-When loading the package, dependencies are also loaded:
+We load \textit{adephylo}, alongside some useful packages:
 <<load>>=
+library(ape)
+library(phylobase)
+library(ade4)
 library(adephylo)
 search()
 @

Modified: pkg/vignettes/adephylo.pdf
===================================================================
--- pkg/vignettes/adephylo.pdf	2013-05-20 16:33:39 UTC (rev 193)
+++ pkg/vignettes/adephylo.pdf	2013-08-09 14:35:59 UTC (rev 194)
@@ -106,24 +106,28 @@
 << /S /GoTo /D [70 0 R  /Fit ] >>
 endobj
 90 0 obj <<
-/Length 1891      
+/Length 1889      
 /Filter /FlateDecode
 >>
 stream
 xÚÝYKÛ6¾ï¯Ð-2)|‰”
-EÚ< Òt{J{PlÙëƶÙÞdûë;R–eywãͶ[”D9g>ÎŒD4‹DôòBÜqýùòâÉ­#éR%3]N#ió´ÈTde–êBE—“è}\Žd<©ào}7ð[Ô£?/_Ã`ÛìDê
-Lƒ~%F˜¸úŒãxˆŒµ­››Q¢… Á+ø•/wSmøÍnêÛÐg­pÂ(ÉDª\%J¦…Ìy&”~5R.¬LƳÊ®¶sø³œ1Ê\bï’–²…ÿù5¬¸Ã‡Ñlõ(Q6ž°’JD¦Ë PR‰4·°€<ÍɸÄ!8Ñ/{‡r@¦Êâ×õr¤òöMÞØVù	wüÞ@×?„Ò#cu\±b0TánÏ’ýn‘L¦Nàztªáõ¼fÑÐR6.–ڏ¹­ )$üIVÓ€!˜TKj&4TÐNŒJó¼`É¿Ô$YÃR«¶µÁñ6^DÍ,âÆ»—`[&Š´°Ê¢Dq¸kr”°ŠW CÅÛ†A×à`üÆÛ9O†ÂƒÅFïa_D¡xÍsögQ<ËÜ œcƒàç:Þ Úðæh'EO)ÕÕ	 +Œ°È>ü”)ašHØÇønÀ–¶,ÑZÇ
-¹®¤Â%T´KÛÐi^ãN£çºâ]¦qŸ°]q›6Ô·±:ˆ${Î[ïâkÑʧç3´õvUµ²Ñà~ÑÇÂEœŽÀë^ßñ¥×SZi=háéðîA¥<T¯V´)sïÝEW¬éº£^G¸Ñ¬ê¯¥òh¹½ËF_Þåë„
-!¨ï‹ í ¨=‚/+ mx;¶lü›jÒŸ:+òÿ`·õÓœcŽÆƒùv׳ã=“žK··õ†€m¯é92Ogÿ‡P*¤;Ä„&С46~S~ì¡YòáCö¬êl*•	D8ét'ˆiD—†U‘ú×@ÿUÑ!rÄîYþPÀ?g0Î,ÍÌI¤Õ7EÝA†8¨‹¸. 
-’÷ƒÜYóý 9»ä^à’ÈL§9„G‘…æÈâ9¨üyÝŒãJjáٝ+O%å>ÞEVž…ÂoÛ³ÃÝ
-?~Å`ªÜS¿»v‚PŒÃ*Ž‘BÑž kŒ`€ÍÑuաƱg=lϼ‚}#0â[oûÐÖÚsxŠ!;੺	q÷£
-[¿”]¿Ù`þ¯&ímôkò=ѝ¹;©*‡|ÐœÄ:0ÕS 8=ëxlQÓQâ\üˆâó6üóÆÙ^œzÐÇé-æ_ííÁÓ¼·÷ñK$ j‰(fâ„5QOèI9=ÝCMæ?÷É*¼»¦P»™·™
-ë)eñÕ'`q§YtáI¼©IË	§4LÍ÷ç³1k|™Yáj°&B©ÎfAÕeÁß7Ýs¢ùHVt»l-ªo`õ¦·,«|ob;"q
-–·v[.R•ÍÚŒž »îdëËž1nŽ)(ŒuŒ”Ã’ÑÙSoH{÷[b¾´[t¨ÊÞ•ÛP›PpwjƒC蹬øWÙÿËIÌÍõB„~±ÍrT®-I‰²¶Ð†¼ì‹d»1׋B…ì0èà"X.ò^}ÏÒF³Ib=t·ìT¡øe°äqÓV5_ òã})æ8Z¤Â¶™Սý¹},Î@b“©n2‚e·/óÐämex¿D»"~‡$•:ê)×R—ÍJ*Œ¥CëU6ÕÚœ¹^$7ضüÐðéÔ\R̦LWz¶^xÙËã²\F„©N½¼Â©æ(„¶ª%`f?ÏÉ|
-—öPdyX]÷6€oð°Ç‡Ås<«Va"Ž!°ÌÜcCL”M7¬g„íIÃÅU¤„
-üÄZ.•SÁsÎǼPœu-/’öåfçßU~Ì!Œ+?señ‰€ÚTüvXS.±âûy —¾²„߇ðfÍNHVÖ`«ásNÞÛ`Õ*/:•ÊŒMÒ7‘-;ß°ðr5á¤!e•å˜ý‘Ï—Á<zfÔV©î-M~äõ“!=›pD•¾J˜dÔ/‡LžÏW|
->ˆí’¾¼±CÌ(àìhf7(§=tJ—¥vO"W2Üšªã2~âëÑސÞÀvþ¤a‹DU—ãàµ+}ï©7'”ö~X¯ÞŽ2ô†><…U vå%.ýŽ¤âÀëO~]e{úÉøGß—ïO'ŽyÉ“Û'Ž´
-§ÕõaRðÖžÑÉw>/˜|ZÃY|v ]ö}VƒéR—Íè.ºM~[ûºá9Ñ\ñz;ïåñ$T[±³g4¢3ö3À‘y‘:Ý‹CÈ«$¦á‚´ØµŠÀ‹Îx›¸†œþ÷¡(rUl,Ë`më]Øîý·`?—ygßx6ÃQDØØèøè)òÝGÒ©¶œ<.5¢ýÖíóüòâÇLŽ	
+EÚ< Òt{J{PlÙëƶÙÞdûë;R–eywãͶ[²Dg>Î|œ‹h‰èå…¸ãúóåÅ“ZGÒ¥Jf&ºœFÒæi‘©ÈÊ,Õ…Š.'Ñû¸ÉxRÁ×ú
+¾n೨G^¾†É¶;Ù‰Ô ™&ý0JŒ0qõçñ7(j[77£DA‚Wð)^î¦Úð›)ü¨¼‡ñ¸j…FI&Råò(Q2-dÎ+¡ô«‘rA3Ï*/¸ÚÎá{ÌrÆ(s‰£KReßókœXñ€%N£ÕêQ¢l<a#•ˆ$,—,`¤inA<ÍÉ
+\â\胗½C9 Señëz9Ryû¦	olkü„þFo`èB鑱:®Ø0˜H¦ð°g
+I‚q7„HfS—;ÐG§ÚÖç)®?ózl¼"Åc¾*x&$|i¶ÎÀþ›TKÖ%Rƒ x–•æyÁ©IW
+VíÝç_HØo5³ˆoÞ½—2yT¤…U%ŠÃÍ’£¤ -^oÆZ@Õoç¼
+Ž½‡í…‚ÙÃköWQ¼ÊÜ—&€ëxƒ ®›£œL<eT×& ¬0À"·ðK¦ ¬“°}ñ3ܤ-íT¢µŽŠÔ¤Bªnà6š×¸Á0FÇŸ®xsiÞ'¼¯ø¾l¼À=Ž¯Ñ& ‘dÏ	3påkšÑʧç3ž´õîTµ²Ñóá÷¢…+Š8A°	¼þÅ—ÞHi¥õ …§Ã»s•òP½ZѦXÌ}Xt•®ØÒu9F»>Ž2ˆžYÕ×¥òHÝÞeÈ¢/òu†Ô÷EÐvÔÁ—•6¼ƒ[6þM5é/ù°ÛFiÎqGãÁ|»ë‚Ù‰žI/¤ÛˆÛzCÀ‰­×tx¹§³ÿC(•ÒbBèP¿)?öÐ,ùð){Vu6•Ê„ü!~t¨Ä4£KêH
+ãë`ˆ‰ÿªè9b÷,(àŸ…38g–fæ$Òê›"á CúÓE\üÈûAî¬ù~œÝr/qId¦ÓS¡nf¡9³x&^w ãt’îðìΕ'Œ’rŸæ"+ϏÒ	Y·íÙé‡î¦¿b2Uî“€©ßÝ¿¹'æaçH!hOµOF0¯æ¤ºêPãسÞϼ}'0â[oûÐÖÚsxŠ!;੺	éö£
+{¿”ݸPÙàþ¯ímŒoò#Ñ]¹;©*‡2ÐœÄ:0ÕS 8=ë'xìQÓQâ\üˆòó6ýóÎÙO^œzÐÇé-æ_˜ííÁÓ¼·÷‰K$ jõ'à„5QOE=ÝCMî?÷5*¼»¦T»™·•
+ÏëeñÕ'`q§[áPI¼©ÉÊ	—4LÍ÷ç³1[|™Yáj²&B©ÎfAÕeÁß7Ýs¢õõEVôs	ØZÔÖÀ¦MOì¦|ob;"q
+–·v[îM—ÍÚŠž »îTëËž3nŽ)(ŒuŒ”‹¥;? Caêi~K¬—v‹Uy‚Á_å6ô&Á–àz.+þUöÿrR#ws½¡ßló‰œ$•kdRb‡¬m´!/û&ÙnÌý¢Ð!;L:¸	–‹¼×–ij4‡Ùì’ØÝ-;](~<yÜ´ÍÌÄ7ˆü|ߊ9.'¤©°m%FíbnߣŠ3PØdª[Œ`›ÇíÛ<´xÛÞ+’hWÄïð‘¤VG=åªã¶YI±tH_eS­Í™ú"¹Á¶å‡ŽO§æÊ`}peºÒ³õÂË^·å2"(%péEà.%°Ž@!´U-3«øu¦ˆHæ{¾µ‡"Ëæº÷|ƒ‡=N8왣àYµ
+qÝåúd¢lºù@`=#l§Iò(î’ %T'Ör‡œ’^s>fEarÖI@¶¬0>$ëËÍο«&ü8¸C˜W~æÎ*ñ‰€ÚTüvØRn±âûy —¾±„߇ôfÍAH
+V¶`ÂÚð9§
+m µÊ‹N§2cƇôWÈ–çoXx¹šð²ªÊrÌñHçËà=7j»Ç4÷–?Jr‚ùɐM8¢Jß%L2(ê—C.Ïç+¾†Äû’þ2øÃ0s €³£™E|C5íaPº,µ{¹ê´áÖÔ—ñÿYöŽ´ð¶ó'
+{$š
+¼‡¨ý[éGO½;¡´§ðÁ~ýóv–¡7ôSÐê ±+/qéw$í^òz•íé'ãýXþ}ºpÌs(žÜ¾p$-œVׇEÁ[,xF'WÜù|B¼`òigyð·í²³dH—ºìlFw©ÐmñÛú×
+¯‰îŠ×Ûy/'¡ÛŠƒ=£qœÉ ŽÌ‹Ôé^BÑXÝ é0
+¯¤Å®5^t–À!°‰k(øçÄŠ¢PÅ›e¼m½Û½ÿ/ØÏe>Ø7žÍp6Þtbôùî³	i‹TÛN—Ñþ‘Öóüòâ~6ŒH
 endstream
 endobj
 70 0 obj <<
@@ -356,34 +360,28 @@
 /ProcSet [ /PDF /Text ]
 >> endobj
 117 0 obj <<
-/Length 2403      
+/Length 2430      
 /Filter /FlateDecode
 >>
 stream
-xÚÅYYÛF~÷¯ô
-¶»ÙÍkÙ…;Y`L;H8uìHâ@¤ì̿ߺš‡Ä™µ½	öAÃfUÕu~ÅѳõLÏÞ¼ÐòüÇí‹—¯£ò8Žf·«™±V¥I6KâTE6žÝ.gïƒH-L-Bc"ü ãCÓÂß~»üÙ֋Ц.h7âà×Ê…5Áý"±´s
-¿jñëí¿^¾Îf¹Ê“(A†zšLÙÌ0«_`צhŠË‚-¼48ÌäwDVD7J®	y0…ÅJÎ4ül‡„
-&òQ¬xw´Õ§»¢ñ|
-¼ÜÎ3ʁ0þ¸ˆ“ ØÊJq·£{•úPú–x#ÈœÌqëOPé€LÀ:Ø’†EB–å]ªEÇyðªÁµÓžOŠ•G #p¨OøsuË’BîÓðÆ%ëEW)O0Ü#íÞLŽÜÁZT+Üv”ûÀ1’
-©ôRIàyULçüÒ&¸‚…Lö½;œß¾ð<­
-šzß¿ nw(q…±èžnQŸHU4u¦ºÜœ…$ß6½ó›ª8‹@fZ&† ½\æQ.Z_º®3*ÎVt™Ð$N9ÍÂȪ\œúµˆqdÉÂغ ^ñ³ÓäÕ„|q¦RýÕâ¥Jg¹?LØ´¨Že#räÙYïÈÈ¡PC_W
-›0Îbï#Ïê6Ε‹bÏ/‚{6µ\¦¹Ü&*†¬$§ô’Õ²¡Z¦“‹‰U’˜ç(A$jð½h샗ÚÅ°àŒ×L³r‰Ê3׳
-S£ƒ‚4=ÁÖF*2fÊ°î’t¤UÖ;)dccÜ’±Ž¬µd§Àx x&rȽÜJÄ$6îbÇh‚ö-…úã"s^po%L ¸™Ò‡¬ùDÃÒi*êKä>%ž?
-ódÐ4KÉY*JfüÞr.ÂáF²+¯úE¾$KsS^IÓé©">Ip×ifåsB›çœ8Êseú úšaÏĤýB
-M
-N"MwÁ4•Sò6û;´ò£P…Ñ"÷Žhßš“TF|é
-¾xOÀq¯…uOo#‹;ï UÓKÅV:J4lëC/%å5OC<t"ËOgðíª¹6r§9íCÑØ«€^¸¼lÈ¿ÅmȯpíÔj“ÓnP›&2U–©<íŒ|ã.%à[1¸’y†6†Hl&3Y)¥žpIÕlÏILíÀÔàr3¸À#{H”euò_AAï¸aœÇœX;œqC3áÞÎL°y%x
-D¢÷wák
-(xüƒŽ5JxQÏÌ술ïÞ¼¸Ð SIÞeäÍÀGQc×ð{)?ds¡–™õ@ÇýŽ/$üþ-;J¡«ÎN¿IÙž—°C_0à^†(p<Z¬“gÚþR[Wžù…\±©$3Æ<´e.-MÙ	+ðVˆ”	_ÌA
-÷µ%?†„“ve¥,"B7ĘâÒÔÏÁ>ËØaä G0vœóÿ?67Á;yþ]æüYÅ¿	öB-ÞÀÏÂOÓói‰¬wŽÏwh"ÍÙý™ã0*Ù¥XzعæÙ!0†×ËÜwÅèõ£åR¨1ìµ€x×pî0§4xÍ×S`´#šÓÉ¢I<K!éiC5œÎÁo(ýÂ@ùwȲ8>RF€£
-ybMá$)>SQ>>Oµ›D.7xÜïîT"‘lâr4gPÆѱqLó=Æí¯LxŽÞðfW.Û}‡šú8ǤêÒ`Îýç=¥çêšE¦øy$%ÍÑï“(˜/¸Md^;^“í*7Ÿ¸Ð{7`Î60ðÚ¸ã1Ç}zBw%}€uk ˜ˆTK¨Gº.ËŽHE€ô9ÖGró3Â|5"ÌȨEƒÌÑÇ Ðz*=÷õ‘à4UÕ²a)B±ÄPhíe¹¸ÃíýÏŠúí’òå|,v¿õ„Rmw
-‹ä&4¶¤|Êy·m&ƒÒØ'¥¡·ÝPǁ| 3Ó¿"Îõ®&ï­¸4Í'„äol”§jŒ„Pd Ky[·ª¹|Èµ õºñEánð¡ö–Tª?h“%ý1žAà ¥Ú?}†äš³äã+ɇî¤/ý¸ŠŸô÷ªí2˜è[t
-½Hò™Kh£Hevº¿w±Ps?DnÖ€Ðë$S}õ?vêaj3ªñÈÑWuz¤jZŁ<ƒ.ŸLïzÁå“
-ƒP7ÏJÆÜJõª„·dzçëqKe úh7Ö™”ú¹VÈ!Ž° Ù¨kî‡%f~<}l}XhwRû§hYP–¶<¶™eP‚ºùªbU¡DÒÅø¡/˜ðú;ú=ë—ÿ.¿a—Њ5˜A‹eÓ±±1q’6Ì´fpÃVæG¬$9$†a-¿p-‘ŠÅáÉÏ 	Ž?O¥›®'€]¦â´$¢©	G~úÉëÒàûO âpm¥ÓÄ›ôŸ#	éÄçúc\R7£|Uõ G at HYwmê±ï@ Ë’àÚˆ`
-ïêÒÃ’§'mÆ.fíy3ÏX‰÷þÓáRÚ—¶Ôlj¼_„™ô$Z¢\ÒJÐÏ?ë:onxù'”cÉãÂRÒ Ÿ¬–YVŽtØõ8Å´,^sþùXJŽ²,í
-™$‡u2_[†©I¤ý(ÁÆi t3à	å‘ ±²6©‹À|KŸxìyþ[aÇ@Ó]_Ó*ò¡š°E±q"ãºYpòíŽál±çÙ/ÐZ‘ ôWY¾ 31õWº+¤Û¶ªßÂÌÏ?þxÅ—;ÐçÓõÔùÐj‰a‚ØÕkÑ·lûf{Bd©‡ªíÉs˜Ìé›çÌ@Š²‘²j2$}[!t …7ã£Ñ’©B~©ç\(BkíØIi­DÕ [ñ?KæW=>ÛWEïÀòéµ
-xžKóJÿ¦hÇÜU,ŒËŠh}Pá ê‘úûøªoa>-G”"Y¢d²#K5Bz³]£ÎUS’ÓUVÔC‰¥O->ï¬ÐiaM” ÂÑCæÂkNÿØišî½ý„LCJŠÜÈyu]Vè9P–ø×…bú%™³ú$‰‰>=6}pàxøºÜ4g˜›Þ¢
-<WŸzÆæ­yò½çó„òç塳†"É•…’F9 at nÛ>[¢¾»}ñåEûÈ
+xÚÅYYÛÈ~÷¯ô
+¶»Ù<™²v6X8€1‹}°„#R”2’(ˆ”½óïSWó8òØ	
+É>ªªëüªGϪ™ž½{¥åù—ûW¯ß†vfŒÊ¢(˜Ý¯fÆZ•Äé,ŽØhv_Ì>zZ/XøÆ¡÷3¼ï›þæðÛnáÏf_-|›„^».ñ%ò8·\Xã=.bK++ø•‹Ï÷ý6e*‹ƒê™oReSì~ƒUë¼*aêmà£Á×ÌC~GdEtƒèS˜,eOÃÏvH(g"_„@µÇ¸¢-/8=äã“ãᶎQd€ñ—E{ùFfò‡-‹¨Ôû¥û`‰×2qÈAædŽ"/¯F<A!¤2ë`C	Y”·P?Š2ïMƒs§)ž*@FàPŸðÆê–_H
+9OÃx­>ey‚×ÒÞãÉdËÌÅ^¹ÂeG9l#©J/Õ™ŽWÉtÎm¼˜HeÍѹÃùésÇÓZ¯©wýêv‹—x€îéõ‰TECgªÛÊÉYHò=`Ó;Ÿ±‰ŠÒ D`Ö¨ebÒËažä õ¥ë†B%t›Æ7q¨BÌüÀªLœú­ˆqdÉüȆ^½âg§É›	ù¢T%ú‡ÅK”N3·™6Ø´¨Ž¢9öòì¬wääK¨¡ÇWeÃ&ŒÒÈùÈUÝF™
+ƒÈñ߉àŽM-‡i.·±Š +ÉÆ)½¤`µt¨–Ãtr1‘ŠcsD¢ßÆ>x©]ÎxÍ4«0VYö¬üÄh/'MO°µ
+Œ™2lxI:Ð*흲€±‘öîÉX
+GÖ*Ø)0(ž‰r_n$bbu±…ïhœÖå-…úÓ"
+àÎJ˜@q1¥™s‰†Ý]k¥“DÔËy–¸ÿ4̐A“4!g))™ñw˹_×’]xÙOò!Yj›òJš˜NO%ñ‰½‡N3+—ÓpŠØ\sâ Ë”éƒèG„=K“÷)45h84ÓTNÉÛøÚŸ¡•…*̈ñu—?Šñ«9Ieď®@à‡ó|ïµPõôÖ2¹uR6½Tl¥£DæÞ÷RR^s4ÄC'²ütvߎ¡Zkc!5§}ˆ#zw* ./kòoqò+œ;5ƒÚêpP›&2Ušª,éŒ|ãð­\É8CC¤6“™,
+”
+GxIÕlÇIL‚©Áådp€'ö 1Êêø›  w\?Ê"N¬ˆ-Ž„C3áÚÎL°x%x
+D¢ïþ[
+(¸ý“Ž4JxQÏÌ술_>¼{u¡ÁPÅY—‘×EÝÂïµügÎH„ZFªŽû'$üþ-+–BWí~-’2²=/`‡¾`À¹Qàx´X'Ï´ý38¤¶®<ó¹bSJ.4fŒyhÉ \Z²Và¥)¾˜ᏖüNÒ••e¾º¸!Ƥø—¦~ä®ð"cûA=‚±ãœÿÿ±¹ñ>ÈóÏ2æöº(þ§`/Ôâü,ü4=Ÿ÷—Àjpçè,q€&’ÈŒÝo4‚OÉ&¹Tû8V{€q¦#—s­^_±#¸¤Í²˜ ¸K‹÷¥¶b ’)ŒK^D‰°ûiË#Ó™ö–¯À|hg4·{'‹ÇÑ,¤¨
+YœRG)‚[„)Kõ'„‰Ò< Öóãex;à	)Ì$õ§*È’oîÔ]œÓˆ¿Í{¨Ýúº¤+ª„Ë5nw«;·@u^$èô3¡9FŒi/˜æGÌ)Ÿ™ð=õdûæé/sLøaâ͹7~¤ÒQÞ²ÈÛOdà9Ædxó·PPhr
+•ÛœŒNÔ¾Äx˜O¨æc8ƒm?f…xX°hÄgn”a¶x©.çB‹—RÑã¥pßá0ŸÐïÇäšÕ‘òy!òƒ0†62™P•Á¼m:øb¡hýù9á+ò:ífÉ„Díæ©Ž%ˆAWeCúÐëNí†PܤUPû¬4áÖw{]šY~]Ìʇ6Ëzó7Ä¿&Ÿ§šÑLš¥ˆŸ•âÚ›r~­’†PBÌ… ™èûº•\”™Á­K¦¥©Wù·)°vIxä“6Ar<ƒ6DGZ ÍáèÊ Ö‚·¯$Éﻝßà,â*|vý
+瓶é7ü™hÎt
+WüÂîÌ·A Ò³jèàuhð5CxjÍ í±ŽSÕ7‘ÿåu„ŸØ”€rtÐ…> …æ@q Ï §ÈÄWàro„Æ Ö‚G%õn¤D—Â[®¨XûF%V‡cÔE&¥¦µr–,”XjV›GwSñhΏç·MC,=]bÿ'Z(‰:‹-†Ajyá|U²ªP"iÕÜ«».ƒÏ¡ß³~ùoñ¦q‰Yƒ)ô‘6k»¯²SΆ™Ö.x@@ð„%)ƒ¢P{á Z""kËï“w=1¾¿L¥Œ
+o'Ðkª¢¤ƒI¢©	G~×ِ×%ÞßJ7Ub‰B×NãIú;W‚sѹþø‚¬nFùJp–3^EÖ]/~\ŽW¬ûÏË.™ Úˆð¯êÒCÁÓ6c³öüƂƄУ»-¤‡s tCͪÈû]ÀOOB>Ê%­ýü“±á‘õÝOÿå(øÝçbYHàe±èWI‡]c„CLÉâ1ç/ezÈÈ$9¬“ɸÚ2LM"í	6H¡»± Ï(ˆa ©‹:––î<«#†ÆŽÇÿ(ì“ÝÞÒ-Ww†'»ç¡+Ò9R+€vè¶áh¾ ç—i-œ&ôWY® 31õï7bÈàìF÷0òë/¿ÜðáötG\M­Ûd‹hAg%ú–e¿ÂhOˆ,u(ÛÑš,ƒÁŒ.vgà©YŽ`ס&CÒ­c•„ОÞÕÛÑ”)}ÄŽ‰ãœ+aíØIin‰ªA$µâÿÍozpµ+óށå~µ(‰‡,é1혻Š„ñr…âï[E·FôC=Ò%FtÓ÷B_‹¥@¦(™lÉR^o*Ô¹j–ätå…õPâF©	mù:-TD	"=d.¼æôß«¦é¾Û¯ÈÔç>–P‘ÓQ×®ùΘe‰?|_(~WæBÇ,¿Jb¢ûÕ¦Î?–›©a˜›Þ£
+W—zÆæ¥W0yœ)iÛ2€­r`ÛÝåL‰óÓý«ÿ ïÍŽ
 endstream
 endobj
 116 0 obj <<
@@ -413,26 +411,38 @@
 /D [116 0 R /XYZ 133.768 667.198 null]
 >> endobj
 115 0 obj <<
-/Font << /F43 96 0 R /F8 99 0 R /F55 100 0 R /F65 111 0 R >>
+/Font << /F43 96 0 R /F8 99 0 R /F55 100 0 R /F67 112 0 R /F65 111 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
 121 0 obj <<
-/Length 2473      
+/Length 2406      
 /Filter /FlateDecode
 >>
 stream
-xÚ¥YëÛÆÿî¿B8°œh.ߊ›®(\;pd܇$¸PObC‘ŠHÝ#}g~3ËÇI×sZ÷1;;s0š¸ôï°™¸vüùýwBó	}ŸÛç^ç};¦ý¿/_¼z…“ØYÄ®™,o&Æ÷8J&Q;žN–ëÉOÓ›ãÌL«¬¥ß¢®fóÐ7ÓŸÝÐ¥ùý¥LyïËø;þ¸Ó_>Ð⨠Ýòg•6ñl}üÂpèN÷†¹ "ZùÒATt‘™îóv„e± ÅÅåì—å?'&rÞb2w‘{ÆÚýæ›ttÒU¼m]Ž0ùœ ÝX·³5£hG„ZqBe1£ÉMÍ7´ÎŽ~Ó¢ÝcZ…Bw2Ooqåí¬G˜=ZQ¼#.IhÄ€.mšl¶Œ°É Ú¼9ËSZ¶,¬Ã7ãcý]lp2eŠóý^(ú‹’ÅÔ4²ÔI4¢#!ú‚u~WÏ!×5X_V#È
-ŽÍÉœ’0M,䜪›÷;}õ.™,œEäE0ÂÀYÁdîÇMTس™Oc3d‰<Ì’€eäÅ.ìB!1xa8m¶4®¥È•WX/u+ã}¢iΓhÊŒç¿ÓÏQüôTÚ#‚j72OõžºÊeÐݍnÚ3¡lLù_0 at rWÌÄs¶ŒKÒ5¯
-Dh¥aŒ³Õ#ÓJHô}dWzT9¨pôÕ;聾]Bâ@@œÓÿ@ ‡*ðǐÂœgù¤žçDñY¤{ðeÀ4¨;½$I¿ÆV	2K=79ÿ8r4ð'"Ï
-‡(CV;±§Vâ±Gø3’•Lßç,ÛV2÷c2^Háló ÷„,òM“8¾¢|S‚¹Ä¢«\Æ»”gp¾!Uú†¿‰ªÕÀÈhÊÒHÕ|Ù|6ºn͆N6¬ÈÝ.µÿ°f¨`•€¥²²ƒ	ì-gYç³½*ûËW3/!=(ÓÑÎ̾W|"‡<J,œR„F®¿Šø¢Å $q‚(°ZýU†8J-ÀßÎ`` ï9¾àPËËas°‚ž1óˆl‡2„Y8^dÏRõ„>©ÎîJ^𦷼 m7…Ä,³ºù;Œ?<'õ@å›ÜÎ% `Âá'žêÎÞFœꃺÏZèhá9®ÔlkÆt×èñy¡(ái=)Àr>4tgD¾ò—ëˆüÜœºx9±ÿ?»¸![é4õZ®
-‹ç…~Ÿ²a	Ö†åüÿgÃó„L”
-ƒ9e57­%Kfå+˽͐„öಬ)Rú7«ãAÙðô^iwã"cù™Óá÷Ϙk§Ä¡¹ÎŸmƒ¥«éMTÕ)¼@Q˜¯8%pFMËY¡÷zp'[dgë\ꆲjÙí%û>Ò…µ™þ9]t¬¢JW3î[q·FÎmËÄ•[¾ˆÔ4å»7\pþxN–ãÔA1̧ÔC1¨O&Ž'IcJÖ I ‘˜+ÞZX*ÛT…¬^w>Ÿ¨Þ®¬õ—6Üô>[høD[M!ݹ폰Ž|4­m@E$Õ˜¢Zwj͐k:ß·ðµ7õ BÎåæ`5ï1"˦–¡¦£â4’¸ã"æ+‡9Æí2ÁåœTx±8Åx¶¸!å‡aWÜh-u¦¶q/~÷Ù"p8éj'Šöa0ý7,žP\Ô‰ïfš¼PH+nA"½,ØèÏrÎvM¨Ÿ¶¶]R¹XI£¦B§$hjðˆfŠ#­d$‰¶Hf߯WZª¦ò„–elÝ‘/ĵ, ,?–è"*Gþ•Ú^ka?¡ØFIè$Iò´N¯g†L§2<6góÈ#Ö3Т*¢ˆ.qñ‹ÚJÀI÷sö¥+GÉÈÚ¼Îìz|¤ÕÇÄ¡êëql¤ý>"¶^!¢Ð„\[ÐSyHlÌ3y$Ø[<aŠ Ù¦aºòh‹›Ž\	-ùËæFY«2µnœRJO·Ðyüh±¥-!Ea×Ï„Nª=IW*:lÎ	%¾Á[/‰Ñd«3/	¥®B:VÐT>­­¹r™bº¿í·?2(`´‚rMHõA€~Õ‚(âŠmZ…œ˜¸—ömÜÑ]3óò”‡ö\YIŽ!õŽµ!€(!<†«ÌeU©A at fðo_ÁK·¹S¼+6ÇÝ æ;cad0~_¯ÝاöyíP€LoP†¡o úž#ÜBN¨ ôÆÄ 6«àíë8 gî"²4u…Íyï?À†µ¯._|?¦GlŒZÒ÷Ƶ$+#Ås“98VÜn9–Òni†mwÔXÑÓ0éͽ<U›oÔn‡µÍS­=Dâ€"±"ý‰YûEÛ;*Pþ¼©`¨S³‘ôšéÞÉÓ6cr«ôRÁùÿ{Øí~vœ€:¤¨@.?1Ž–øu™£k#¸Wù^‹l™"JÖ`+…t¾»,noƒ@ó¡¸\â¢hÝÝĨ¯Ð2³¦ ò-ÁŒôwû4îGæ­Øðïu+E^Ï3 >•¡NHQWMÁ¨.Û)Œ6o,“>H¢Qd±·“„±ñÿÏŒFRÈ[P„{åˆэÈ`=שŽYœoEu9óYô\ì‡KÂ#«9ÕE™w2¿-à]Èîn<Š*;XfO0£øÞµ@Yf;H¬~ÿ‘¢
-z
-?ØA¨oî{‰ÝQon;j:aWÈI€{™ÜÂÈ®…`Ÿ­/]…v°°ãéès¯ù96v 'Ñ‚?òJæèai³7¯üe.Ïi¤®qÒ\eÐÚwÕ ÿ:òlXÍ7l|‡üQL´¯ÏÝþÕa ¤˜®oúWé&¯œ(3IûÛfD¾H2â¶ïr'Úç/ö’Myb»€ñKQID¯´'†vîLcƒ+Ü`ÔçÞ²gÃ"<®ò²±ÉÉ°…l{rh²Ã$k5s´>2xRÚ·Ðß#Tl`±âêGI2âôIÂÔµX:ìð0ø‡D üy¢=¤ÈEp‡²€ÿ a5-oW…¶ß% Ç85T±)”‡P͏B•@:ÎP|Ã~ºHWÅÇøVÀ×|{ÆŽÔ
-”<
- at rôʸÃÉ`<ø[ÄUÌã-]‡¨P½}¬×
-àÊdQe[™–ðð
-¸nœ?ç˜ÞÈ5Д@*a·Û=,;7TÒ€ŠêQ¯fß—6£¤1®ãö=Æ—Ï5!›ÇT´—Ñ|	—Cp—‘Ÿ]<Óò	C¨xNYbÿü×Òäûå‹ÿ *°Y
+xÚ¥YYÛF~÷¯Œ ‘ ‰æ}Øë]Ìzc¯82æ!	f)Š#qC‘Z‘š#¿~«¾ªæ1Òx&›‡û¨®®ªþêè{bOl+'‡
+·¤ýåÃ{Â}þ>1Ï}žàyÓ¦ù¿/_¼z“ÈJ"Û™,¯'ŽçYQO ²\/˜,דŸ§-Ï™Ö3gzh·ô[o)}v2þ—íiºÎip¿½§ß²~M¿¯ëCKŸm½á¥énöëòŸ´ó"¶Ü$ñfv‡MC¿¿ØýpF^ý¤ÊÌÞ
+¬Ðó„ÿõ‘VWó+êJ6ã-¨7—.Ïri¿U>}ýHƒç#Åù³J¡x+SŸ¾2ÚÓýi‚F¾vÕ6ÊÛ—$¡Ádó8¡•¸ÉdYv‹{æÚýæ›t´ÒV¾m]ŽpòQÛ‘NgkfÑŽshÄ
+TÅŒ:×5ïÐZlï´¨Fû8
+óáF"\yK3ëg—F”oŌ˔¶Ñ¡mAÍ–6L›7guJË–uñÎ"/œqÓæú}©ì_–l¦¦‘¡Î¢ñHè—|æ·õv]ó‚õK@¬GÚdA®Ñè$ô¸GH|õ>ž$Vº!È·ß'ÚVè*?2³™Mc²Eîg±Ï6r#øƒQÈnL¸Ø±»òŸKÝJ{EŸpšs'œ²âùé稌/]•6BÄŒp´駺O]åÒèöG;íYPÆKÎN]˜Ü3ñœ­c“tÍ£Bk8Ž•MÒJDô<bWºT5¨°ôÕ{"ï­mBæ`@šÓŸ/ÔÃ#p}ËICͳüS×µÂè,Ó=ôr 4¤;ÝÄ,;vÌbµ «Ôk“ó%K}o"6pyñÂáðêJ"+ô[.{„7#[¹þôCζmÕ /"Xð â$0qOÄ"ßtbË#ÉÀó¢„׏ä°riïRîÁox‹TIêkþÆz®PF]6GªøeültÜà†V6|’»]j8þnp¨d•¥2²öʈ†³¬sZ¦^•ýæ«™ÓA¨
+hÓÒg¯ÅIp²›
+DÚ&7hîù«grWwÜOø7Y9Žá³T[ùGfsÅ~»’Üé
+ÀÒM!Žˆa65‡ÎÏ}2
+̽ÉM_¼öýhª3{ãî׈’ÅîZäh¡š+ÅLÍœn]ž#(%`Þ‹.únFâ«~¹¶ôÐæÔ¿üЊ¼ÿÛ¿ªC<³øl34÷ý>†öGƒYÿçð³ˆc˧\@þK¡Ã¡–+÷&=IØC˲ä'q¦ßäŒßòÄ£¤[Á-¿pæùá¤z8g±ÇH`[ #= õðDrú+öõ˜|kH¦ÉÇw§w2E¨‚÷Ì…ÊÂn/‰îåÂTþ!Ëwª–—œÖ¥ûVœ«ÑÚnÛ²på–7¢C–Fï/¸¶ûéœ-ÇQš¢…ç[Aì⳯ñùÇãI|^§ ©ãkÌãâ²–¶Ê6U#«}3t_¬—&¸ôZh°Ä
+“¸ý€öÜöKøŽ5|8­ûâž˜²ZwÇš!ªwžnèkinê˜#*»ÁhÞsDBKBM'ÅiÜ°Ç1çÁÂ
+-ÇvM°˜ŸáIé֍Á)dzu„XAÐÕZ¶œ)#lˍžà}6Wû¶Å]™B±=ð§ÿaÀâ¶Âå²O9ïv¦!ß
+DšÓ»‰ë2`b=Û9ÿÅv
+ï4µíR€ô%B…NEÐDà’Ì~ð =$Z˜z”}¿^iU˜ÊmeX=À:_Ò3¾0X>hù^BQâÿWjªe-;½˜"ý™ˆŠvñãpº=+ätG†{Ýlº¤zùOŽŠ$¢Mì`ì¢&ï{¡/ɝcξ4få(zr€&‹ó »/iµn?T}鋉´ŸGÄÖ-Äš~kCzj‡9Îy`ÈM"d6I—¶<šR¦WBKþ}Os­ªU™âïÞ§’.\2ëÃÃ2¦`°”…?:©ÒHbßÈo1œcJ|ƒkU>ÉÔbnH…,¬¤©|ZSaåÒÝyt~ÛObRÐh­暐êƒý[ËŸŒ+&4ivbá¾7×ÐNîš•—¢]î´Uyd9¦<Ô;>
+)µÃ˜ø8ìXe.£*
+2“§¸f
+_ڍ.ݼÓæ¸TxgF€ñúêìÚÜjÏŸÈ8*êmƒ¾çĆ·°ê%½®€¤1€ÄQº=OºQ&¡‘©+lÎ{ÿ4¬=»|ñ¼ˆî‹ê—$ß?ø0RÜìXƒcÅ/ÇR^6šá‹ÄÙ—3 at zsÄ3n…ÍwŠÛg?—yVœhµø3«ö«¾¤¨AùsQ(O³WôŠåÞÉ%2cq«t®äü÷¸ÝÀÏ®P‡Èü3ó¸g‹_•9H òû;µï¥c˜-SDÉj¥°NÃ{—Å
+øáÙ°Å=¿˜/±Ñˆ´îvbÖ—x2¦¿£ò-¡Œ<ñíö
+d.ÝO¬[±áß«VŠ¼^gP|† *C ×ɪ)˜Õ|0´yc”ô µBÓˆLñ;K8f#þûÂl ’Bn~b܃(Gìˆ{ô\¥Úfs¾“£ËYϤWÐb?•˜YÍѨ.ʼ³ùMïBv/°ãQŽ²£eõ„3Šï]Q•QÆ7Øœï?ð›^Áv0êÅ]o±»¢ê¢ÀM'Mgì
+9	tï`“€ìªPöÙÑøÒe`‰i8®¶¾ÔXð†oaczÄѾ7«W²F÷K“½‡¯äòf¹¶ÄIsµA+÷ª·#oR¾cÀòa<HžÛîÙ~ï[¾yâÿ±¿}nò
+ÙˆR‘<-›ÈI
+Üö/ȱ¾¡{IŸx̯ú'aÇ.E%!¼Òç&<óvk Ô2º9üx§nYȽ…iWyÙ˜›ãdø<«ÑëØÀ`­¸6Q
+ù"ƒë¤ýóôĆ
+ *¾}”¬"Ž DŸ%.]	´¨Ãýàÿrðôßâÿ"ÁYÀa¡š–§«BŸ¶%¤¨Ç<561J	<(ßG±I(-«3ßÙk±±‘¹®ñšG¨. ’jð‘õ—Ž=ìÚƒ'ÿËèÛÂ
+OX÷»՛ØxãTÙVº%||34Ö·Þ@B®M¨R§…¯ØÇ×çá‡å‹ÿx†s
 endstream
 endobj
 120 0 obj <<
@@ -446,73 +456,68 @@
 /D [120 0 R /XYZ 132.768 705.06 null]
 >> endobj
 18 0 obj <<
-/D [120 0 R /XYZ 133.768 577.411 null]
+/D [120 0 R /XYZ 133.768 544.026 null]
 >> endobj
 22 0 obj <<
-/D [120 0 R /XYZ 133.768 426.382 null]
+/D [120 0 R /XYZ 133.768 396.671 null]
 >> endobj
 26 0 obj <<
-/D [120 0 R /XYZ 133.768 358.132 null]
+/D [120 0 R /XYZ 133.768 328.501 null]
 >> endobj
 119 0 obj <<
-/Font << /F65 111 0 R /F8 99 0 R /F55 100 0 R /F43 96 0 R /F69 123 0 R /F48 98 0 R >>
[TRUNCATED]

To get the complete diff run:
    svnlook diff /svnroot/adephylo -r 194


More information about the Adephylo-commits mailing list