LUCENE-2323: move surround queryparser to queryparser contrib

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@932731 13f79535-47bb-0310-9956-ffa450edef68

lucene/build.xml

@@ -347,7 +347,6 @@ The source distribution does not contain sources of the previous Lucene Java ver
           <packageset dir="contrib/remote/src/java"/>
           <packageset dir="contrib/spatial/src/java"/>
           <packageset dir="contrib/spellchecker/src/java"/>
-          <packageset dir="contrib/surround/src/java"/>
           <packageset dir="contrib/swing/src/java"/>
           <packageset dir="contrib/wordnet/src/java"/>
           <packageset dir="contrib/xml-query-parser/src/java"/>
@@ -376,7 +375,6 @@ The source distribution does not contain sources of the previous Lucene Java ver
           <group title="contrib: Query Parser" packages="org.apache.lucene.queryParser.*"/>
           <group title="contrib: Spatial" packages="org.apache.lucene.spatial*"/>
           <group title="contrib: SpellChecker" packages="org.apache.lucene.search.spell*"/>
-          <group title="contrib: Surround Parser" packages="org.apache.lucene.queryParser.surround*"/>
           <group title="contrib: Swing" packages="org.apache.lucene.swing*"/>
           <group title="contrib: WordNet" packages="org.apache.lucene.wordnet*"/>
           <group title="contrib: XML Query Parser" packages="org.apache.lucene.xmlparser*"/>
@@ -611,7 +609,7 @@ The source distribution does not contain sources of the previous Lucene Java ver
       <fileset dir="src/java/org/apache/lucene/queryParser" includes="*.java">
         <containsregexp expression="Generated.*By.*JavaCC"/>
       </fileset>
-      <fileset dir="contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser" includes="*.java">
+      <fileset dir="contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser" includes="*.java">
         <containsregexp expression="Generated.*By.*JavaCC"/>
       </fileset>
       <fileset dir="contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser" includes="*.java">
@@ -623,7 +621,7 @@ The source distribution does not contain sources of the previous Lucene Java ver
     </delete>
   </target>
 
-  <target name="javacc" depends="init,javacc-check,clean-javacc,javacc-QueryParser,javacc-HTMLParser,javacc-contrib-queryparser,javacc-contrib-surround"/>
+  <target name="javacc" depends="init,javacc-check,clean-javacc,javacc-QueryParser,javacc-HTMLParser,javacc-contrib-queryparser"/>
 
   <target name="javacc-QueryParser" depends="init,javacc-check" if="javacc.present">
     <sequential>
@@ -655,13 +653,6 @@ The source distribution does not contain sources of the previous Lucene Java ver
       antfile="build.xml" 
     />
   </target>
-	
-  <target name="javacc-contrib-surround" depends="init,javacc-check" if="javacc.present">
-    <ant target="javacc"
-      dir="contrib/surround"
-      antfile="build.xml" 
-    />
-  </target>
   
   <!-- ================================================================== -->
   <!-- Build the JFlex files into the source tree                         -->

lucene/contrib/CHANGES.txt

@@ -126,8 +126,8 @@ Build
    (Steven Rowe, Robert Muir)
 
  * LUCENE-2323: Moved contrib/regex into contrib/queries. Moved the
-   queryparsers under contrib/misc into contrib/queryparser. Moved
+   queryparsers under contrib/misc and contrib/surround into contrib/queryparser. 
-   contrib/fast-vector-highlighter into contrib/highlighter.  (Robert Muir)
+   Moved contrib/fast-vector-highlighter into contrib/highlighter.  (Robert Muir)
    
  * LUCENE-2333: Fix failures during contrib builds, when classes in
    core were changed without ant clean. This fix also optimizes the

lucene/contrib/queryparser/build.xml

@@ -28,7 +28,7 @@
   <!--
     NOTE: see the README.javacc for details on how to fully regenerate the parser
   -->
-  <target name="javacc" depends="javacc-flexible,javacc-precedence"/>
+  <target name="javacc" depends="javacc-flexible,javacc-precedence,javacc-surround"/>
 
   <target name="javacc-flexible" depends="javacc-check">
     <delete>
@@ -105,4 +105,10 @@ import org.apache.lucene.queryParser.core.messages.*;"
                    outputDir="${javacc.precedence.path}"
     />
   </target>
+
+  <target name="javacc-surround" depends="javacc-check" description="generate surround query parser from jj (requires javacc 4.1">
+  	<invoke-javacc target="src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj"
+                   outputDir="src/java/org/apache/lucene/queryParser/surround/parser"
+    />
+  </target>
 </project>

lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/package.html

@@ -1,3 +1,4 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
@@ -15,12 +16,7 @@
  limitations under the License.
 -->
 <html>
-  <head>
+<body>
-    <title>
+A QueryParser that supports the Span family of queries as well as pre and infix notation.
-      surround
+</body>
-    </title>
+</html>
-  </head>
-  <body>
-  surround
-  </body>
-</html>

lucene/contrib/surround/build.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
- 
-        http://www.apache.org/licenses/LICENSE-2.0
- 
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
- -->
-
-<project name="surround" default="default">
-
-  <description>
-    Surround query parser
-  </description>
-
-  <import file="../contrib-build.xml"/>
-
-  <target name="javacc" depends="init,javacc-check" if="javacc.present">
-    <invoke-javacc target="src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj"
-                   outputDir="src/java/org/apache/lucene/queryParser/surround/parser"
-    />
-  </target>
-</project>

lucene/contrib/surround/pom.xml.template

@@ -1,36 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-  -->
-
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.lucene</groupId>
-    <artifactId>lucene-contrib</artifactId>
-    <version>@version@</version>
-  </parent>
-  <groupId>org.apache.lucene</groupId>
-  <artifactId>lucene-surround</artifactId>
-  <name>Lucene Surround</name>
-  <version>@version@</version>
-  <description>Surround query parser</description>
-  <packaging>jar</packaging>
-</project>

lucene/docs/contributions.html

@@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">

lucene/docs/demo.html

@@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">

lucene/docs/demo2.html

@@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">

lucene/docs/demo3.html

@@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">

lucene/docs/demo4.html

@@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">

lucene/docs/fileformats.html

@@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">

lucene/docs/gettingstarted.html

@@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">

lucene/docs/index.html

@@ -184,9 +184,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">

lucene/docs/linkmap.html

@@ -184,9 +184,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
@@ -421,12 +418,6 @@ document.write("Last Published: " + document.lastModified);
 <li>
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-spellchecker</em>
 </li>
-</ul>
-		    
-<ul>
-<li>
-<a href="api/contrib-surround/index.html">Surround</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-surround</em>
-</li>
 </ul>			
 		    
 <ul>

lucene/docs/linkmap.pdf

@@ -20,10 +20,10 @@ endobj
 >>
 endobj
 7 0 obj
