lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mikemcc...@apache.org
Subject svn commit: r792542 [3/3] - in /lucene/java/trunk: ./ contrib/ contrib/fast-vector-highlighter/ contrib/fast-vector-highlighter/src/ contrib/fast-vector-highlighter/src/java/ contrib/fast-vector-highlighter/src/java/org/ contrib/fast-vector-highlighter...
Date Thu, 09 Jul 2009 13:06:52 GMT
Modified: lucene/java/trunk/docs/gettingstarted.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/gettingstarted.html?rev=792542&r1=792541&r2=792542&view=diff
==============================================================================
--- lucene/java/trunk/docs/gettingstarted.html (original)
+++ lucene/java/trunk/docs/gettingstarted.html Thu Jul  9 13:06:51 2009
@@ -52,7 +52,7 @@
     +-->
 <div class="searchbox">
 <form action="http://search.lucidimagination.com/p:lucene" method="get" class="roundtopsmall">
-<input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query"
type="text" value="Search the site with google">&nbsp; 
+<input onFocus="getBlank (this, 'Search the site with Lucene');" size="25" name="q" id="query"
type="text" value="Search the site with Lucene">&nbsp; 
                     <input name="Search" value="Search" type="submit">
 </form>
 <div style="position: relative; top: -5px; left: -10px">Powered by <a href="http://www.lucidimagination.com"
style="color: #033268">Lucid Imagination</a>
@@ -144,6 +144,9 @@
 <a href="api/contrib-collation/index.html">Collation</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">

Modified: lucene/java/trunk/docs/index.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/index.html?rev=792542&r1=792541&r2=792542&view=diff
==============================================================================
--- lucene/java/trunk/docs/index.html (original)
+++ lucene/java/trunk/docs/index.html Thu Jul  9 13:06:51 2009
@@ -50,7 +50,7 @@
     +-->
 <div class="searchbox">
 <form action="http://search.lucidimagination.com/p:lucene" method="get" class="roundtopsmall">
-<input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query"
type="text" value="Search the site with google">&nbsp; 
+<input onFocus="getBlank (this, 'Search the site with Lucene');" size="25" name="q" id="query"
type="text" value="Search the site with Lucene">&nbsp; 
                     <input name="Search" value="Search" type="submit">
 </form>
 <div style="position: relative; top: -5px; left: -10px">Powered by <a href="http://www.lucidimagination.com"
style="color: #033268">Lucid Imagination</a>
@@ -142,6 +142,9 @@
 <a href="api/contrib-collation/index.html">Collation</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">

Modified: lucene/java/trunk/docs/linkmap.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/linkmap.html?rev=792542&r1=792541&r2=792542&view=diff
==============================================================================
--- lucene/java/trunk/docs/linkmap.html (original)
+++ lucene/java/trunk/docs/linkmap.html Thu Jul  9 13:06:51 2009
@@ -50,7 +50,7 @@
     +-->
 <div class="searchbox">
 <form action="http://search.lucidimagination.com/p:lucene" method="get" class="roundtopsmall">
-<input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query"
type="text" value="Search the site with google">&nbsp; 
+<input onFocus="getBlank (this, 'Search the site with Lucene');" size="25" name="q" id="query"
type="text" value="Search the site with Lucene">&nbsp; 
                     <input name="Search" value="Search" type="submit">
 </form>
 <div style="position: relative; top: -5px; left: -10px">Powered by <a href="http://www.lucidimagination.com"
style="color: #033268">Lucid Imagination</a>
@@ -142,6 +142,9 @@
 <a href="api/contrib-collation/index.html">Collation</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -331,6 +334,12 @@
 		    
 <ul>
 <li>
+<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-fast-vector-highlighter</em>
+</li>
+</ul>
+		    
+<ul>
+<li>
 <a href="api/contrib-highlighter/index.html">Highlighter</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-highlighter</em>
 </li>
 </ul>