-<< /Length 1025 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 995 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GatUs>Aoub'Z],&.<o)>iq\084LWcqBkjKP7-^RjRU"jJ/6l'T:%RabD?5q^80iIA:,r:2Z-UDE/8&<+e3Y!;CUp$&CGS<n<*s0E@]Mpe).:h"QEg,[b;701b*jPCU&+#sI@(0^MKg>n,#deA<m,tg5?HDXC\^=hZ(k8KA(qJ9f[bcUnTV]>K6`P*\I;j-Yu3XZTI2oA<8mo4JGN(J)2d[?Lakr$@EA5p8rR1&(Z7*:#A)rLr5iLsAE34DKpHToU]@i0(6Z^IT??Q^p^!kYlT>%r^;I*LA<)e`'Y&l7+%;^^ihDW5W1(R7<AkJ"Pg#ZPrf6.bO/?D2KunFn+_K;?N,dS6`:eDT!eXPdCs-=VHMS]P>[?KV[BD@jN6Ng>(K.,!ZC22[0jr5V2,7hG,%IFqlS<o[\dt"LA5)1gk$VKQ"LD,G@C0=d=A2Mi>U:SdSu1Vk]=PqBEo1VjEB;HK:;?5c]!g13\PKf*9m\>AG/(!]i7+IJ1KjYg7s/1.O#Ao7.R8#$ZO^1ki\&GFnQ(=C'o=3N@.9h_C0&GIc1r2612$E"]bNsWVTE@Bii!$6FeM(p4MjWOF-\J^+"!0`3-;msDrW[W3L:Oj,e?o\Ub_)]&"#%@m?jp^Y*HkOh)ZTEA]QhO^5G+WRoi&Dk?R.YEq:T;$TsL7RX($no)'JC88W/oT"?0X8T.h&[%%Q)[^3&a9er_*g>X3p`Pbk9K8Z1J894]L8bJ<L?qmkC93L;"$l'Cbnb@YrS`tccfVH)tBbFS7F+aq5[]td__JOO#<GUIcQ+Q/bCq7>&hATWm/-cc;YZF'KLXeO%4).YQ%'(W^PASNfg=h_)7/F[H[:Y_mg?ZW5QF"'c4j#8eOd\TH<C<]A+McKi_HP8,AiJh0(E-a\Kh#BWGrBU^Y8r67>p&gX7'LrV;pdT`mCg4W8qG$]V=k1'<4f_9G6]"'?Lu=3>OMAEVPpgTKWMMGYG*hUG<G*DI_*i!>kV26jc,1bh&c20Mk\Lq['Q>UeBE=W/(!\>Im*jr!<~>
+GatUs>u03/'Sc)R.sqX>p&#CLc6]-+dKIu@Q'aD*aeV\RRZB@H.K0!^^.=b,18Sr4%!ganf]O5%f?;j6"Tt,W"I?k4Jb9ERUjk*AeC'75Z_<@0Y`-E%M^LjD-(&2dOT*_J?'tLEMF8Z;IBM0>.[U1*r`k'4@/4)4g$_t$NFb,3'$E-..pg1Ep#gdmW%<=fa4fc`K:Q]*W76CL!:'MhAtb_)M4')T*Vt`,`aT>iF%AL24R/;5i=D(4192/I<ELD[,6h#?ZH,Eb%r&J?S0+S=IU1?^niLa$7)M#?c6+4MnNk0oP%U>=7Pu1^W**sl7VNCb[^Qu$'[_"rX>+S@U5t^$*b1_kE++)th1>Q`oJaao9Kde?]%jYQAaT>Q!L)ITpC:W;SkP#$ZlNToS=imm@uSKGCV@d`QtEBeWp,:GlmF_DqNQcT@t`=jmU.RD]Xr$976N^rQkbq9.Df\o9K`BR9[/[cVtLlre[1^)NXKZiJF&I$5NYSXD41uU[h!V6b=%mUc>h`!05WI3I#OL(=8>Ru'mg[ma^e*1kQOXR,MuHAA&Q8b^::bH9L_ld4:o,%)X7ganfj$'Hch7'MoG;jVRE8A\7ldnLO%5PO.gSNGW1#68l\6[VY-1pP[$pIB+A5!2EfSsV:k%@6VV=U_</;aq_IDPCL*6i5rE&trJ"l_H8Nl2NbadWIJr\rM%XaiFAMF9Bc'l\.BeHG:^J.Y*m`H91]8Mm(+im'%#_dG*90A-Y`0^A9mBuG)sW2VY'ts&%P;1N&ct(e^qg^oi`;+b@JP(:*.:aF2UOr1-C\+RNO>U-Nm.Mq"!]?H[53NO/n_felbk@dZ+bo3V?_>X+@m?j,RA#VZg6Ul#59j?`hT%*f7MdtRqlt[qNF[C(tG6G3]kAkSW=u=(j'U!\>9kYQ./O>4_E[L7?r23f_6c1E#TCBlo&%]a>UQ^$GRO,BqPq[l`;YcIBjL)["k3mU8SMnn%9<,IHS>e'l<X4+)rfDZi~>
 endstream
 endobj
 8 0 obj
@@ -87,19 +87,19 @@ endobj
 xref
 0 14
 0000000000 65535 f 
-0000003119 00000 n 
+0000003088 00000 n 
-0000003183 00000 n 
+0000003152 00000 n 
-0000003233 00000 n 
+0000003202 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
 0000001233 00000 n 
 0000001339 00000 n 
-0000002456 00000 n 
+0000002425 00000 n 
-0000002562 00000 n 
+0000002531 00000 n 
-0000002674 00000 n 
+0000002643 00000 n 
-0000002784 00000 n 
+0000002753 00000 n 
-0000002895 00000 n 
+0000002864 00000 n 
-0000003003 00000 n 
+0000002972 00000 n 
 trailer
 <<
 /Size 14
@@ -107,5 +107,5 @@ trailer
 /Info 4 0 R
 >>
 startxref
-3355
+3324
 %%EOF

lucene/docs/lucene-contrib/index.html

@@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="../api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="../api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
 <a href="../api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
@@ -303,9 +300,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="#spellchecker">spellchecker</a>
 </li>
 <li>
-<a href="#surround">surround</a>
-</li>
-<li>
 <a href="#swing">swing</a>
 </li>
 <li>
@@ -441,22 +435,17 @@ document.write("Last Published: " + document.lastModified);
 <p>Provides tools for spellchecking and suggestions with Lucene.</p>
 <p>See <a href="../api/contrib-spellchecker/index.html">spellchecker javadoc</a>
 </p>
-<a name="N10116"></a><a name="surround"></a>
+<a name="N10116"></a><a name="swing"></a>
-<h3 class="boxed">surround</h3>
-<p>A QueryParser that supports the Span family of queries as well as pre and infix notation.</p>
-<p>See <a href="../api/contrib-surround/index.html">surround javadoc</a>
-</p>
-<a name="N10125"></a><a name="swing"></a>
 <h3 class="boxed">swing</h3>
 <p>Swing components designed to integrate with Lucene.</p>
 <p>See <a href="../api/contrib-swing/index.html">swing javadoc</a>
 </p>
-<a name="N10134"></a><a name="wordnet"></a>
+<a name="N10125"></a><a name="wordnet"></a>
 <h3 class="boxed">wordnet</h3>
 <p>Tools to help utilize wordnet synonyms with Lucene</p>
 <p>See <a href="../api/contrib-wordnet/index.html">wordnet javadoc</a>
 </p>
-<a name="N10143"></a><a name="xml-query-parser"></a>
+<a name="N10134"></a><a name="xml-query-parser"></a>
 <h3 class="boxed">xml-query-parser</h3>
 <p>A QueryParser that can read queries written in an XML format.</p>
 <p>See <a href="../api/contrib-wordnet/index.html">xml-query-parser javadoc</a>

lucene/docs/lucene-contrib/index.pdf

@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 968 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 941 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gb!$G9lldX&;KZO$6>[i<IGuRN_QB2FF*29>MB7rEm+Z=,B-TUf68NM=F6o1/lhCcCmeSN%moa!kV`f4ge/hXb"/rMR/JE77NMY,(q_h"m;GkCW/M@PmE,+Qa$X2"oF4r]3.Z.O0?6E2W4i3)WOo%q9_iWpIZj%RN#WN13qC7/.TVeWW#mY8+"GlrZDUaJG5PZ3GIm4rTg(t*]BkS7@67GYL2l)ma3ilrg83inOe<e:+E/q/rt#!.&h<8\P*MD&\(=kV8];R<:;RB1eO=jlkLJgX2Q]4!1G]hE&&!de/'8'.1!bg<o=FNeHc_h_jkO8_d:D1$ZeRP>6.a(nT:74#o_.EZko5.=<h]USS-MOR)iopPqQLX8`0jiTF%:&r1TKTJ;>dSEgf<k3[./GC/@-=LC]ST*OH;p&bUC1VNpgSc0,O9_DHiV9mWb<B`Kt`%JY89RV`14!Fi\o?Z&"es,\5"Z1Q&Ar79.'cfli'"m(oGCi%g.OTV]!Q3.A(*NB)83#NdF?IX=]n*i4h%8`[f6UP+'K(>aULTqRcAp/iSP&hGAMA^e*3;58g-UGf#;DH`Y>mRgMU*0XA^:COsXPVG@=arE-.Yf*C3D+"27Ne_=T!"FuJUQ4kY8*6IAJq<UMl1_tE!+tah$bHs>k%Rb+R;kQ?aIud;hP&9<]pp"2-'GNI9BN0M6@7'Z"jb];PJ7iLVch#X!!Z)Q'PuKa3FJ)u*fXlo[9$-Z33hSdi$a_@9j9?-N"Xj2Z@;Fq?XHg5"jl0`OG$>T0aE[N?5g/L[I4@c9*J8caP\D-Jk`j2LPujpn#NiHctcDlg3RVh:N/);I`d7T\$+sQfJne'%(=jVBu.)S`+ZFc^';&i5>Vd?L!`<,TgILb>Uc+2MPT/o?]"6?_o^O9b&O'BLJWA7$-&^EQ/TEolb15Tc*hu@%Jo2Cl3%fTVPYcDWlBc4]1$QGQi39-ck640i$0@o~>
+Gb!$G9lldX&;KZO$6>[i<IGtja!T7T3k]XXXmL[I3G*lZ!Sl3'oj*Cket+=P9,0Q1>@pt-_kL3c\kRefpQC>o16QMWAj>j:OiMtc"tr^aqjS'5Pr^8VSpXmn4Cn95glSq"@Q:jnEm.73g?X6\\uVm7.3<BJ:Qg0]OX%_M8%og87>c,bqr,uiTlaQgHYQQ!a6u$1B<&*TqGW'RbPjI7[R8#J)"miI*%e=f>rmue$2PeM!nX1Hs0-u!VU?M/=c#^lHd.h?<1MA#,eT4<?,UAU<hB;XVY,^kB')GSd#4:%U243Qo?8UHX#eS6QeX<"c5e7#`WN]?ji6g$VTO,[XEjA.Df9NZ]E&j[71[2m4>;ZMGau_(LFokGB5T`UXkBXc<6]KZpg*F"/)f<P`p3f4b]49#"jEZ*6Diq6;1+KJhbC@/-hROY]/U>Vd6'@F0<2G_5qB7dCcp&0OS?h*&Mm?VaPqJW'OMpQZ?RbIFphC(KBjiA16.Hh-*uMhIW+q&F7N'9bW8mUHV4VcV2V`PjObZOKRM81hLT%-@4g%'=<qJk/1,CKe$dItUP.g*BhjGbBmhJ@>I&S7LoeI=@doYXN:CU\k(lld,qb-p)qpW=)To\m)BNfd*TPV/bX&"W#3Ku>h?1(aR)OapFs;mhe#(>Ej+R,f_.ltrLH[6_Eb]QZ8B.MYRA34XmD5#54B(E=rarMhZ]*`@%$hMTfX)`A^aPn).B5o<7D=rP"jl0VObc`$0aE[N?Ku-$);e5VDk>841Q[8aHSL;7&q9;m[9KcaSsCmB4CqmXR&nT>nl$Gh]1joegVd5_,Oge4K*UgA72eP%_:RVrDN9S4\hG%\-rakuN%7=1X[iLom$7@K5+EPgF>[r^r=FjI/]!eq>:JE"]A?Ze<c>U:X?jVVf>hV.$<^FEV3U/pE+?AUD;_`"1)i9Krrp@bnGW~>
 endstream
 endobj
 6 0 obj
@@ -41,7 +41,6 @@ endobj
 40 0 R
 42 0 R
 44 0 R
-46 0 R
 ]
 endobj
 8 0 obj
@@ -207,7 +206,7 @@ endobj
 40 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 268.466 171.16 256.466 ]
+/Rect [ 108.0 268.466 157.168 256.466 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 41 0 R
@@ -217,7 +216,7 @@ endobj
 42 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 250.266 157.168 238.266 ]
+/Rect [ 108.0 250.266 167.824 238.266 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 43 0 R
@@ -227,7 +226,7 @@ endobj
 44 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 232.066 167.824 220.066 ]
+/Rect [ 108.0 232.066 211.804 220.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 45 0 R
@@ -235,22 +234,27 @@ endobj
 >>
 endobj
 46 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 108.0 213.866 211.804 201.866 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 47 0 R
-/H /I
->>
-endobj
-48 0 obj
 << /Length 1855 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
 Gau0DgMZ%0&:O:S#lBhd#qbGFm8Go;[U!\cmD^_S1ju#C3p'T]?&FN'IXO`\OXrM4g*/dudN[jpB$SWa_d[eqR/Jlu8Iu*'D%rTPV8]?JL4Nd3#@mVNY9/a,BG/e`>R16iDXm[g\qJdtTt%@trA+8SR*BPtK,+tK<\r3LR)'7$7ucf4A&I>uZ.KtES5F<E>[$5HB:ndOVn?5@b>^!s4?*6r(8!(YBmJCP=pNe*J`emo3+5(N)tqd#%;JmXoMr+DEVrF]`L9T'n;0<6DREF6)io*M_3.K8WsJ?/,0eL'h:K>>Rr$+hIdmbtRuR<OPuLtjP36_$PKJ<26m-K\0Vrklhc_fY<c.5#j;gnRV0oj=^VJGTA>;BkjGkJ49<$P,Pf/#B?L-'2.ZRTbXjELem)1_%QP/m[Sq'GP_hV:)ThEV`lMXmu#?&.@&eAc;-"<,RcN'2#o*I#@qA=f9m,.J2?u<+c',ms^;FC7)('g',[Db*VhAp:[\bR8g^S@2ND-==O?Im#5C_eOh,]YQd#P@obNoT&$N>gm^`2ek!BcHc]ZhO-Fo348Ihl]V/kuNT-/^&"'5NDnRa\a'l#iR_>KZndd#_ee`@nJsq?^?_o[?,)l?I[3mJP/edbjLYg)N-pQLgD,DeMcQO_D+h2JR*ac!ST!%)iLdt%YY#q`,lj)[>@qNWVd's11c8*<1[j0jl7]#lu*6HT&ahD-.*OC7m%X[51a8,m,b9=FeN3%K3ra/8G?*HfL1ik8Y5VQ#'Wa\bfcZ@Ys`Va/s1V-VV,RX3*K`Bp_/`'5`t?rf^#m1:8[N&L9[eh0#j3Kbb_7=6+i0qlaq!t+5G>l#dsdNXAgAG;]bH["%p?dG_sr*6HLn'5*%A$#c0tS-`gC\#GqhB'N#>KNua^(VYQ=D7h#'lakD1p>F49#4]?@Oa,=Z:'T)&F>>ZoZI2q_%1-Vk%'=PHaep@(>52V9X+:OdSk!Z5)GuCYfq$j^#Iq[?A`kq2j;8gOSJ19\lWa2"UNZ?ej'E0[@h@Q4`[(BWoiT"9`Y.jr#L?L!qd7P[tJr)Ji]QZbeXnUcCLolunE^7hlC6K'?qr?tdb/TTW'0*6VL)(-.'F3'Uip^F,2D]/J54A)I[[)2jU4QrZN[kJ)"clckAK,`IV9c('4NbchckZ:]X;i@1rPR0PO#M7ri=W1p3XArg..O?Op4.E&:S?-q(D5Eng[tJNk3*S8B9F\.+b![fL'k[U@_1P\R0bG[E\&/@IG;0a<3F=jHV?0gP]tAT[]3JD?F!D,_7X[Hjoc3bs)LfA@72ub&[e!_?$eOZgEV-)D:p3,K4[Zo@kr]1kkX[bl8]iCD<_^sg?i9a&a)#MZ#'P(csa,7KBT<INCr"nDKmW8S%Y6W<[@X#Xr"^2_fcu^GA?tI+O'G/TLXX`K)*H\A*JYOenc):a"mK%Z*lb%m^#^0g4J8cHJf!CX,"*S7+lTsid.MSCtU//Sl5s-lK'24:`A?9)(?'?aE.Y:T\Fm`!X61#Y`UjE7K9!!cl`HY:Ig'670d<[B\3TM,n(g[/Q8-19W/K4$3XL)L$X:(.+IpH%os[aO?t/'U6:NF>)+c'[$8[3d^@^##4`q?0U(FeTd<ECW7<<BMd`=C^CG7]N^MUA,QLmkCmjpm"1=>MFT\.F"Q1il)$_i'I*_9_->J6W`0OY7>iY]HOIh06DRV6*H=5ga@e$%qdbFsZg_rMC5[jeHWs1jN<7;$Dm(bNr6JG\eTBg*jQ"M6rWEDXiKWO:QCtcQDV613:iYm@M#1J<^GL,CJWUdcrCqbHS\s6iq?FQqeVck3UQ0UNBdee@CX*/Al%ZhHg7*r2R(oeA-]<Q\,Tso@/0rgE:!"oZS'*~>
 endstream
 endobj
+47 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 612 792 ]
+/Resources 3 0 R
+/Contents 46 0 R
+>>
+endobj
+48 0 obj
+<< /Length 1335 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gau1.968iG&:j6G'g12+'nSBdU[?QF3phli.&WpILkI$3I&J0%fDYAJ^'m7B-W3j%8!X-q\VpF[`S8r&kLJS\"UVX,H+/Sa_L[parc?Kc?4%Sq&X'rn@(l?>\G`9)-&=U+^UY-]Tl=GJ=l<Tl_]K0h5s^XO4BN?7+'5)A^'=-,.9C:j-G)U4YBK4bor-:g\ISTI<kf,F?kgQlAjQ19$0f/-Nh[^NgL1$?a*5@52kqdilm<]\_*#oYJ?Zk1heGb\8EaG=5oa#He$Wt_mj(^@no.LI.H3.$ns*X8Qlq$e#?*ctWNNA?XDIO[W$\Q;]D7[K41i)Sk%h,lmDdmb1g9-X&eRTDdcA7.:3AQ(6=Rm7@nu205_+`:iZK3N]55+&iR;Hr$Uasr)Y8$$#T@hU)RS@'Q*kMrU>"8W8Zq@4A[\S^&PKHNCNg0:,WfoL:/Z>l?-UM;%WJ3/2K.m@OE$*;AA&6$F4oYgo-it.SPP`1+Gf,I><9-tUn+@+AW.g.?HS[$neB5O8Ar(6J[BcRpXq15>eL@K;t^hR[hnJ4@UGD3D!'a;F."=SWkVfb>d#)FQ!=2jiY[*h)5>TZ<13RfH8.)MpY]S)]AH\e3>ta7WZdt*ks\R4jarVJ+b))sdj'^g'FGkM+t7UYWN7%=2OS<%3ZCsJieU"M\KSpYN5BgU)]s!I?`mD24Tqb`a%?&sEXI[VeN.n!Y\;jWhl,8PgS#nf"_=MNU7hO'AouI#k4s7%8[N22\+(@s'-S";8a<Bkqf"Q%E#=dp:&"MCiVE=jEPdN",5R<`cS,W";%bldP.+#Sc%ZI_,:&X9\$+.L+Mu-9G2n*LqgG%^#8ubrLW]5RaU+!bg-h9R2REfkB)=JNGiZkDKr`"O:T=J,dUf#8qC#o))2]g%4j'P'/r,d6a@>L`e+$<?\&-oT!fe;:KeE57Qm5:5hMpaPKOIqO@gDl7>4$@6%2<l&D;ofAL:#4u'"l^0ckp#(DLP>=HAmp%+YaD)P?ndFiA:I_3[BAZD-_9F*?npdMtobr?l)U>-aRcbZ6Ms$(QID?l\Ma*__B3bX0M(iR7oQ"O5/-c1IUE:.Ws:Q%6T8@rKE-dakP=G`ZJB$Sfa2r[;k[-H?'0LB\XjT>-smIo7#1/4nIg-"q_"#iB]hM2ka0@frJXSFI95j:f@%U03cV<h/HG\NQJhWTC-!'E%F\QiKTqi^u!Jk9Jjgf)e4o&E&@)ND1-!>3?Z-?8dINt_@U260+##I=Gid;eT?2<\Z>GMVAjOPk=,>W7Kp%IMQsOhe``EMiHVA0J#YEOP;:G/IFXWt?W3(3QKNG=l`Qed#5jNC7FlJY!@-*U&-~>
+endstream
+endobj
 49 0 obj
 << /Type /Page
 /Parent 1 0 R
@@ -260,10 +264,10 @@ endobj
 >>
 endobj
 50 0 obj
-<< /Length 1335 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1262 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gau1.968iG&:j6G'g12+'nSBdU[?QF3phli.&WpILkI$3I&J0%fDYAJ^'m7B-W3j%8!X-q\VpF[`S8r&kLJS\"UVX,H+/Sa_L[parc?Kc?4%Sq&X'rn@(l?>\G`9)-&=U+^UY-]Tl=GJ=l<Tl_]K0h5s^XO4BN?7+'5)A^'=-,.9C:j-G)U4YBK4bor-:g\ISTI<kf,F?kgQlAjQ19$0f/-Nh[^NgL1$?a*5@52kqdilm<]\_*#oYJ?Zk1heGb\8EaG=5oa#He$Wt_mj(^@no.LI.H3.$ns*X8Qlq$e#?*ctWNNA?XDIO[W$\Q;]D7[K41i)Sk%h,lmDdmb1g9-X&eRTDdcA7.:3AQ(6=Rm7@nu205_+`:iZK3N]55+&iR;Hr$Uasr)Y8$$#T@hU)RS@'Q*kMrU>"8W8Zq@4A[\S^&PKHNCNg0:,WfoL:/Z>l?-UM;%WJ3/2K.m@OE$*;AA&6$F4oYgo-it.SPP`1+Gf,I><9-tUn+@+AW.g.?HS[$neB5O8Ar(6J[BcRpXq15>eL@K;t^hR[hnJ4@UGD3D!'a;F."=SWkVfb>d#)FQ!=2jiY[*h)5>TZ<13RfH8.)MpY]S)]AH\e3>ta7WZdt*ks\R4jarVJ+b))sdj'^g'FGkM+t7UYWN7%=2OS<%3ZCsJieU"M\KSpYN5BgU)]s!I?`mD24Tqb`a%?&sEXI[VeN.n!Y\;jWhl,8PgS#nf"_=MNU7hO'AouI#k4s7%8[N22\+(@s'-S";8a<Bkqf"Q%E#=dp:&"MCiVE=jEPdN",5R<`cS,W";%bldP.+#Sc%ZI_,:&X9\$+.L+Mu-9G2n*LqgG%^#8ubrLW]5RaU+!bg-h9R2REfkB)=JNGiZkDKr`"O:T=J,dUf#8qC#o))2]g%4j'P'/r,d6a@>L`e+$<?\&-oT!fe;:KeE57Qm5:5hMpaPKOIqO@gDl7>4$@6%2<l&D;ofAL:#4u'"l^0ckp#(DLP>=HAmp%+YaD)P?ndFiA:I_3[BAZD-_9F*?npdMtobr?l)U>-aRcbZ6Ms$(QID?l\Ma*__B3bX0M(iR7oQ"O5/-c1IUE:.Ws:Q%6T8@rKE-dakP=G`ZJB$Sfa2r[;k[-H?'0LB\XjT>-smIo7#1/4nIg-"q_"#iB]hM2ka0@frJXSFI95j:f@%U03cV<h/HG\NQJhWTC-!'E%F\QiKTqi^u!Jk9Jjgf)e4o&E&@)ND1-!>3?Z-?8dINt_@U260+##I=Gid;eT?2<\Z>GMVAjOPk=,>W7Kp%IMQsOhe``EMiHVA0J#YEOP;:G/IFXWt?W3(3QKNG=l`Qed#5jNC7FlJY!@-*U&-~>
+Gau1.9lo&I&;KZM'f[Nr21eVQ*"u,=Br@Ln@boHR-k`9$;M7Ag<h3UT,q0IW.b[oN*fhU!7:KW:cXHp'=Kd0[YJ.+e.cLEf.OCIT.#Qq_aStdj'GS`XU.1j$lLX;YZO[=rKm3:'4,GA<0@nkm)'1!k8(%+)A2kb7XnV&F)neI8C9MBA=`*Ht/\5B.Li9T1E.KmDC@PO#-X-Or2Ai>o9S;.Ojdt/k2L!PUfgAf-r%u>G)hO81+WU1DK$sX(Ou,J'.FI^Q?Tt45r$fV41k-u/OZ[S*7[/rDKRsM49A(_\@Mm%?r77k0nW5W1C4)_+m5!d*MKgHo6,[?pK=!BWQqBE:IIC(blKEiW\m3eN9TKQ/AQ'SSqoO8+h!'4LOiV@Q;]]/To9-JA0Yfn*2VWp)F47'\,p8lmdqNQhHc_o*KPij:O2"\S?YH%X+bP]1Y0+CcZ6nICX)ctj[oq`TX#f!7^>uH)B!8r[#$n<;.3sp$nNm*X`UJ1b/=FGUX/D:#ZD8*;9BSWRB8*F6i_)^6ia0t>\jqi[U]Lp#58J69khaml\r_-IYVj[NH!eK4@ZK+unp`=r6iM<56?8HZ\/p24n0!R""PcAkW4fHNOau@&$ULsC^u25SA&d7QCYN6&HV7eFWe65@<\:eKUUFL<q"";8QOsgKDFtolR\oq-KQoglg@T\X4=8FEpe45'K\?O8Kt_jL&FkS81eFi=`'oPpb-"2J;Gc,Mc8G6;GH&rkc0F(?HBYbZgSJ-'=C%70l#E"s5,enQbr33Y5*B=<S:!=\BF.edn72Mp<>Fk8q;5!7eI5b1Qe)j\E=?XYe6,!nk!9e,69#B*ZoBE@5V*nPg9)u,HZn0Oks*QE)4W\78_b1ShicTda`ms^aT"Pi_2/o8\qt(\o/mM;/V0](-4.:&,S<".:At"f(a-rFra9JC?lfHdXNOc^Q^=bUXX]ga/p>MfW6k`kMHNM9/X5qgERBSp$1)tC'XgGuMA]L^iB!F)W0LWk7c@GaZ#iU\-tY+57QJAFTA&s!>\?iKDH9j8]=OZ\46)e+EW=7/43cpD*CC,IQmYXZCIoM>(lY3U[.rK"Z@"bV6bc1PM"s-uI-Ke()fAAe)ncQ6K9`2RE))=hPt!Hk]ntLc7!^IaJioWDPkJjirfraW52f5"Oq@ap%?"Y5GJ=i+he"'h&ciY0*KP-`iN^elDD3tDHK5!4P.HG]'"M\(11pkTZ\J83D!`rm]IS3'X,H585!N(J/f8W<?EE($rh'Vb]_`L;H@:J~>
 endstream
 endobj
 51 0 obj
@@ -275,10 +279,10 @@ endobj
 >>
 endobj
 52 0 obj
-<< /Length 1303 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 568 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gau0CgQ(#H&:O:Sn1asT%'R6)-AucgU'6^]hqC9@1+fht,t4QZh0scBOsQ8t.p3ZG$suI:B85T>)3-q_=$Nih?WRs'nG]pi#pq'X,5;kXs*Z6u`A4<hd:fl_]__-R"bL1A4oOe7,0Ji`HFG*9+p'ET`eBT7L^:@OT\nUn6XAo.0!2FV.bhGrNX[&eW,h24>?++MhkE?^qWBYIS7435HdpcO3LD^Get;5!D6*$a@b;.+8X^3NqJSZ6s"-g2+OoIcq<"$)kd5h3EA['T$;;]U&;Uq[,6D;j"JDT-9UK:.ifa5nl/oNW9rf3td/\?XE\'XA1F43$bJ4?kAO8)9F:A''Ke2oE)8C9]0(i@2cC?YZm#\h$gl:@NA:'@DA[B)D\@$Z:8G`f*rcWIm>Bhj&)LY0Y&qlWI>Pm3Rr95c[9kSnS45KZuo+E&f3,@7`b&a>HCi?E#D!+#p/,*87C/amVGHItWk+;[IMu&]*icn'Zcu1%]gW<PQM,U=Mf*b_Z$-pt%aQuUAVIt9J`$FaaH:@Q66Ae`M!SNMXhJQ$uX"#a?SM'9/k$6aZBb3#>D"@LUL;;pN:P"TI[O&)S5R:I_U6u)N;:+MoAb@5LJkIWt]p\s+=+qV=hA<2/K=^bK@BYUC=^A(pgW\&IY?QDMor#tI&O:4@*DeS0ol^c6KYk1^oaLAX5]>X<6c*?3Xe@?=l<U'=7gu:eE\0^bUfaM\C5P=noPS:s"23Mrg7$Tm1@p%QW)e8CFB^WRPkdcA3(krtZ3o6R@CRJ/,f.nPq0Mn1-"&`s-Nip];8B/srUl/VR_bo_nlc6#*()<M3pW]@H8=6:65YFm>+A4nLfbLkg+L]oHT#bqm!kd/171&L.Ch5YI7S7r-K>]R,Q@k8$mo"7l6\\>T?jZSWih+kM+a:FP-D!t,Q^J-oO@7"32bEBZ@5Dg%2H9-2a,`loMhInVXS1TIu8PlKINO<+RS`jg7NBe"dsCD]SWblm.,Zo'0)a6!(+BCOP`e`1u\L"]3[!%c=E?#=Y$b\Q/b\G$UUO@d7#UW68FGOCP5#7_i13_MT94'^0,TWWtLl+`t#HZPF"?*PN4N1Fl"OYGfkaUrpG?2"9e*<,ljtkN_g/R:j/l5pU/.5%75tFj,!Mdq0_GpHOnn5V/=F'i#*XWEIcFjSr0"F-@>6*'6s.39aU(SKVPp#G&!Ep&*!t7S!8liK2u(_j+R;N9)HmL8X'M5n7a)]YNk;jjSPW%j.o35G:';q(a5$JegGD@_ZO\Y+01qqWlD[Ad*$ngSU&mjO/"GJDEV2k_g'U6m'-@'hoM3q~>
+GasId?#SI?'Rf_Z\<#lADR^MlIU&qMdaUkUlA%r8+)!tR:PkVTVd9?$n<^q+X3.a,!1.ada'9D%f-5K4#e'`G:3)'tZ7PTS+kuuY:GJ%^3"(eh?#oc*H;;PVeVg7,idRWS,ciM*rZUJ5--(rN-k>`^G&Qc%0CO(P^!pq*fd7.*1!aH;Y:e`6MJp04L-!p;Ksh^aD(Abl!SeGST)<R;KBe\r*`\Ch2EBl.WIWE'pJ`s3W/12:#t\V<q=h+c5Fnp'SKEhQ=Vn-03p-7&:a<U1-pI-:b0:2j8Nlg7^jF[Rh@>e1@'_YOIk+G$i2g&de1**<.5KeG9k0skA^le8q>'t9J5,D@VSV68'AZPBUf$k3kI6Jb+8B<e6$ngpG=;7cM!'C88$golRk'3'auIU_c7<*nLZY3\\>lULQ&h,9c%jp@&Q>XhO;gP>gXnDoD"OmM>bG,M`*9R=P0)p<`.iVjRO]PVgHneISk7;GT6B_oW]n/.EkCX(<k@tj2jY3iB.OFh(nBhUjA^p'lV6t[>Vrafcdg`+AR/_D[bh>:EM"FkI=BLcNPW,SE*`F(~>
 endstream
 endobj
 53 0 obj
@@ -289,209 +293,186 @@ endobj
 /Contents 52 0 R
 >>
 endobj
-54 0 obj
-<< /Length 678 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gatm8?#Q2d'Rf.Gpp#7'lYC<Q*ntG/1j)^.nh=e4K,Ye<+uj^9Zg?;iHmCUcU2JD4!$C_'3VON29br/uU6c-^iQf%`-((>N8_fU$DEJ"+J0`3NoGg"`2t%MY^bhF,2<P7DH]]m)dMEL>!#c2)`<fs$>G85::Kh,:npZj^c)tdg%tCNZQ(,`=qMqkBK*$X9.S5T13s4^7S>6c@>G1R@5Mr/3F%ii$2T[Z3nO0cM&.be=MCHLGkb&bH8F/e5N6N<tL*ENR3?#`PJWs$Uc58F8,_0A7"(c(<^%%>hn`*O!CQGo@<EHs-$$AarpPin\X'i>@eWq94D\p"4@lG&i>S7GM7?cB\OSo.:GX?B9?2XT`\1=474[tbBdJ[>#Z^7f&qq50+NOEIUj=W<YZ@C,\;qX#dE*mtKa,]b"UcaB8WkcH)C-8_(jW8Q%.ieh-X1$Qpr$iP=l[8MMn%mH)Q"oj2Ukun/62)Yh[uR#>r+\uhF=-tNLi=44*RhN)X$t\p/d+p<6N-<[*mNQ2E,1on<mQuSk/-H[^i^jrQs7$3]%E=(f\iRFP[Q"1M%?VRP4>22+QEtB9.CbhIWN:b:(rX5F5;j`bcP%:D,lgKa?k'AIA7cEU4ad5AYV%E#b:2MP?G=UAV2@OZYaa5<i3]!=^?C$F)M,]?%/t<a54>`n/Yom~>
-endstream
-endobj
 55 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 54 0 R
->>
-endobj
-57 0 obj
 <<
  /Title (\376\377\0\61\0\40\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\103\0\157\0\156\0\164\0\162\0\151\0\142)
- /Parent 56 0 R
+ /Parent 54 0 R
- /First 58 0 R
+ /First 56 0 R
- /Last 76 0 R
+ /Last 73 0 R
- /Count -19
+ /Count -18
  /A 9 0 R
 >> endobj
+56 0 obj
+<<
+ /Title (\376\377\0\61\0\56\0\61\0\40\0\141\0\156\0\141\0\154\0\171\0\172\0\145\0\162\0\163)
+ /Parent 55 0 R
+ /Next 57 0 R
+ /A 11 0 R
+>> endobj
+57 0 obj
+<<
+ /Title (\376\377\0\61\0\56\0\62\0\40\0\141\0\156\0\164)
+ /Parent 55 0 R
+ /Prev 56 0 R
+ /Next 58 0 R
+ /A 13 0 R
+>> endobj
 58 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\40\0\141\0\156\0\141\0\154\0\171\0\172\0\145\0\162\0\163)
+ /Title (\376\377\0\61\0\56\0\63\0\40\0\142\0\145\0\156\0\143\0\150\0\155\0\141\0\162\0\153)
- /Parent 57 0 R
+ /Parent 55 0 R
+ /Prev 57 0 R
  /Next 59 0 R
- /A 11 0 R
+ /A 15 0 R
 >> endobj
 59 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\62\0\40\0\141\0\156\0\164)
+ /Title (\376\377\0\61\0\56\0\64\0\40\0\144\0\142)
- /Parent 57 0 R
+ /Parent 55 0 R
  /Prev 58 0 R
  /Next 60 0 R
- /A 13 0 R
+ /A 17 0 R
 >> endobj
 60 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\63\0\40\0\142\0\145\0\156\0\143\0\150\0\155\0\141\0\162\0\153)
+ /Title (\376\377\0\61\0\56\0\65\0\40\0\150\0\151\0\147\0\150\0\154\0\151\0\147\0\150\0\164\0\145\0\162)
- /Parent 57 0 R
+ /Parent 55 0 R
  /Prev 59 0 R
  /Next 61 0 R
- /A 15 0 R
+ /A 19 0 R
 >> endobj
 61 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\64\0\40\0\144\0\142)
+ /Title (\376\377\0\61\0\56\0\66\0\40\0\151\0\143\0\165)
- /Parent 57 0 R
+ /Parent 55 0 R
  /Prev 60 0 R
  /Next 62 0 R
- /A 17 0 R
+ /A 21 0 R
 >> endobj
 62 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\65\0\40\0\150\0\151\0\147\0\150\0\154\0\151\0\147\0\150\0\164\0\145\0\162)
+ /Title (\376\377\0\61\0\56\0\67\0\40\0\151\0\156\0\163\0\164\0\141\0\156\0\164\0\151\0\141\0\164\0\145\0\144)
- /Parent 57 0 R
+ /Parent 55 0 R
  /Prev 61 0 R
  /Next 63 0 R
- /A 19 0 R
+ /A 23 0 R
 >> endobj
 63 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\66\0\40\0\151\0\143\0\165)
+ /Title (\376\377\0\61\0\56\0\70\0\40\0\154\0\165\0\143\0\154\0\151)
- /Parent 57 0 R
+ /Parent 55 0 R
  /Prev 62 0 R
  /Next 64 0 R
- /A 21 0 R
+ /A 25 0 R
 >> endobj
 64 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\67\0\40\0\151\0\156\0\163\0\164\0\141\0\156\0\164\0\151\0\141\0\164\0\145\0\144)
+ /Title (\376\377\0\61\0\56\0\71\0\40\0\155\0\145\0\155\0\157\0\162\0\171)
- /Parent 57 0 R
+ /Parent 55 0 R
  /Prev 63 0 R
  /Next 65 0 R
- /A 23 0 R
+ /A 27 0 R
 >> endobj
 65 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\70\0\40\0\154\0\165\0\143\0\154\0\151)