Modified: lucene/java/trunk/docs/linkmap.pdf
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/linkmap.pdf?rev=792542&r1=792541&r2=792542&view=diff
==============================================================================
--- lucene/java/trunk/docs/linkmap.pdf (original)
+++ lucene/java/trunk/docs/linkmap.pdf Thu Jul  9 13:06:51 2009
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 1110 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1101 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GatUt>u03/'L:RQ/+NrVp&(BAOg:YiJL3kD`\`D!cp4$bikj?OT:Md;S^(=m+A2"!pDi)c`_I;mfr$V=@1$DL]UM4c0;$)EIYK&FISl?p5#*7D4GfAnki^?9+iSFXa)Rj!**j9/j!K*k4-nQ:Bq2Bq`oGOZP+n-,EV(bbSguRS&FRXUNl<a2OS63G\nH3lVU$6Ma4Y\s)"`e/fcSDF(`Rb6Gq+M)HJ65PA_"pG8H[McAt-t\,J`.V3S[aEdU[=3_3hnl=9NbM(l*Y07XMDb7AZ7dm(g@HJ+`p=5sWXm5S1Clp1&2;@'1e(!Z5+pF+jD+J$/D17U<Js(3L@l7OS:OMJ^_?cJP*"M!GP*eYbe%qho,o$Lo$N`CQUTP>Ue$qTL&dM8S[BHcc-CL#u$68o,^nqO$_sV0YVYKT,R[nN&,Bn79Lg&8m7FSE?6"lgs+XS<ahle%,jWp4P5eX2L%5'?e#'4u:@:dpHqV@'^^CAnLt3fr>GH1XkIMbZQ6]i\k$o!Be@[@SGMfgZaKM?8X.lc5J[AZL[CdBS).-RrOnLOGVpY)^uh0P/Qe"W+9ig;a(Y>kU?CQ4E4EB@MO?Woe]QTXmf9(gQhe2lT:917[2g.+h2tMJq.oW'E4cZ+afRY3pU?#WdMM%R`Af56M+"*@N9WQ&>,s@[]=LFla$H8H:ueG`a`mRVQT_cn[RQm3D8ONEPF-VT+oP*'!!d'@A^JKPN27oZ*Th3<NT4(=_(F34sI);1DXUQ>Z`,@Z.b)Fb"M+/b9C%'%_4Ft;q80$p`/t)_spX,B$FQT/KjEr8rGBgg^FI\-)/\r\h)Q?W(C?QH5jRL;7."Qe-6r7.[!jJV9E(C='O&d,$YcF9p&/;3^3!D50]HVX6GDL(Os<bVV6W@48r3bklEt:[5iApcOVmOj9J^5f%#gM30`bA5"h%u$g>1%?Z3:?m5`.]gR_W.WFrhuFE,#GB@#DoIeW2d?jpK[dEVsubb@QpGI+@
 '6GFjD)1Z+>9p";#1?0qe@LT'&74A6gm`DC"dp&U9f&QB%%;'9i@0jF6g0ed11cTd'EjL1"hoXKO0m_.1D7/Yp/ms(/9A\%ZfWEO:Xa7&^.khJ3+&,?U3<~>
+Gatn&?#Q2d'Sc)J/%BCKiqXP'CpI&FeS<eVm:Mn9$;Nr]+9a,upZlGo$(/q&F4[?"2X:0'[a24,ArFdC9B'@eTXS#uT`0frd!M-&&#p026J][2"G@$:@dSS.]1o+]pSQRRe=3f11k/\!S$$65h.OFq`Nji^(V(6jXNnL$hVq-f1CrHafs"u#%lgAEh-uXM>(YutBDq"lHYa"W7Ut+6bE_90EO"A26M>`*[,6c3Uus"M<g>5FZ.tWH*8$C-SV80p>4t%:fnmNhW2G>h#j?`Ef@sEg)Mu;apuh1n6'*/p@NGT&\1-*id11`<L7ef[BOFUJC'O^PLpq0-DNRVNg_GfF!l>M<7S+2a$3nFk#K,i1"mtnVPe0o-3)_Q[9N^2I3/ETW5n!f&fi>D;Rc1g&QWd!t>!+^3Vmo&6;)BD$rX?:hZHRa&Hp@rrj]eTrUij_f3:4S'^bmc;kHH>(WOW@0rB47f$]gEIAe0Br/tC%2e<'@rpLHiI4@Z3sdlM-P/CSri\,^IiRhjhe[G"YF9_>;M+h-UL736$D^I@CW"Ib:u^bco?:8?*GKTu\S4YLj?4HCX-MB=XsEB5.CZX]<2YHeW_-#:R4q<jI:Q.A$[/OpN4o[,[K.>!(kC-)7rZ*kLE,g_u51Qf_YF]:ObK+an;A]*PaZSNId<Pu8AcFh6(2k@EWSS6gAVTFoWmT`4`EJU]qEu@u`]./4BYq4$un0#TTWkJZY6L\L]YfbJ!']kgM6`l-;3um9Yd7ngBe9'78*#gW=L\q*^B.%0fT6R=un3?$"<*N0;8WgXh=C9tpT-8/g(l],;Hi0pkE0`P[_KKheM:g,mLG;83O8Bl=I[@8+RpK3(%1J"8jLV`9TgSpi*Z[1R'ap;h\L=oS#;K4[5>4eH,?X%aNlm29XhJU?R0n./Up#?H_iXD6D_Zu<WAU0ZM?i[p4Z:ieMjsQ1aKdP!2*NQ<cZMN[=-j3h^h4^j5p3te.ttI&I$r3#+g8l
 q6!MD8fVbfPa!8ShaI*hW_#22q?>Nq@]t8A$qAj1HCLIKoYHVC,b5.#j'_g@k`DXE<AZt:&f]GbR\:EGNe^[1EW4f6<>?%Wl&ddcVrWf_4&fC~>
 endstream
 endobj
 6 0 obj
@@ -20,10 +20,10 @@
 >>
 endobj
 7 0 obj
-<< /Length 913 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 971 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GatUr?#SFN'Sc)P'u"K;iqXhuaCV?jUoBPYJ^d9W1n!8e7S%2HV>^.05(FL27S;Y))"PD%STB2(GW,CR@/pss^ap?HYT.)%lk]aj6bCDWLE)"U[K4-]SdAi7+Ma?fqpWf3X%]NK]>@CXnFud#$iY\0GAG&k-:`\"@n8%m/cM_N[4(#W/ojmfo3ce7BP#h]9Zp!2%)&/lbMneIf=Dq19-Y9FfB/O0ldH)t,pY\4I9@?_HncJ(&BK.\H<ejh9R964'LCe)4f%mo0IDsE$fW(0@5\UDN$<l%_t]J!e#crPCA;cU(e)A#\`>lC?2@Y`ns7d(;(cm+L6kl)V:)c],!C8EEJE+M;SRZCfSDB#j'J)@XkZL"<LSkg'(DeKGFp9K,atit%s%M`P6ETS9sAKZ]R.T0#"8IG*pYppD,e(&%:uE,29]?mGt5;u/sQ@:^2LHm2eeBb#8D=^'A"XUQ2;DP5FX$EO+YP&\eIri90WmWkNjJ=oJpV57Cc:X'<bHh="7Ln`&\%C;7I.%&oRmIVN#:Bes:Jo<,)!_L-UI"2]-a%c/'/ra1\l,`RJ*;&,TJlSR\4jHnd;2#(oMX.H[dE<dOt]UN@#!NMs=$g8jL,qjn`a*7e.$-)#,,>X,i$\.;Smroko@DeF<9V'37q'lbgK8'O4M`k5k^[F<H%[A/2Ljk;'fO>+>;A0dj6fR1I[C*&e?VTq/04+cD/-=N@H2eqZ[c."jss&C=>=C%R\58EJ8g$#9(J"m>_gMS7'XmRZ(O>'LGOGk5Nj(_uAQ^H"V;+X%f67JX=]3DlGUpEdSg4A#H:5#])G%5kY&SF@`G/LhP\hCM\A\)-7>#/2^r_+.m7g'uaNb0ei%dpbTm`*^"0aC^%<[Q?2W2eSnFrni4F&75P3jH-,oi3['q<\(__`%Jl~>
+GatUs?#SFN'Sc)P'u"K;nGElJjK_`pdaUkS5jG.fRS5Ds&JAhPC&e.%%j2(%O]&\ML:ltbk8YRj1`^r^1Ood"@(I0tYT.&$g_U&Z,<*[]LE&`j\cKQ`SdAi7@#-O)m\cNrH;dr5"rOB"5M)N3n/G'93Y-]139j#$5t["&n5m<'H'&N!,.Ani%8C?[W3@e;L6;l\"XkaDEL<^Vlci#"j5dqp-0O],dRB$>,U(U<ZDm+"MK'*Z[^ZB%H?=,33//j&WO"-Yl"$njDcdpq=Sar-XDOR^?kGaD!o=kpm.5N&'HiM/aS33=4dgDSEYL((aW\oq]ePY&>S,fN$F=p>@Z591TUsSS]%-COoj:Gpj-]TgQ^ii;9,FXU4/%g`.a1$,[XUl6=XniX/(11_(FPrnP5>"A_*t.0*r"C$2f^8P<bb+0Q%7bWfmTLnOf5/>8R>0ZD3GE98t+_I0al8=o*S<IF*j_SA@59H^$Ej83NJS&0!gj[(EElromK!b]hOEt5G2rtR.s.-YM@)f_q@/dHgFHrdA?V)]l_`]E6aKm9V7Ml>aUMV+*b31)+i_)i>dT1UMpGfNG5TtI*pNr)f%f&Z-$2)]-0uoh%%GQ:V4)iq1!="84=4DP)"I[o@C3B<'HohDnSF_LD4ge193Nl];'Ha/n;_tBst#Tm<`_NIooc8PXN5o^&@:9i@\*P_l'QR]q,/IPt&,AY'LkqULk;Y(;VaUgZcbYg/C48Em57#8/PX(A0dj6\2(rIXrj(-eL@'qf+A-5/d^!S]hr!PCoV*8s0#njL#iN=o2D?3Sdo),qa=[5@b5H"F8KDa+@m>')Cu)RK2Hmp_3^P5iDE04*'l%5A%PtArhMDGN1(-5S"5@;lPbC]1<#aa)7^(6>3`iS^705TZB_"4fDV*kI#\J!r#AF4qAe:-<RQmT`PN[\BoS(p;kPUaHe<YG\puV'jh5HKg@a#u4br4.qZgfZ;F(~>
 endstream
 endobj
 8 0 obj
@@ -87,19 +87,19 @@
 xref
 0 14
 0000000000 65535 f 
-0000003046 00000 n 
-0000003110 00000 n 
-0000003160 00000 n 
+0000003095 00000 n 
+0000003159 00000 n 
+0000003209 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000001273 00000 n 
-0000001379 00000 n 
-0000002383 00000 n 
-0000002489 00000 n 
-0000002601 00000 n 
-0000002711 00000 n 
-0000002822 00000 n 
-0000002930 00000 n 
+0000001264 00000 n 
+0000001370 00000 n 
+0000002432 00000 n 
+0000002538 00000 n 
+0000002650 00000 n 
+0000002760 00000 n 
+0000002871 00000 n 
+0000002979 00000 n 
 trailer
 <<
 /Size 14
@@ -107,5 +107,5 @@
 /Info 4 0 R
 >>
 startxref
-3282
+3331
 %%EOF

Modified: lucene/java/trunk/docs/lucene-sandbox/index.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/lucene-sandbox/index.html?rev=792542&r1=792541&r2=792542&view=diff
==============================================================================
--- lucene/java/trunk/docs/lucene-sandbox/index.html (original)
+++ lucene/java/trunk/docs/lucene-sandbox/index.html Thu Jul  9 13:06:51 2009
@@ -52,7 +52,7 @@
     +-->
 <div class="searchbox">
 <form action="http://search.lucidimagination.com/p:lucene" method="get" class="roundtopsmall">
-<input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query"
type="text" value="Search the site with google">&nbsp; 
+<input onFocus="getBlank (this, 'Search the site with Lucene');" size="25" name="q" id="query"
type="text" value="Search the site with Lucene">&nbsp; 
                     <input name="Search" value="Search" type="submit">
 </form>
 <div style="position: relative; top: -5px; left: -10px">Powered by <a href="http://www.lucidimagination.com"
style="color: #033268">Lucid Imagination</a>
@@ -144,6 +144,9 @@
 <a href="../api/contrib-collation/index.html">Collation</a>
 </div>
 <div class="menuitem">
+<a href="../api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
+</div>
+<div class="menuitem">
 <a href="../api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">
@@ -270,6 +273,9 @@
 <a href="#Term Highlighter">Term Highlighter</a>
 </li>
 <li>
+<a href="#Fast Vector Highlighter">Fast Vector Highlighter</a>
+</li>
+<li>
 <a href="#Javascript Query Constructor">Javascript Query Constructor</a>
 </li>
 <li>
@@ -381,7 +387,13 @@
                     search results.
                 </p>
 <a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/highlighter/">The
-                        repository for the Highlighter contribution.</a><a name="N10092"></a><a
name="Javascript Query Constructor"></a>
+                        repository for the Highlighter contribution.</a><a name="N10092"></a><a
name="Fast Vector Highlighter"></a>
+<h3 class="boxed">Fast Vector Highlighter</h3>
+<p>
+                  An alternative set of classes for highlighting matching terms in search
results.
+                </p>
+<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/fast-vector-highlighter/">The
+                        repository for the Fast Vector Highlighter contribution.</a><a
name="N1009F"></a><a name="Javascript Query Constructor"></a>
 <h3 class="boxed">Javascript Query Constructor</h3>
 <p>
                     Javascript library to support client-side query-building. Provides support
for a user interface similar to
@@ -394,7 +406,7 @@
                         repository for the Javascript Query Constructor files.</a>
                 
 </p>
-<a name="N100A6"></a><a name="Javascript Query Validator"></a>
+<a name="N100B3"></a><a name="Javascript Query Validator"></a>
 <h3 class="boxed">Javascript Query Validator</h3>
 <p>
                     Javascript library to support client-side query validation. Lucene doesn't
like malformed queries and tends to
@@ -408,7 +420,7 @@
                         repository for the Javascript Query Validator files.</a>
                 
 </p>
-<a name="N100B6"></a><a name="High Frequency Terms"></a>
+<a name="N100C3"></a><a name="High Frequency Terms"></a>
 <h3 class="boxed">High Frequency Terms</h3>
 <p>
                     The miscellaneous package is for classes that don't fit anywhere else.
The only class in it right now determines
@@ -422,7 +434,7 @@
                         repository for miscellaneous classes.</a>
                 
 </p>
-<a name="N100C6"></a><a name="InstantiatedIndex"></a>
+<a name="N100D3"></a><a name="InstantiatedIndex"></a>
 <h3 class="boxed">InstantiatedIndex</h3>
 <p>
                    RAM-based index that enables much faster searching than RAMDirectory.

Modified: lucene/java/trunk/docs/lucene-sandbox/index.pdf
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/lucene-sandbox/index.pdf?rev=792542&r1=792541&r2=792542&view=diff
==============================================================================
--- lucene/java/trunk/docs/lucene-sandbox/index.pdf (original)
+++ lucene/java/trunk/docs/lucene-sandbox/index.pdf Thu Jul  9 13:06:51 2009
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 857 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 906 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gaua>;/_pX&:i[6'n/iQ`O-.5n<d8BenWo<"`4e)*aEYf1pBnGg1A%52D!MJZB@aO7MLt@`uX(5mW+h/_<FAo8-BOG('1_=4@%g_^]9c5#,tm<&V;0!5ZWN@PM),^GN&a!8Xu/`P7O^!85GiVrR.4Zi^Wl/!T-1dANXIQ8alJC4.9Q5PGi^"W@]'%iLO_LWXuHfo>+$-E4!js_iTSR\!$9NWd>:l029s5rQ^[ENPT527fc**m9sNIPD1ecj5(jN[9kWGmWMsl`M%K9`1`CQYn-FK8H_D-J-gLdgBO5.'ZM)0paS91+ap4PQg4*q=-^h_MRjS7E@VEnSZiFNi?DcZ@G93!L6"$a"$RUCp[i*]=6j4Jp5L<@e.3_G(Q0)@eTO5=A4@D[BtF2U7nF!(!B_>*p[r1)rEn6kKc3mq#<&=g&(o8h[\s-ol/JIO:ZlMmjLRPEIVo0\clShlF8ZNqEDTHgP\F./oUYta^`3)Se[9+8e#N%A029dC$_ICY9",:L^Xj'bK]=3uM:^J6GR-G19^(12]e=<m.e>N"a%q)poAk*k@ln\"A_5DjEGeSPMEgSWfB';\o[bUefD_AbVU_`[<JM&RQh*RaO+W3:nTn@o$L[6K!</BfA\en<]g4%9*p@V)osJl]h:&jdmJU1%EPE,ApV:W#*3\+>k\LcO9"duTdAuVjAbU)P1qCiT^r]eX>foAQIr$pN&V8.IM8Ob2"o$iOhG(U!`@s3(g2.(HKE<a@,.J-.m"eGl^`]#+3258_O"DlW+:X)=5?H%9[a!#*hVSUX:*Kru-Y<;C^rt>^\QZA$>^It;C*cT:PY+:2[XL^4L!I.dokVq\r?)I2d%:<C!N)L~>
+Gaua>hbVu\&BE]*=89$kX0J3T599j-)edrY)R5'7%j>p9>%/9qKlql.G-]*m@ni'9P,`9aSF?#/gY_d$PKE@M6d3RR--HV"5M:^_RgDO%Hmjkh?f2Ua"VF?VoPJo[9!_`AKOucobe<8=FXAAIci/?.OimT*rAm80:i]tg;aab)q+3Oe;+r4L$hpJHC?OQ.W`LYdZ73*998KPHP*^^Y^^E1V8U=[N&&R_9WEQn5R?EPL=SMeSU?&:<9'g&.0>qk_q4l=5)$=`26Yi$D/nCT0[Y56?R0SRrm+Db@fhQFSFA?<cDRo:4Eopg0`-rl[_f].KJ@uOp-$8O#Q:ed/2HBXtN/9uK7m@KU:s=962N/15:LmXHIN.!bN\F<pKe/g<cASuBPHrLL@D^"Rpj)TY%spIL2[Bo\:Ls&tX8<'8b1S;L"-.)Vm13\/ql`WTT1*h6fLR;IeXksq"ji(<!n7aNSmaek$LH"q/IT%8B7FjXD>R",Q'&[]=hrm8UUb]=B)d.SgAnUMCEH9ai=rL%86[d<!aqW+>reR=`Q`76^'<om$fB5lqkIlA-uRN$1bB^0#57YqDB/D9a;V#7Dif`tK6uW+h2</t[:g*mg0^ZMBq=Kt"]B<M(4$'!]W<'cmaADm%($tf=1/_!Tb!A>*X2lC,J^M2ZH1Mn@rKatp^2,gJ_!](P<H5<@";P3i)Qnuh-.l.OBX.nPh+Tf,fYDG_GTCV*"#GZ]8pk^3>c^QQ?$^MgM%o'F.%s(+'B&UcWXLNIn[=ij7g[VXt<T+P<L;TM2b'6P<gn_8.2ep>Y\%2H,KKs&0.t%kFfD[G*W5j@]u--1UYqM.q#ODps(jA/Oi:h=pZa6SsMnS[;6m^%=7/O/^5=cPf-s3G<YF5D/<&=BMf.c066F+*s'7$g)^~>
 endstream
 endobj
 6 0 obj
@@ -33,6 +33,7 @@
 24 0 R
 26 0 R
 28 0 R
+30 0 R
 ]
 endobj
 8 0 obj
@@ -108,7 +109,7 @@
 22 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 418.766 264.14 406.766 ]