+ /Title (\376\377\0\61\0\56\0\61\0\60\0\40\0\155\0\151\0\163\0\143)
- /Parent 57 0 R
+ /Parent 55 0 R
  /Prev 64 0 R
  /Next 66 0 R
- /A 25 0 R
+ /A 29 0 R
 >> endobj
 66 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\71\0\40\0\155\0\145\0\155\0\157\0\162\0\171)
+ /Title (\376\377\0\61\0\56\0\61\0\61\0\40\0\161\0\165\0\145\0\162\0\171\0\160\0\141\0\162\0\163\0\145\0\162)
- /Parent 57 0 R
+ /Parent 55 0 R
  /Prev 65 0 R
  /Next 67 0 R
- /A 27 0 R
+ /A 31 0 R
 >> endobj
 67 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\60\0\40\0\155\0\151\0\163\0\143)
+ /Title (\376\377\0\61\0\56\0\61\0\62\0\40\0\161\0\165\0\145\0\162\0\151\0\145\0\163)
- /Parent 57 0 R
+ /Parent 55 0 R
  /Prev 66 0 R
  /Next 68 0 R
- /A 29 0 R
+ /A 33 0 R
 >> endobj
 68 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\61\0\40\0\161\0\165\0\145\0\162\0\171\0\160\0\141\0\162\0\163\0\145\0\162)