+/Rect [ 108.0 418.766 237.488 406.766 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 23 0 R
@@ -118,7 +119,7 @@
 24 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 400.566 252.8 388.566 ]
+/Rect [ 108.0 400.566 264.14 388.566 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 25 0 R
@@ -128,7 +129,7 @@
 26 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 382.366 234.812 370.366 ]
+/Rect [ 108.0 382.366 252.8 370.366 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 27 0 R
@@ -138,7 +139,7 @@
 28 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 364.166 211.816 352.166 ]
+/Rect [ 108.0 364.166 239.812 352.166 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A 29 0 R
@@ -146,166 +147,184 @@
 >>
 endobj
 30 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.0 345.966 211.816 333.966 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 31 0 R
+/H /I
+>>
+endobj
+32 0 obj
 << /Length 1870 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
 Gau0D9on$e&A@sBka2?U>,8lZ98[Q>TIJ<lMkXm3TI&<(<Yc]RZK(r\Nb$6Qb1*TKUf_$Vd`S(=O)Nk`om/?>Z^?00q'=3_5OdCA+f4S`aNmc1dq`muT>/&3AslGB09/Bo*CfGZ3uS\LKUrt9Eq]+kojTho:H[>pYZT.tD`r^fi.lWVYD*'?*d`gIpW!Y6?@$gs>NWnc9eIo8\UNI:YuI?&H@L3uG:1nI>O63f+UCXX`rh2Q$V=$["XERd42J-E0M94CKO>dBVq";"f9[Gh2!T+HX/b<f1?eb)NsDL'c&UuHRqK&o:Xg>D_F_,Ag5-/"V_G(?3^h#PSZ&.negHoem8hfGcj%JO.,$uF7CbM!PrKn6og\/gAKgcA"O,Sm?!V8#\W,GpK5RV&k/"J$/m^4F)eBS-H`j2[N/NTBMhp83;/`6_&1k!MUV4]O/t6%Eas*l9g_c!sHgrY0]+U@e?D,jt]P:80($8^9_HIo=fkCJ$#`Ht[g,Gk!Unj6N4Xm\ZbJlfm-t$V[`#Fpk*,M_I6CK]a`#1O08_aRM(&5[\iIt?:9Q2=BK@8g]</@Z/X>c>f[l[U+djWWefE,^`ZlkJNQ?]$<Za*MhU9iUa:`La`]1Q5<T*o-odj<G_&u"$2(U\];$3[GqZcno%C](S;AeGhrhIpcrBPLi]pV)4C%Z^+lC=!k=Xj?SSpB6\D5!Rg&,qC3UKo;\58-^%entDp>FhRZq4u`@rE:DeF+A/j#h-+l;<qEU)49*CrHsZ-9HCX_P4t!kZHspNDHqN%f.CEG8$HB2&E:fq[UP'uYck^V2I&PP'BfZ/[/[elaBY+%`2MCD9)5[FC1`.nn0hH<JRUM_KPkJoH2V=+pRO6hBK3MK>Lq?^dZGbk5LEp&i]qlrYZ!_HX_5ZEJ"S]I&,+dAW[H]Q8E:7b$AdJd!d'%`o\CR[Z/-gcO>@(N'N'@h=;8jV81.T>3h$p=De[j^T0p1-HSIU-S*h>lRcIn<
 /qpp3-h@E5reF>DS/:^SN]En<++q)h\"=tIKN1hGB<UoYT[lk``e>&u'kiTQ0l].ful3a2UK$.-989ddI"Yh6)*1i7?2i%_qIks?*/3'DIDY\Q_)GA".[2Xd`,Ql+@.%>9-:Y3imOU?2dlp'-B5hj,2%8$pXV:<t`mft+jNmu+%c6(rLq[@pDJH)(j=-`0Q[`qP]H=Omn.45n1\Ts]+I,nHrj**.;DVMHH"DZZAe;?s?cNP)G'sn#eC;fHL=3%IZ%C.6&_*F:G1kq`]c[<>T&`iBsmsh^a,U;pq'u1trp>&%N7qYQ#-mmHSFoSlslMnU;=9.3"Olu,n^fV!LT+0lnU.tMZl/F'fcQA14WfGhJ@q68`UJZ7W4&Yj%95XHCb`>X,_.,q-82-$WFTSKM*(qVj%A\(jX#62;??/0PNgaf4UPTYV<i'!SMT84+[2k+_>$_o__Ka0$.RB/_QkJnPD^n@n-Hbujj=Unamf5YO%\9KSo;V?\Lq.(AbMm5[EA.AZ#mUZ(VW4=g%*`B+!JSu1Wl7bncpua_C%4#+8phkgUKY"n#U2I<G53A@ft$2l7U+p2,`\O^H;5HJ::^kX!a?&u'RPFI/FnfBVuP/K23As&Hg@NDZ]ja>a20@3_kHK17[%WRRHTE,cr+&N-[<n&I/G1g95]4)4:iL@U!QS,P(d3Dejrq^K!2aAB"J%"Ub%??cJX*9m^WQB00.cGVC--WKHsF`QTf51CR;*<0'O3b"Rq""n6e4NP9/h@Ib[0.@jk(:TBm?i"A?T;]r7b]\7BU?_73/V*JW"u;9SX0UUr>N(Or`H?ET[aa-Wj`#>Q(kXR>pNXm/:RT'(4Y^-)Vh^>GKrFuics0"T[>?&S-Y>ClY25NUXA<W~>
 endstream
 endobj
-31 0 obj
+33 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 30 0 R
+/Contents 32 0 R
 >>
 endobj
-32 0 obj
-<< /Length 1798 /Filter [ /ASCII85Decode /FlateDecode ]
+34 0 obj
+<< /Length 1750 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GauHL>EbO7'Roe[i%=1eXWTl6*]Idk9r?1rib9Lg50+l$RL"`m=NCC54W%:]*([_Zdb40E&g3agG<UG1Vjl6.c0F>HH@,G"=Cj\d]f;&2J&JqUCDQ^kVQ!W)DnC>-HM[:>(l?Yr:MuRj"1YSgXo.cX55\9]IujgZp*4KSH@J&+Y4kQB_[kTb33VsVEP6;d?;*.F;\sTq2@&)4UYP'f99$+/P;`8:g)m5l6L:M6NAMR"Ea;@k4'kS/U1J)5q"]c!XC1lXDtE82NA)U)kf-X[7j7M;<hKcH=>IJu9h@%AZT/;-6=m679RWAlG,E9Q5^35<@<sM%BM)418rS+g'BkW:9E!6'^*?7^Drt]3kLFotq;T"&?Cu8(V'HsX:*\c)cq/QCdBHEXiuq&o'%3HIO:k#0)h2RC-)]_U\KWkNn!PUtaOjZf4Sr#8U>GEF?nWOfZIC71P`/X5!I-:/<7b_IGK/i?<\@).<Ma5TL'jAKarD"\Ub9S5PSpW8eZ+O_G-rb8Egn<:B0jH[7Zpnq*sSGIkITrYjgOObrMDge(s/YN49/!<_.)('V&2L4,AIq,TB6'FhuiINL5)=B(62FK&P9-V7[-=e!dDpJgn5!-+mi%@:BRpj5ul]D@2I@3(_)gXNtKk%#A45\.ij<%SU$bJ0Ec3m-MD_*9,AR@@Zi(;"/7(>*(9b\@!+\InD-k+a3!cRV'r3oB)dIJ+pJSSnHbro60T-!j#4)PKeiG3'tApg_9('RD;LXkHppn'BLK$`,@/3=N$K#$%@].Ba_f;-0o\K@Dl_%1pk2UEk[n[CJa3/CkKS>-8lYkkOR$h"EsHpC0.c>&PtsVK.r#J`Q^M+qBh[1CU6VQS]Uj?1Ke[p#*[,lJME@t^J^3]XB=uR]@[JlXJ+fL[nY(cK?Vr:]^Eq[QKL+\__r2ZVN'qXN!;H+oE;tnJ=n"(q4_+kUdW@;s:.]a@fY[tWaF`jkFtE=3^@XOp,W?&TXFB6_nGuo
 "WX#bm*=?FE(O#TnI-NVV\=O\nfa-tY>D)HIRj0CV?<cst;_G)qE[5.U#DpQof>pXlCTo3=jDH>d3"+km4I9kaj)`Bu[XrQ.XfZ5aV[82Mhd(Gf>ocr'U\c2$(G^FnPun;)S@IQRnj_PsE.:^7Aue<[9+F6'_a,@A+67t;kIXSY!69:G<T*Q"&:i?F56j!/QgPug7^oc*0^B^h[HU-$![Rt#-#q!qK@6q%YFpOKZtp:c1MJ;7c%U`Z;)k[]`UaU8a!d:meS!=R"\W9oP2Aj/&l-K"^r7Ua'b6%>iG!GGfQLT%F^*'41PEQ&+fIIO2*IWf.hn`,J^>.)jc>Et(HTt)H+Saidb"b.l*;]ukqC0LgtjU5F)G08=Cgag^og\D&V.#D*@'Jl%aEPgDat1B:uI&N,tFr]!\4LL-$tsbc)g)RCE)'*_5K\D5RWTtbV#llX_8V(Q:AhW'*fUYj#n#[+n+2W;s6hcX6-Hn[SU!lZ$]3%U2bi(iHgBU/-=LgN$Li?KXR5?]=;ai;kSBg2qeXm6mIeaBeXEH:_I##82LGiT+2;*mcN-oQ<T<BMsfH`'VRN,5T#M5`p/T=)'l__hLQogJGjt\[HM/`C$Om`YBr'HBm9]aUqqS<)kb<H91qgA_u[%$ql08?DKl\T?u)8LGAm9Q5X@c.N7mkq^q/at`otiR)kiZpPJP0r",l&T(*X!_hkpZT'm/ijoN%)@B9gH[K*n9fn.+NIWD<3+fls*=#)l<P_"Zl'jE/!^;WmRsOAX%a=7nAYVU\4(%Zg;=s3NKEHWr<B+F3BCJZ@rVF(QQ,~>
+Gb!;d9on$e&A@sBk`up]),]9P-:+qS:_ZLQ8.TPJZp`Y:-rQ`a479<@aHEWu=5);$(.GLtg8%,W*p:f.$t$+PDcVeB$gMQeF14\Gi]9pN_>bWoIkO1H,:Q>,_k$J[_rB4u#D=?hDngN93n/ceX3JLE%<CEg3o.Tu,EWp)X2=\mq&?`,U>#S(/A9M+cQuNEL2Hb=F3l8;`b)nop"7EoWgQ]IH$*(i*K04'Yq+uVTgUK>_S&Y)@q3iDcjcG`E61j"G+sZX^RWid$Q+=bJcWl[f*BUO""R1QY:D@g%o%j=bd6#CCdP*O;/:4mq_m0dX[$h)%bpV+7pApU]TISDoAi0',\c97:AZ&.g4"fpRQ->\3qEl3]5p$"LM9),_<!KrDWk;"NudM0::Cdh8O@giFU0E&a_9]f9d[j3>Zsq56L\=IU&^6+V80c/X.#Leb;_t*d54O%iWo!]Fl3:PBqj<>"2!$D:3bm;A6,!oA1+CM:+>i:O\)LAImKZ78sG=J(pl$/R.5$J^e^+A$pkS&RX6!10#4mBA]2/o%K3Ftnj8M"::YpJ1ka!!JP$NKdY]!NI6WSU:;R8"0i&6;DClj0n,j;16]E2t8-!U(2S;Ei?@^e4J0,_VK/Q`8WoDQf4*H886>\Gel>1,+!3j=L(g`VuCkjH920)Zg(N8OHYW*guS6.%oPD:FKqKf3S7ZH<6p3u4Q.OkT6,rGQ:WYC+?d#A5Z`J@-)=bV7tO_6QFco';[!h[hihFoLS-#jLie?T2\<`:+XHiCcl)"^]Zr+:Zm%dI5mKDkuPq.W6KdF6_=cVGbE_lGs#'#_P/CsT-*L_BOX6c60^^P9t.2GFF(L4h`5pQOZq*6gAm$:pWZa7YZG;QL>F`mbo(UFAiQE/#\C=7rj33MPs)(<pmU#akeX&G5]dn);OVOU3TpZgh[,EJ*LjB*L7^M#DRK=G]@8Au=PBBt]f0)7&F:^1SqU.!N<g7Dn2sm/&CALP<J$>eZI
 8k8B!7eT[iOF\+]9l3=i30Q8.]H5kO%1+@8;(tH=L,I&=#Ajm"tY+`ECVo8>YVl)R.1eq.6'q.d=F3Q6.bd-7BH45W7:o.hcplKM;A?L$ie1N@m1g*7Cc';:3C!8c9%k&usWVDr9))#4;;%[s'$%*:<K?Vi7)OEk&fPEq[kJ["MVgp?.51;&m9/tDIghIH`Pa:Qah1gRKC4u^:N]U*$ipiQlq910O^;ou"eJp5qX4,M\[H,<&1jD2tcsZ1g8cssC-PH]F6<K9\GeGeU/f]>V=W0P4lr4@hAVL;Z<JHU;\f>9N'kllr,k90[i*N;g'M?@fM'b>`LaqF_1<$B-Js'];X=FZ5Q[:m:b\Y#Sg5>`dY_(hYfPqm<>ZTY>0oeCCNu,u7VfM/;&'7D<R!?LaQo:9L7jons3H*A7-qht[#7K!L)QC'ERA4erES`:3/YqU/^XUG*I6AOtR;O8_P-lkFRmp0@5R7c>G/-j5'U-SPX]5*_"YUu7%(S]ES2t%8g"Ko6-]r%9<T@irBU-XKD:%?A<-)d&Rb'FBQA1'A@NPZ-RPPU0o6ekuDhK_F.#(!b?8$.K+ZfJT4XOk_H.[Q.Y3"8A\;.t0XhRtq"gQq;#_dXg8<6E:^jmij$rKbID1j)sM0fonpVD2_bXVZ4gIVNaK@e[dj)$,sN&lqb-OBciJ+rM;QcF0[FHsn=?:`,&kIT'nZ>(Mh;lB=P*2&)d7.':]h'eLMoY\7ELVAd`f<.r>_dU%;3Kj5g!$7gsU]~>
 endstream
 endobj
-33 0 obj
+35 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 32 0 R
+/Contents 34 0 R
 >>
 endobj
-34 0 obj
-<< /Length 398 /Filter [ /ASCII85Decode /FlateDecode ]
+36 0 obj
+<< /Length 608 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gat%]9i&Y\%#46H'g?MjR3]sGHXqpU+V(1<"rsp+h("CrU`F:OT(HN-`W`'7<F=AOCHks4j?=f\KY]Q/%j[uB5q*Q*6FPc-cB*[fYU2#6n_`]&V$+fUO/sJ2/#(uVkR/\,70R3Dn2e[7FrJN8/e`.6XtC[VcXX%qIM??n2l:=^e(?dCk4XI,G_bW?=E@#0[*BIh5nhbI!6sZIGhO+o*mCMUef%Jh3)#p()d?U'Aq),.9U2g;Be]!([0q2:19+3p!>.aQ>=-;_&GnVf%-,Tr3MZ]i4\YZf[b#sP>*I?b0IC$4)0'7d@]C\!+tUt7<d3tNp>pJLFT%@<g`)Sr<1HiDWo7E5&]*c)aq`11nPNi]N`BtcdT%-LmJ!C>]^&,CgA3Ilj2gWnXa6='~>
+Gat$t9lHLT(r#SlHqY&rj4Dr9*8>>03c3<rEpImf^`c7eA=.3!^Rt<7VG^DgLl]U/4C@k9M`t_"Y6[_achf,e5Y7+arlR\0]M2m,6qgcO%ak%7mbR[IJH`B(HU3bh(YLO;_]n@V,i_5-+JG<9BC`^W:?KPL+25$pc)#D[f<d3SfWf-,E3<G`l<7E@>hq0*f@i7Fi.h.Tg#l3_"dLPUPQ&i>qn&N#,,?g4gFjZ;alG'dTOrDhJZdGRm3TSnoXFP6(eA242ZuNN<'FF9C"lY!1W=tubhl7b3a,<-\X_nE"9(d"CN>:D$QR81Dng0#g6lC^:lV8,lqY,rOKnXYRip5P2*V7%B\/ZF$"n@LT.4'J^1S8Cq*.o^ann!Z@TI5tU4BT(s8*8*+N[^YAua[Y&`mL11?)8a9KA6L3FqAFI!a9:a=S^611=_bjdI.#*nn=eiCVe`d&\/Qs80V\;@-5pAPup1n+&G^M6CIt0/$?\8NA1ZWViX:2'3?F,+UV1-mlJ1[MoPSBd/AmhXHd%LZ\0U<on%o?E-3!+&(UE(o>?+VIE"+KJh\ck1KX[D(r86Y-u\_eQ<*Ceb&tJDAQ^@9`*QY_<1\$^ul=]~>
 endstream
 endobj
-35 0 obj
+37 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 34 0 R
+/Contents 36 0 R
 >>
 endobj
-37 0 obj
+39 0 obj
 <<
  /Title (\376\377\0\61\0\40\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\123\0\141\0\156\0\144\0\142\0\157\0\170)
- /Parent 36 0 R
- /First 38 0 R
- /Last 47 0 R
- /Count -10
+ /Parent 38 0 R
+ /First 40 0 R
+ /Last 50 0 R
+ /Count -11
  /A 9 0 R
 >> endobj
-38 0 obj
-<<
- /Title (\376\377\0\61\0\56\0\61\0\40\0\123\0\156\0\157\0\167\0\142\0\141\0\154\0\154\0\40\0\123\0\164\0\145\0\155\0\155\0\145\0\162\0\163\0\40\0\146\0\157\0\162\0\40\0\114\0\165\0\143\0\145\0\156\0\145)
- /Parent 37 0 R
- /Next 39 0 R
- /A 11 0 R
->> endobj
-39 0 obj
-<<
- /Title (\376\377\0\61\0\56\0\62\0\40\0\101\0\156\0\141\0\154\0\171\0\172\0\145\0\162\0\163\0\54\0\40\0\124\0\157\0\153\0\145\0\156\0\151\0\172\0\145\0\162\0\163\0\54\0\40\0\106\0\151\0\154\0\164\0\145\0\162\0\163)
- /Parent 37 0 R
- /Prev 38 0 R
- /Next 40 0 R
- /A 13 0 R
->> endobj
 40 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\63\0\40\0\101\0\156\0\164)
- /Parent 37 0 R
- /Prev 39 0 R
+ /Title (\376\377\0\61\0\56\0\61\0\40\0\123\0\156\0\157\0\167\0\142\0\141\0\154\0\154\0\40\0\123\0\164\0\145\0\155\0\155\0\145\0\162\0\163\0\40\0\146\0\157\0\162\0\40\0\114\0\165\0\143\0\145\0\156\0\145)
+ /Parent 39 0 R
  /Next 41 0 R
- /A 15 0 R
+ /A 11 0 R
 >> endobj
 41 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\64\0\40\0\127\0\157\0\162\0\144\0\116\0\145\0\164\0\57\0\123\0\171\0\156\0\157\0\156\0\171\0\155\0\163)
- /Parent 37 0 R
+ /Title (\376\377\0\61\0\56\0\62\0\40\0\101\0\156\0\141\0\154\0\171\0\172\0\145\0\162\0\163\0\54\0\40\0\124\0\157\0\153\0\145\0\156\0\151\0\172\0\145\0\162\0\163\0\54\0\40\0\106\0\151\0\154\0\164\0\145\0\162\0\163)
+ /Parent 39 0 R
  /Prev 40 0 R
  /Next 42 0 R
- /A 17 0 R
+ /A 13 0 R
 >> endobj
 42 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\65\0\40\0\114\0\165\0\143\0\154\0\151\0\40\0\55\0\40\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\103\0\157\0\155\0\155\0\141\0\156\0\144\0\55\0\154\0\151\0\156\0\145\0\40\0\111\0\156\0\164\0\145\0\162\0\146\0\141\0\143\0\145)
- /Parent 37 0 R
+ /Title (\376\377\0\61\0\56\0\63\0\40\0\101\0\156\0\164)
+ /Parent 39 0 R
  /Prev 41 0 R
  /Next 43 0 R
- /A 19 0 R
+ /A 15 0 R
 >> endobj
 43 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\66\0\40\0\124\0\145\0\162\0\155\0\40\0\110\0\151\0\147\0\150\0\154\0\151\0\147\0\150\0\164\0\145\0\162)
- /Parent 37 0 R
+ /Title (\376\377\0\61\0\56\0\64\0\40\0\127\0\157\0\162\0\144\0\116\0\145\0\164\0\57\0\123\0\171\0\156\0\157\0\156\0\171\0\155\0\163)
+ /Parent 39 0 R
  /Prev 42 0 R
  /Next 44 0 R
- /A 21 0 R
+ /A 17 0 R
 >> endobj
 44 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\67\0\40\0\112\0\141\0\166\0\141\0\163\0\143\0\162\0\151\0\160\0\164\0\40\0\121\0\165\0\145\0\162\0\171\0\40\0\103\0\157\0\156\0\163\0\164\0\162\0\165\0\143\0\164\0\157\0\162)
- /Parent 37 0 R
+ /Title (\376\377\0\61\0\56\0\65\0\40\0\114\0\165\0\143\0\154\0\151\0\40\0\55\0\40\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\103\0\157\0\155\0\155\0\141\0\156\0\144\0\55\0\154\0\151\0\156\0\145\0\40\0\111\0\156\0\164\0\145\0\162\0\146\0\141\0\143\0\145)
+ /Parent 39 0 R
  /Prev 43 0 R
  /Next 45 0 R