+ /Title (\376\377\0\61\0\56\0\61\0\63\0\40\0\162\0\145\0\155\0\157\0\164\0\145)
- /Parent 57 0 R
+ /Parent 55 0 R
  /Prev 67 0 R
  /Next 69 0 R
- /A 31 0 R
+ /A 35 0 R
 >> endobj
 69 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\62\0\40\0\161\0\165\0\145\0\162\0\151\0\145\0\163)
+ /Title (\376\377\0\61\0\56\0\61\0\64\0\40\0\163\0\160\0\141\0\164\0\151\0\141\0\154)
- /Parent 57 0 R
+ /Parent 55 0 R
  /Prev 68 0 R
  /Next 70 0 R
- /A 33 0 R
+ /A 37 0 R
 >> endobj
 70 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\63\0\40\0\162\0\145\0\155\0\157\0\164\0\145)
+ /Title (\376\377\0\61\0\56\0\61\0\65\0\40\0\163\0\160\0\145\0\154\0\154\0\143\0\150\0\145\0\143\0\153\0\145\0\162)
- /Parent 57 0 R
+ /Parent 55 0 R
  /Prev 69 0 R
  /Next 71 0 R
- /A 35 0 R
+ /A 39 0 R
 >> endobj
 71 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\64\0\40\0\163\0\160\0\141\0\164\0\151\0\141\0\154)