- /A 23 0 R
+ /A 19 0 R
 >> endobj
 45 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\70\0\40\0\112\0\141\0\166\0\141\0\163\0\143\0\162\0\151\0\160\0\164\0\40\0\121\0\165\0\145\0\162\0\171\0\40\0\126\0\141\0\154\0\151\0\144\0\141\0\164\0\157\0\162)
- /Parent 37 0 R
+ /Title (\376\377\0\61\0\56\0\66\0\40\0\124\0\145\0\162\0\155\0\40\0\110\0\151\0\147\0\150\0\154\0\151\0\147\0\150\0\164\0\145\0\162)
+ /Parent 39 0 R
  /Prev 44 0 R
  /Next 46 0 R
- /A 25 0 R
+ /A 21 0 R
 >> endobj
 46 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\71\0\40\0\110\0\151\0\147\0\150\0\40\0\106\0\162\0\145\0\161\0\165\0\145\0\156\0\143\0\171\0\40\0\124\0\145\0\162\0\155\0\163)
- /Parent 37 0 R
+ /Title (\376\377\0\61\0\56\0\67\0\40\0\106\0\141\0\163\0\164\0\40\0\126\0\145\0\143\0\164\0\157\0\162\0\40\0\110\0\151\0\147\0\150\0\154\0\151\0\147\0\150\0\164\0\145\0\162)
+ /Parent 39 0 R
  /Prev 45 0 R
  /Next 47 0 R