+ /Title (\376\377\0\61\0\56\0\61\0\66\0\40\0\163\0\167\0\151\0\156\0\147)
- /Parent 57 0 R
+ /Parent 55 0 R
  /Prev 70 0 R
  /Next 72 0 R
- /A 37 0 R
+ /A 41 0 R
 >> endobj
 72 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\65\0\40\0\163\0\160\0\145\0\154\0\154\0\143\0\150\0\145\0\143\0\153\0\145\0\162)
+ /Title (\376\377\0\61\0\56\0\61\0\67\0\40\0\167\0\157\0\162\0\144\0\156\0\145\0\164)
- /Parent 57 0 R
+ /Parent 55 0 R
  /Prev 71 0 R
  /Next 73 0 R
- /A 39 0 R
+ /A 43 0 R
 >> endobj
 73 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\66\0\40\0\163\0\165\0\162\0\162\0\157\0\165\0\156\0\144)
+ /Title (\376\377\0\61\0\56\0\61\0\70\0\40\0\170\0\155\0\154\0\55\0\161\0\165\0\145\0\162\0\171\0\55\0\160\0\141\0\162\0\163\0\145\0\162)
- /Parent 57 0 R
+ /Parent 55 0 R
  /Prev 72 0 R
- /Next 74 0 R
- /A 41 0 R
->> endobj
-74 0 obj
-<<
- /Title (\376\377\0\61\0\56\0\61\0\67\0\40\0\163\0\167\0\151\0\156\0\147)
- /Parent 57 0 R
- /Prev 73 0 R
- /Next 75 0 R
- /A 43 0 R
->> endobj
-75 0 obj
-<<
- /Title (\376\377\0\61\0\56\0\61\0\70\0\40\0\167\0\157\0\162\0\144\0\156\0\145\0\164)
- /Parent 57 0 R
- /Prev 74 0 R
- /Next 76 0 R
  /A 45 0 R
 >> endobj