- /A 27 0 R
+ /A 23 0 R
 >> endobj
 47 0 obj
 <<
- /Title (\376\377\0\61\0\56\0\61\0\60\0\40\0\111\0\156\0\163\0\164\0\141\0\156\0\164\0\151\0\141\0\164\0\145\0\144\0\111\0\156\0\144\0\145\0\170)
- /Parent 37 0 R
+ /Title (\376\377\0\61\0\56\0\70\0\40\0\112\0\141\0\166\0\141\0\163\0\143\0\162\0\151\0\160\0\164\0\40\0\121\0\165\0\145\0\162\0\171\0\40\0\103\0\157\0\156\0\163\0\164\0\162\0\165\0\143\0\164\0\157\0\162)
+ /Parent 39 0 R
  /Prev 46 0 R
- /A 29 0 R
+ /Next 48 0 R
+ /A 25 0 R
 >> endobj
 48 0 obj
+<<
+ /Title (\376\377\0\61\0\56\0\71\0\40\0\112\0\141\0\166\0\141\0\163\0\143\0\162\0\151\0\160\0\164\0\40\0\121\0\165\0\145\0\162\0\171\0\40\0\126\0\141\0\154\0\151\0\144\0\141\0\164\0\157\0\162)
+ /Parent 39 0 R
+ /Prev 47 0 R
+ /Next 49 0 R
+ /A 27 0 R
+>> endobj
+49 0 obj
+<<
+ /Title (\376\377\0\61\0\56\0\61\0\60\0\40\0\110\0\151\0\147\0\150\0\40\0\106\0\162\0\145\0\161\0\165\0\145\0\156\0\143\0\171\0\40\0\124\0\145\0\162\0\155\0\163)
+ /Parent 39 0 R
+ /Prev 48 0 R
+ /Next 50 0 R
+ /A 29 0 R
+>> endobj
+50 0 obj
+<<
+ /Title (\376\377\0\61\0\56\0\61\0\61\0\40\0\111\0\156\0\163\0\164\0\141\0\156\0\164\0\151\0\141\0\164\0\145\0\144\0\111\0\156\0\144\0\145\0\170)
+ /Parent 39 0 R
+ /Prev 49 0 R
+ /A 31 0 R
+>> endobj
+51 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-49 0 obj
+52 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-50 0 obj
+53 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-51 0 obj
+54 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-52 0 obj
+55 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F7
@@ -315,152 +334,161 @@
 1 0 obj
 << /Type /Pages
 /Count 4
-/Kids [6 0 R 31 0 R 33 0 R 35 0 R ] >>
+/Kids [6 0 R 33 0 R 35 0 R 37 0 R ] >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 1 0 R
- /Outlines 36 0 R
+ /Outlines 38 0 R
  /PageMode /UseOutlines
  >>
 endobj
 3 0 obj
 << 
-/Font << /F3 48 0 R /F5 49 0 R /F1 50 0 R /F2 51 0 R /F7 52 0 R >> 
+/Font << /F3 51 0 R /F5 52 0 R /F1 53 0 R /F2 54 0 R /F7 55 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
 9 0 obj
 <<
 /S /GoTo
-/D [31 0 R /XYZ 85.0 659.0 null]
+/D [33 0 R /XYZ 85.0 659.0 null]
 >>
 endobj
 11 0 obj
 <<
 /S /GoTo
-/D [31 0 R /XYZ 85.0 506.266 null]
+/D [33 0 R /XYZ 85.0 506.266 null]
 >>
 endobj
 13 0 obj
 <<
 /S /GoTo
-/D [31 0 R /XYZ 85.0 399.413 null]
+/D [33 0 R /XYZ 85.0 399.413 null]
 >>
 endobj
 15 0 obj
 <<
 /S /GoTo
-/D [31 0 R /XYZ 85.0 326.96 null]
+/D [33 0 R /XYZ 85.0 326.96 null]
 >>
 endobj
 17 0 obj
 <<
 /S /GoTo
-/D [31 0 R /XYZ 85.0 241.307 null]
+/D [33 0 R /XYZ 85.0 241.307 null]
 >>
 endobj
 19 0 obj
 <<
 /S /GoTo
-/D [33 0 R /XYZ 85.0 603.4 null]
+/D [35 0 R /XYZ 85.0 603.4 null]
 >>
 endobj
 21 0 obj
 <<
 /S /GoTo
-/D [33 0 R /XYZ 85.0 530.947 null]
+/D [35 0 R /XYZ 85.0 530.947 null]
 >>
 endobj
 23 0 obj
 <<
 /S /GoTo
-/D [33 0 R /XYZ 85.0 466.194 null]
+/D [35 0 R /XYZ 85.0 466.194 null]
 >>
 endobj
 25 0 obj
 <<
 /S /GoTo
-/D [33 0 R /XYZ 85.0 380.541 null]
+/D [35 0 R /XYZ 85.0 401.441 null]
 >>
 endobj
 27 0 obj
 <<
 /S /GoTo
-/D [33 0 R /XYZ 85.0 281.688 null]
+/D [35 0 R /XYZ 85.0 315.788 null]
 >>
 endobj
 29 0 obj
 <<
 /S /GoTo
-/D [33 0 R /XYZ 85.0 169.635 null]
+/D [35 0 R /XYZ 85.0 216.935 null]
 >>
 endobj
-36 0 obj
+31 0 obj
+<<
+/S /GoTo
+/D [37 0 R /XYZ 85.0 637.8 null]
+>>
+endobj
+38 0 obj
 <<
- /First 37 0 R
- /Last 37 0 R
+ /First 39 0 R
+ /Last 39 0 R
 >> endobj
 xref
-0 53
+0 56
 0000000000 65535 f 