-76 0 obj
+74 0 obj
-<<
- /Title (\376\377\0\61\0\56\0\61\0\71\0\40\0\170\0\155\0\154\0\55\0\161\0\165\0\145\0\162\0\171\0\55\0\160\0\141\0\162\0\163\0\145\0\162)
- /Parent 57 0 R
- /Prev 75 0 R
- /A 47 0 R
->> endobj
-77 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-78 0 obj
+75 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-79 0 obj
+76 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-80 0 obj
+77 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-81 0 obj
+78 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F7
@@ -501,235 +482,226 @@ endobj
 1 0 obj
 << /Type /Pages
 /Count 5
-/Kids [6 0 R 49 0 R 51 0 R 53 0 R 55 0 R ] >>
+/Kids [6 0 R 47 0 R 49 0 R 51 0 R 53 0 R ] >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 1 0 R
- /Outlines 56 0 R
+ /Outlines 54 0 R
  /PageMode /UseOutlines
  >>
 endobj
 3 0 obj
 << 
-/Font << /F3 77 0 R /F5 78 0 R /F1 79 0 R /F2 80 0 R /F7 81 0 R >> 
+/Font << /F3 74 0 R /F5 75 0 R /F1 76 0 R /F2 77 0 R /F7 78 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
 9 0 obj
 <<
 /S /GoTo
-/D [49 0 R /XYZ 85.0 659.0 null]
+/D [47 0 R /XYZ 85.0 659.0 null]
 >>
 endobj
 11 0 obj
 <<
 /S /GoTo
-/D [49 0 R /XYZ 85.0 339.066 null]
+/D [47 0 R /XYZ 85.0 339.066 null]
 >>
 endobj
 13 0 obj
 <<
 /S /GoTo
-/D [49 0 R /XYZ 85.0 266.613 null]
+/D [47 0 R /XYZ 85.0 266.613 null]
 >>
 endobj
 15 0 obj
 <<
 /S /GoTo
-/D [49 0 R /XYZ 85.0 194.16 null]
+/D [47 0 R /XYZ 85.0 194.16 null]
 >>
 endobj
 17 0 obj
 <<
 /S /GoTo
-/D [51 0 R /XYZ 85.0 637.8 null]
+/D [49 0 R /XYZ 85.0 637.8 null]
 >>
 endobj
 19 0 obj
 <<
 /S /GoTo
-/D [51 0 R /XYZ 85.0 565.347 null]
+/D [49 0 R /XYZ 85.0 565.347 null]
 >>
 endobj
 21 0 obj
 <<
 /S /GoTo
-/D [51 0 R /XYZ 85.0 492.894 null]
+/D [49 0 R /XYZ 85.0 492.894 null]
 >>
 endobj
 23 0 obj
 <<
 /S /GoTo
-/D [51 0 R /XYZ 85.0 407.241 null]
+/D [49 0 R /XYZ 85.0 407.241 null]
 >>
 endobj
 25 0 obj
 <<
 /S /GoTo
-/D [51 0 R /XYZ 85.0 321.588 null]
+/D [49 0 R /XYZ 85.0 321.588 null]
 >>
 endobj
 27 0 obj
 <<
 /S /GoTo
-/D [51 0 R /XYZ 85.0 249.135 null]
+/D [49 0 R /XYZ 85.0 249.135 null]
 >>
 endobj
 29 0 obj
 <<
 /S /GoTo
-/D [51 0 R /XYZ 85.0 176.682 null]
+/D [49 0 R /XYZ 85.0 176.682 null]
 >>
 endobj
 31 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 616.6 null]
+/D [51 0 R /XYZ 85.0 616.6 null]
 >>
 endobj
 33 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 530.947 null]
+/D [51 0 R /XYZ 85.0 530.947 null]
 >>
 endobj
 35 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 458.494 null]
+/D [51 0 R /XYZ 85.0 458.494 null]
 >>
 endobj
 37 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 386.041 null]
+/D [51 0 R /XYZ 85.0 386.041 null]
 >>
 endobj
 39 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 313.588 null]
+/D [51 0 R /XYZ 85.0 313.588 null]
 >>
 endobj
 41 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 241.135 null]
+/D [51 0 R /XYZ 85.0 241.135 null]
 >>
 endobj
 43 0 obj
 <<
 /S /GoTo
-/D [53 0 R /XYZ 85.0 168.682 null]
+/D [51 0 R /XYZ 85.0 168.682 null]
 >>
 endobj
 45 0 obj
 <<
 /S /GoTo
-/D [55 0 R /XYZ 85.0 637.8 null]
+/D [53 0 R /XYZ 85.0 637.8 null]
 >>
 endobj
-47 0 obj
+54 0 obj
 <<
-/S /GoTo
+ /First 55 0 R
-/D [55 0 R /XYZ 85.0 565.347 null]
+ /Last 55 0 R
->>
-endobj
-56 0 obj
-<<
- /First 57 0 R
- /Last 57 0 R
 >> endobj
 xref
-0 82
+0 79
 0000000000 65535 f 
-0000013955 00000 n 
+0000013465 00000 n 
-0000014041 00000 n 
+0000013551 00000 n 
-0000014133 00000 n 
+0000013643 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000001130 00000 n 
+0000001103 00000 n 
-0000001250 00000 n 
+0000001223 00000 n 
-0000001408 00000 n 
+0000001374 00000 n 
-0000014256 00000 n 
+0000013766 00000 n 
-0000001543 00000 n 
+0000001509 00000 n 
-0000014319 00000 n 
+0000013829 00000 n 
-0000001680 00000 n 
+0000001646 00000 n 
-0000014385 00000 n 
+0000013895 00000 n 
-0000001817 00000 n 
+0000001783 00000 n 
-0000014451 00000 n 
+0000013961 00000 n 
-0000001954 00000 n 
+0000001920 00000 n 
-0000014516 00000 n 
+0000014026 00000 n 
-0000002089 00000 n 
+0000002055 00000 n 
-0000014580 00000 n 
+0000014090 00000 n 
-0000002226 00000 n 
+0000002192 00000 n 
-0000014646 00000 n 
+0000014156 00000 n 
-0000002363 00000 n 
+0000002329 00000 n 
-0000014712 00000 n 
+0000014222 00000 n 
-0000002500 00000 n 
+0000002466 00000 n 
-0000014778 00000 n 
+0000014288 00000 n 
-0000002637 00000 n 
+0000002603 00000 n 
-0000014844 00000 n 
+0000014354 00000 n 
-0000002774 00000 n 
+0000002740 00000 n 
-0000014910 00000 n 
+0000014420 00000 n 
-0000002911 00000 n 
+0000002877 00000 n 
-0000014976 00000 n 
+0000014486 00000 n 
-0000003047 00000 n 
+0000003013 00000 n 
-0000015040 00000 n 
+0000014550 00000 n 
-0000003184 00000 n 
+0000003150 00000 n 
-0000015106 00000 n 
+0000014616 00000 n 
-0000003321 00000 n 
+0000003287 00000 n 
-0000015172 00000 n 
+0000014682 00000 n 
-0000003458 00000 n 
+0000003424 00000 n 
-0000015238 00000 n 
+0000014748 00000 n 
-0000003595 00000 n 
+0000003561 00000 n 
-0000015304 00000 n 
+0000014814 00000 n 
-0000003731 00000 n 
+0000003698 00000 n 
-0000015370 00000 n 
+0000014880 00000 n 
-0000003868 00000 n 
+0000003835 00000 n 
-0000015436 00000 n 
+0000014946 00000 n 
-0000004005 00000 n 
+0000003972 00000 n 
-0000015500 00000 n 
+0000005920 00000 n 
-0000004142 00000 n 
+0000006028 00000 n 
-0000006090 00000 n 
+0000007456 00000 n 
-0000006198 00000 n 
+0000007564 00000 n 
-0000007626 00000 n 
+0000008919 00000 n 
-0000007734 00000 n 
+0000009027 00000 n 
-0000009130 00000 n 
+0000009687 00000 n 
-0000009238 00000 n 
+0000015010 00000 n 
-0000010008 00000 n 
+0000009795 00000 n 
-0000015566 00000 n 
+0000009996 00000 n 
-0000010116 00000 n 
+0000010152 00000 n 
-0000010317 00000 n 
+0000010286 00000 n 
-0000010473 00000 n 
+0000010456 00000 n 
-0000010607 00000 n 
+0000010584 00000 n 
-0000010777 00000 n 
+0000010766 00000 n 
-0000010905 00000 n 
+0000010900 00000 n 
-0000011087 00000 n 
+0000011088 00000 n 
-0000011221 00000 n 
+0000011234 00000 n 
-0000011409 00000 n 
+0000011386 00000 n 
-0000011555 00000 n 
+0000011531 00000 n 
-0000011707 00000 n 
+0000011718 00000 n 
-0000011852 00000 n 
+0000011881 00000 n 
-0000012039 00000 n 
+0000012038 00000 n 
-0000012202 00000 n 
+0000012201 00000 n 
-0000012359 00000 n 
+0000012394 00000 n 
-0000012522 00000 n 
+0000012545 00000 n 
-0000012715 00000 n 
+0000012708 00000 n 
-0000012884 00000 n 
+0000012909 00000 n 
-0000013035 00000 n 
+0000013022 00000 n 
-0000013198 00000 n 
+0000013132 00000 n 
-0000013399 00000 n 
+0000013240 00000 n 
-0000013512 00000 n 
+0000013356 00000 n 
-0000013622 00000 n 
-0000013730 00000 n 
-0000013846 00000 n 
 trailer
 <<
-/Size 82
+/Size 79
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-15617
+15061
 %%EOF

lucene/docs/queryparsersyntax.html

@@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">

lucene/docs/scoring.html

@@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">

lucene/docs/systemrequirements.html

@@ -184,9 +184,6 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-spellchecker/index.html">Spellchecker</a>
 </div>
 <div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">

lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml

@@ -124,12 +124,7 @@
             <section id="spellchecker"><title>spellchecker</title>
                 <p>Provides tools for spellchecking and suggestions with Lucene.</p>
                 <p>See <a href="../api/contrib-spellchecker/index.html">spellchecker javadoc</a></p>
-            </section>                
+            </section>                     
-  
-            <section id="surround"><title>surround</title>
-                <p>A QueryParser that supports the Span family of queries as well as pre and infix notation.</p>
-                <p>See <a href="../api/contrib-surround/index.html">surround javadoc</a></p>
-            </section>       
             
             <section id="swing"><title>swing</title>
                 <p>Swing components designed to integrate with Lucene.</p>

lucene/src/site/src/documentation/content/xdocs/site.xml

@@ -71,8 +71,7 @@ See http://forrest.apache.org/docs/linking.html for more info
 -->			
 		    <javadoc-contrib-remote label="Remote" href="ext:javadocs-contrib-remote"/>
 		    <javadoc-contrib-spatial label="Spatial" href="ext:javadocs-contrib-spatial"/>
-		    <javadoc-contrib-spellchecker label="Spellchecker" href="ext:javadocs-contrib-spellchecker"/>
+		    <javadoc-contrib-spellchecker label="Spellchecker" href="ext:javadocs-contrib-spellchecker"/>			
-		    <javadoc-contrib-surround label="Surround" href="ext:javadocs-contrib-surround"/>			
 		    <javadoc-contrib-swing label="Swing" href="ext:javadocs-contrib-swing"/>				    
 			<javadoc-contrib-wordnet label="Wordnet" href="ext:javadocs-contrib-wordnet"/>			
 		    <javadoc-contrib-xml-query-parser label="XML Query Parser" href="ext:javadocs-contrib-xml-query-parser"/>			
@@ -121,7 +120,6 @@ See http://forrest.apache.org/docs/linking.html for more info
 	<javadocs-contrib-similarity href="api/contrib-similarity/index.html"/>
 	<javadocs-contrib-spatial href="api/contrib-spatial/index.html"/>
 	<javadocs-contrib-spellchecker href="api/contrib-spellchecker/index.html"/>
-	<javadocs-contrib-surround href="api/contrib-surround/index.html"/>
 	<javadocs-contrib-swing href="api/contrib-swing/index.html"/>
 	<javadocs-contrib-wordnet href="api/contrib-wordnet/index.html"/>
 	<javadocs-contrib-xml-query-parser href="api/contrib-xml-query-parser/index.html"/>