-0000010600 00000 n 
-0000010679 00000 n 
-0000010771 00000 n 
+0000011212 00000 n 
+0000011291 00000 n 
+0000011383 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000001019 00000 n 
-0000001139 00000 n 
-0000001234 00000 n 
-0000010894 00000 n 
-0000001369 00000 n 
-0000010957 00000 n 
-0000001506 00000 n 
-0000011023 00000 n 
-0000001643 00000 n 
-0000011089 00000 n 
-0000001778 00000 n 
-0000011154 00000 n 
-0000001915 00000 n 
-0000011220 00000 n 
-0000002051 00000 n 
-0000011284 00000 n 
-0000002188 00000 n 
-0000011350 00000 n 
-0000002324 00000 n 
-0000011416 00000 n 
-0000002459 00000 n 
-0000011482 00000 n 
-0000002596 00000 n 
-0000011548 00000 n 
-0000002733 00000 n 
-0000004696 00000 n 
-0000004804 00000 n 
-0000006695 00000 n 
-0000006803 00000 n 
-0000007293 00000 n 
-0000011614 00000 n 
-0000007401 00000 n 
-0000007602 00000 n 
-0000007869 00000 n 
-0000008161 00000 n 
-0000008295 00000 n 
-0000008506 00000 n 
-0000008838 00000 n 
-0000009049 00000 n 
-0000009331 00000 n 
-0000009601 00000 n 
-0000009835 00000 n 
-0000010044 00000 n 
-0000010157 00000 n 
-0000010267 00000 n 
-0000010375 00000 n 
-0000010491 00000 n 
+0000001068 00000 n 
+0000001188 00000 n 
+0000001290 00000 n 
+0000011506 00000 n 
+0000001425 00000 n 
+0000011569 00000 n 
+0000001562 00000 n 
+0000011635 00000 n 
+0000001699 00000 n 
+0000011701 00000 n 
+0000001834 00000 n 
+0000011766 00000 n 
+0000001971 00000 n 
+0000011832 00000 n 
+0000002107 00000 n 
+0000011896 00000 n 
+0000002244 00000 n 
+0000011962 00000 n 
+0000002381 00000 n 
+0000012028 00000 n 
+0000002517 00000 n 
+0000012094 00000 n 
+0000002652 00000 n 
+0000012160 00000 n 
+0000002789 00000 n 
+0000012226 00000 n 
+0000002926 00000 n 
+0000004889 00000 n 
+0000004997 00000 n 
+0000006840 00000 n 
+0000006948 00000 n 
+0000007648 00000 n 
+0000012290 00000 n 
+0000007756 00000 n 
+0000007957 00000 n 
+0000008224 00000 n 
+0000008516 00000 n 
+0000008650 00000 n 
+0000008861 00000 n 
+0000009193 00000 n 
+0000009404 00000 n 
+0000009656 00000 n 
+0000009938 00000 n 
+0000010208 00000 n 
+0000010447 00000 n 
+0000010656 00000 n 
+0000010769 00000 n 
+0000010879 00000 n 
+0000010987 00000 n 
+0000011103 00000 n 
 trailer
 <<
-/Size 53
+/Size 56
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-11665
+12341
 %%EOF

Modified: lucene/java/trunk/docs/queryparsersyntax.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/queryparsersyntax.html?rev=792542&r1=792541&r2=792542&view=diff
==============================================================================
--- lucene/java/trunk/docs/queryparsersyntax.html (original)
+++ lucene/java/trunk/docs/queryparsersyntax.html Thu Jul  9 13:06:51 2009
@@ -52,7 +52,7 @@
     +-->
 <div class="searchbox">
 <form action="http://search.lucidimagination.com/p:lucene" method="get" class="roundtopsmall">
-<input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query"
type="text" value="Search the site with google">&nbsp; 
+<input onFocus="getBlank (this, 'Search the site with Lucene');" size="25" name="q" id="query"
type="text" value="Search the site with Lucene">&nbsp; 
                     <input name="Search" value="Search" type="submit">
 </form>
 <div style="position: relative; top: -5px; left: -10px">Powered by <a href="http://www.lucidimagination.com"
style="color: #033268">Lucid Imagination</a>
@@ -144,6 +144,9 @@
 <a href="api/contrib-collation/index.html">Collation</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">

Modified: lucene/java/trunk/docs/scoring.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/docs/scoring.html?rev=792542&r1=792541&r2=792542&view=diff
==============================================================================
--- lucene/java/trunk/docs/scoring.html (original)
+++ lucene/java/trunk/docs/scoring.html Thu Jul  9 13:06:51 2009
@@ -52,7 +52,7 @@
     +-->
 <div class="searchbox">
 <form action="http://search.lucidimagination.com/p:lucene" method="get" class="roundtopsmall">
-<input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query"
type="text" value="Search the site with google">&nbsp; 
+<input onFocus="getBlank (this, 'Search the site with Lucene');" size="25" name="q" id="query"
type="text" value="Search the site with Lucene">&nbsp; 
                     <input name="Search" value="Search" type="submit">
 </form>
 <div style="position: relative; top: -5px; left: -10px">Powered by <a href="http://www.lucidimagination.com"
style="color: #033268">Lucid Imagination</a>
@@ -144,6 +144,9 @@
 <a href="api/contrib-collation/index.html">Collation</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-fast-vector-highlighter/index.html">Fast Vector Highlighter</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-highlighter/index.html">Highlighter</a>
 </div>
 <div class="menuitem">

Modified: lucene/java/trunk/src/site/src/documentation/content/xdocs/lucene-sandbox/index.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/site/src/documentation/content/xdocs/lucene-sandbox/index.xml?rev=792542&r1=792541&r2=792542&view=diff
==============================================================================
--- lucene/java/trunk/src/site/src/documentation/content/xdocs/lucene-sandbox/index.xml (original)
+++ lucene/java/trunk/src/site/src/documentation/content/xdocs/lucene-sandbox/index.xml Thu
Jul  9 13:06:51 2009
@@ -104,6 +104,14 @@
                         repository for the Highlighter contribution.</a>
             </section>
 
+            <section id="Fast Vector Highlighter"><title>Fast Vector Highlighter</title>
+                <p>
+                  An alternative set of classes for highlighting matching terms in search
results.
+                </p>
+                    <a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/fast-vector-highlighter/">The
+                        repository for the Fast Vector Highlighter contribution.</a>
+            </section>
+
             <section id="Javascript Query Constructor"><title>Javascript Query
Constructor</title>
                 <p>
                     Javascript library to support client-side query-building. Provides support
for a user interface similar to

Modified: lucene/java/trunk/src/site/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/site/src/documentation/content/xdocs/site.xml?rev=792542&r1=792541&r2=792542&view=diff
==============================================================================
--- lucene/java/trunk/src/site/src/documentation/content/xdocs/site.xml (original)
+++ lucene/java/trunk/src/site/src/documentation/content/xdocs/site.xml Thu Jul  9 13:06:51
2009
@@ -54,6 +54,7 @@
 		    <javadoc-contrib-bdb-je label="Bdb-je" href="ext:javadocs-contrib-bdb-je"/>
 		    <javadoc-contrib-benchmark label="Benchmark" href="ext:javadocs-contrib-benchmark"/>
         <javadoc-contrib-collation label="Collation" href="ext:javadocs-contrib-collation"/>
+		    <javadoc-contrib-fast-vector-highlighter label="Fast Vector Highlighter" href="ext:javadocs-contrib-fast-vector-highlighter"/>
 		    <javadoc-contrib-highlighter label="Highlighter" href="ext:javadocs-contrib-highlighter"/>
 		    <javadoc-contrib-instantiated label="Instantiated" href="ext:javadocs-contrib-instantiated"/>
 		    <javadoc-contrib-lucli label="Lucli" href="ext:javadocs-contrib-lucli"/>
@@ -103,7 +104,8 @@
 	<javadocs-contrib-bdb href="api/contrib-bdb/index.html"/>
 	<javadocs-contrib-bdb-je href="api/contrib-bdb-je/index.html"/>
 	<javadocs-contrib-benchmark href="api/contrib-benchmark/index.html"/>
-  <javadocs-contrib-collation href="api/contrib-collation/index.html"/>
+	<javadocs-contrib-collation href="api/contrib-collation/index.html"/>
+	<javadocs-contrib-fast-vector-highlighter href="api/contrib-fast-vector-highlighter/index.html"/>
 	<javadocs-contrib-highlighter href="api/contrib-highlighter/index.html"/>
 	<javadocs-contrib-instantiated href="api/contrib-instantiated/index.html"/>
 	<javadocs-contrib-lucli href="api/contrib-lucli/index.html"/>



Mime
View raw message