From 5d3f1f9d67e4b04f2a336dc180661cd7e2d8ec2a Mon Sep 17 00:00:00 2001
From: Thad Hughes <thad.hughes@gmail.com>
Date: Sun, 29 Jan 2012 22:07:34 -0800
Subject: [PATCH] About dialog, added pictures, multi word search.

---
 res/drawable/arrow_down_float.png             | Bin 0 -> 3141 bytes
 res/drawable/arrow_up_float.png               | Bin 0 -> 3128 bytes
 res/drawable/btn_check_buttonless_on.png      | Bin 0 -> 721 bytes
 res/drawable/ic_input_delete.png              | Bin 0 -> 3769 bytes
 res/layout/about_dictionary_dialog.xml        |  12 ++
 res/layout/dictionary_activity.xml            |  33 ++--
 res/values/languages.xml                      |  14 +-
 res/values/strings.xml                        |  12 +-
 .../dictionary/DictionaryActivity.java        | 150 ++++++++++++++----
 .../dictionary/DictionaryApplication.java     |   1 +
 .../dictionary/DictionaryManagerActivity.java |  19 ++-
 .../android/dictionary/DownloadActivity.java  |   4 +-
 .../android/dictionary/engine/Dictionary.java |  22 ++-
 .../android/dictionary/engine/Index.java      | 121 ++++++++++----
 .../android/dictionary/engine/Language.java   |  25 ++-
 .../android/dictionary/engine/PairEntry.java  |  22 +--
 .../android/dictionary/engine/RowBase.java    |  52 +++++-
 .../android/dictionary/engine/TextEntry.java  |   3 +-
 .../android/dictionary/engine/TokenRow.java   |   3 +-
 .../android/util/PersistentObjectCache.java   |   9 +-
 20 files changed, 394 insertions(+), 108 deletions(-)
 create mode 100644 res/drawable/arrow_down_float.png
 create mode 100644 res/drawable/arrow_up_float.png
 create mode 100644 res/drawable/btn_check_buttonless_on.png
 create mode 100644 res/drawable/ic_input_delete.png
 create mode 100644 res/layout/about_dictionary_dialog.xml

diff --git a/res/drawable/arrow_down_float.png b/res/drawable/arrow_down_float.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd825234ca530c7ec21f26211ca4e0ba9e950045
GIT binary patch
literal 3141
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

literal 0
HcmV?d00001

diff --git a/res/drawable/arrow_up_float.png b/res/drawable/arrow_up_float.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bc3d1c26e4099e15e9c3c6753355e1d5c8b44e3
GIT binary patch
literal 3128
zcmV-849D|{P)<h;3K|Lk000e1NJLTq000jF000XJ1^@s6phwqS00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z0004FNkl<Zc-m}_O^(w*5QV>PciV0&wq!Cyf&~jU;Vy_1a0fQI0uuK?0?h$tPLc!U
z09oV*<hJ9siv<;Ap(&~LR8{ZOt2TfEEZ_hS<f>lhGcfAAsU~1{3$Or6paO#S8886@
z5P=Tp`CG}UAy=pd8r4cfo{cdd75cTfMgXx224DrWzy^3LBF_M-Z*<<OuLQhZq&B*I
z5Ro4&N<@AF54x|_Us(OyJ-HE)@4QetuhkcT+yL)@SHSC((vyf75iu|DlQBlT_n&|x
za5BJqpgo;VkK;JHl#-jKDVyiniik1Bh_!akvTU-}4&M85y<UI*2OkcHZ!yNA@B3mH
zhNA1bY?`L*4m;;kp655`To*#<%d-5v-EO~{{eJ)Dd_ITk^%}aaD`SksIFA0FzDVuL
zvK;EVj;qzGZ`(GS-EQ~ccsz#7<r416DJB2^+1~qGQ4~W}RejSm{bsX?e+B?6Xsn8$
ST%n5q0000<MNUMnLSTY?b=DaG

literal 0
HcmV?d00001

diff --git a/res/drawable/btn_check_buttonless_on.png b/res/drawable/btn_check_buttonless_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..a10a37ae54480e0c364f6fc6290b1996aa967f7d
GIT binary patch
literal 721
zcmV;?0xtcDP)<h;3K|Lk000e1NJLTq000{R001xu1^@s6;J*Q&00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy7<5HgbW?9;ba!ELWdKlNX>N2bPDNB8b~7$BH8Ae8p8x;?D@jB_
zR9Hvtl|M*ZQ5eO~;F|(9@*uV;BAG-S8l*0DkkF+|sY^gg2ZgE#C8&d-P%s6d)M8Ds
z)>dgDf`e#990aBR{6kdy)1cILY3EKI>VA8^cmt2f%QI>^lp8oa!n-%W?>qN=H-PyV
z2aE&80pq}b=0FgBMDZ4P@sZE|;&peGpcwX$fI^ZQhH8D>dZ#$R`|RiyAuH4xH4W99
z?Cn!ZUAkCc3qj8bSfWzY0#xOT$`nDjDf{AJPS7Sni%?}_Wk1q~=_Z2eiUZmvXc@|y
zu#OV5i5Ni*l;sY)!b6Ur8P^c@tjO8X9zma|S*W&&wgEzJ<v*)h0y^*$54ouaD$o?@
za0NO+Uvwbmq3TEKr}Q~p&R=Ytph<3Ar`}P6P}S|#-6uBXf=&ja%F`9b_BTEdvP<o_
z0CPcS4#Wd=f>vOa5^J)+r%<7mP(SWD;w|qB4n$7B_7i(10~Bl08Yti2P-3ynk$^;>
z3kigavA$8?HyKK7Q2W}}Ee)0eL~^byB0LhFKV2Z)PB8?3$#}^h8BWNV98iar!uQf+
zxD>%+%3qf6Yfz1MAo8rR8|~}XxOIg0x}&cessrJB?fa!~h#ThuWj6=9IA?Q&$gs-L
zN?-_g+z>bO-w*|s5quOJ$^=GkaR~(B(Xr^T_YF}XD7)PM%)gxJka7f~;*3A%y)7~r
ziR+H!FXMcH@WugzRESQq)~qoO7zd04#sTBNKXl+P8x?U`dgzFa00000NkvXXu0mjf
DeOfbV

literal 0
HcmV?d00001

diff --git a/res/drawable/ic_input_delete.png b/res/drawable/ic_input_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee4c911349aa74319fc950ecf2790a19d9eb162c
GIT binary patch
literal 3769
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

literal 0
HcmV?d00001

diff --git a/res/layout/about_dictionary_dialog.xml b/res/layout/about_dictionary_dialog.xml
new file mode 100644
index 0000000..d143340
--- /dev/null
+++ b/res/layout/about_dictionary_dialog.xml
@@ -0,0 +1,12 @@
+<ScrollView android:id="@+id/ScrollView01"
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent" 
+  android:layout_height="fill_parent">
+  
+  <TextView 
+    android:id="@+id/text"
+    android:layout_width="wrap_content" 
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"/>
+
+</ScrollView>
diff --git a/res/layout/dictionary_activity.xml b/res/layout/dictionary_activity.xml
index 56bb755..1afaa70 100644
--- a/res/layout/dictionary_activity.xml
+++ b/res/layout/dictionary_activity.xml
@@ -23,32 +23,36 @@
 				
       <Button 
         android:id="@+id/ClearSearchTextButton"
-        android:text="&lt;x"
-        android:minWidth="50dip"
+        android:drawableLeft="@+drawable/ic_input_delete"
+        android:background="#00000000"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        />
+        />  <!-- transparent -->
 
 			<Button 
 				android:id="@+id/LangButton"
-				android:text="LANG"
+				android:text=""
 				android:minWidth="50dip"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				/>
 				
 			<Button
-				android:id="@+id/DownButton"
-				android:text="v"
-				android:minWidth="50dip"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content" 
-				/>
+		    android:id="@+id/DownButton"
+        android:drawableLeft="@+drawable/arrow_down_float"
+        android:background="#00000000"
+        android:minWidth="30dip" 
+        android:minHeight="30dip"
+		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"
+          />
 				
 			<Button 
 				android:id="@+id/UpButton"
-				android:text="^"
-				android:minWidth="50dip"
+        android:drawableLeft="@+drawable/arrow_up_float"
+        android:background="#00000000"
+        android:minWidth="30dip"
+        android:minHeight="30dip"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content" 
 				/>
@@ -63,5 +67,10 @@
 		android:clickable="true" 
 		android:focusableInTouchMode="true"
 		android:focusable="true"/>
+ 
+  <TextView android:id="@android:id/empty"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:text="@+string/noSearchResults"/>
 
 </LinearLayout>
diff --git a/res/values/languages.xml b/res/values/languages.xml
index de73d3c..31383bb 100644
--- a/res/values/languages.xml
+++ b/res/values/languages.xml
@@ -28,7 +28,7 @@
   <string name="HU">Hungarian</string>
   <string name="IS">Icelandic</string>
   <string name="ID">Indonesian</string>
-  <string name="GA">Irish</string>
+  <string name="GA">Gaelic (Irish, Scottish)</string>
   <string name="IT">Italian</string>
   <string name="LA">Latin</string>
   <string name="LV">Latvian</string>
@@ -66,4 +66,16 @@
   <string name="YI">Yiddish</string>
   <string name="ZU">Zulu</string>
 
+  
+  <string name="AZ">Azeri</string>
+  <string name="EU">Basque</string>
+  <string name="BR">Breton</string>
+  <string name="MR">Burmese</string>
+  <string name="FO">Faroese</string>
+  <string name="GL">Galician</string>
+  <string name="KA">Georgian</string>
+  <string name="HT">Haitian Creole</string>
+  <string name="LB">Luxembourgish</string>
+  <string name="MK">Macedonian</string>
+   
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 557988d..17f0efd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -33,11 +33,21 @@
   <string name="selectDictionary">Select dictionary…</string>
   <string name="switchToLanguage">Switch to %s</string>
   <string name="addToWordList">Add to word list: %s</string>
-  <string name="searchForSelection">Find: %s</string>
+  <string name="searchForSelection">Search: "%s"</string>
   <string name="failedAddingToWordList">Failure adding to word list: %s</string>
   <string name="unzippingDictionary">Unzipping dictionary…</string>
   <string name="failedToUnzipDictionary">Failed to unzip dictionary…</string>
   <string name="invalidDictionary">Invalid dictionary: file=%1$s, error=%2$s</string>
+  <string name="noSearchResults">No search results.</string>
+  <string name="aboutDictionary">About dictionary…</string> 
+
+  <!-- About dictionary. -->
+  <string name="dictionaryPath">File: %s</string> 
+  <string name="dictionarySize">Size: %d bytes</string> 
+  <string name="dictionaryCreationTime">Created: %tc</string> 
+  <string name="indexName">Index: %s</string> 
+  <string name="mainTokenCount">Num words: %d</string> 
+  
   
 	<!-- About. -->
 	<string name="titleWithVersion">QuickDic 3.1</string>
diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index d9ef0cd..f79b13f 100644
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -20,8 +20,12 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.RandomAccessFile;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
@@ -29,7 +33,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import android.app.Activity;
 import android.app.Dialog;
 import android.app.ListActivity;
 import android.content.Context;
@@ -53,6 +56,7 @@ import android.view.ContextMenu.ContextMenuInfo;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.WindowManager;
 import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.MotionEvent;
 import android.view.View;
@@ -94,6 +98,7 @@ public class DictionaryActivity extends ListActivity {
   Dictionary dictionary = null;
   int indexIndex = 0;
   Index index = null;
+  List<RowBase> rowsToShow = null;  // if not null, just show these rows.
   
   // package for test.
   final Handler uiHandler = new Handler();
@@ -280,11 +285,12 @@ public class DictionaryActivity extends ListActivity {
       public void onItemSelected(AdapterView<?> adapterView, View arg1, final int position,
           long id) {
         if (!searchText.isFocused()) {
-          // TODO: don't do this if multi words are entered.
-          final RowBase row = (RowBase) getListAdapter().getItem(position);
-          Log.d(LOG, "onItemSelected: " + row.index());
-          final TokenRow tokenRow = row.getTokenRow(true);
-          searchText.setText(tokenRow.getToken());
+          if (!isFiltered()) {
+            final RowBase row = (RowBase) getListAdapter().getItem(position);
+            Log.d(LOG, "onItemSelected: " + row.index());
+            final TokenRow tokenRow = row.getTokenRow(true);
+            searchText.setText(tokenRow.getToken());
+          }
         }
       }
 
@@ -385,7 +391,7 @@ public class DictionaryActivity extends ListActivity {
     searchText.requestFocus();
     Log.d(LOG, "Trying to show soft keyboard.");
     final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-    manager.showSoftInput(searchText, InputMethodManager.SHOW_FORCED);
+    manager.showSoftInput(searchText, InputMethodManager.SHOW_IMPLICIT);
   }
   
   void updateLangButton() {
@@ -472,6 +478,9 @@ public class DictionaryActivity extends ListActivity {
   }
   
   void onUpDownButton(final boolean up) {
+    if (isFiltered()) {
+      return;
+    }
     final int firstVisibleRow = getListView().getFirstVisiblePosition();
     final RowBase row = index.rows.get(firstVisibleRow);
     final TokenRow tokenRow = row.getTokenRow(true);
@@ -490,6 +499,7 @@ public class DictionaryActivity extends ListActivity {
     Log.d(LOG, "onUpDownButton, destIndexEntry=" + dest.token);
     searchText.removeTextChangedListener(searchTextWatcher);
     searchText.setText(dest.token);
+    Selection.moveToRightEdge(searchText.getText(), searchText.getLayout());
     jumpToRow(index.sortedIndexEntries.get(destIndexEntry).startRow);
     searchText.addTextChangedListener(searchTextWatcher);
   }
@@ -513,6 +523,45 @@ public class DictionaryActivity extends ListActivity {
       });
     }
 
+    {
+      final MenuItem aboutDictionary = menu.add(getString(R.string.aboutDictionary));
+      aboutDictionary.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+        public boolean onMenuItemClick(final MenuItem menuItem) {
+          final Context context = getListView().getContext();
+          final Dialog dialog = new Dialog(context);
+          dialog.setContentView(R.layout.about_dictionary_dialog);
+          final TextView textView = (TextView) dialog.findViewById(R.id.text);
+
+          final String name = application.getDictionaryName(dictFile.getName());
+          dialog.setTitle(name);
+          
+          final StringBuilder builder = new StringBuilder();
+          final DictionaryInfo dictionaryInfo = Dictionary.getDictionaryInfo(dictFile);
+          if (dictionaryInfo != null) {
+            builder.append(dictionaryInfo.dictInfo).append("\n\n");
+            builder.append(getString(R.string.dictionaryPath, dictFile.getPath())).append("\n");
+            builder.append(getString(R.string.dictionarySize, dictionaryInfo.uncompressedBytes)).append("\n");
+            builder.append(getString(R.string.dictionaryCreationTime, dictionaryInfo.creationMillis)).append("\n");
+            for (final IndexInfo indexInfo : dictionaryInfo.indexInfos) {
+              builder.append("\n");
+              builder.append(getString(R.string.indexName, indexInfo.shortName)).append("\n");
+              builder.append(getString(R.string.mainTokenCount, indexInfo.mainTokenCount)).append("\n");
+            }
+          } else {
+            builder.append(getString(R.string.invalidDictionary));
+          }
+          textView.setText(builder.toString());
+          
+          dialog.show();
+          final WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
+          layoutParams.width = WindowManager.LayoutParams.FILL_PARENT;
+          layoutParams.height = WindowManager.LayoutParams.FILL_PARENT;
+          dialog.getWindow().setAttributes(layoutParams);
+          return false;
+        }
+      });
+    }
+
     return true;
   }
 
@@ -664,26 +713,26 @@ public class DictionaryActivity extends ListActivity {
     Log.d(LOG, "searchFinished: " + searchOperation + ", searchResult=" + searchResult);
 
     currentSearchOperation = null;
-
     uiHandler.postDelayed(new Runnable() {
       @Override
       public void run() {
         if (currentSearchOperation == null) {
-          jumpToRow(searchResult.startRow);
+          if (searchResult != null) {
+            if (isFiltered()) {
+              clearFiltered();
+            }
+            jumpToRow(searchResult.startRow);
+          } else if (searchOperation.multiWordSearchResult != null) {
+            // Multi-row search....
+            setFiltered(searchOperation);
+          } else {
+            throw new IllegalStateException("This should never happen.");
+          }
         } else {
           Log.d(LOG, "More coming, waiting for currentSearchOperation.");
         }
       }
-    }, 50);
-    
-//    if (!searchResult.success) {
-//      if (vibrator != null) {
-//        vibrator.vibrate(VIBRATE_MILLIS);
-//      }
-//      searchText.setText(searchResult.longestPrefixString);
-//      searchText.setSelection(searchResult.longestPrefixString.length());
-//      return;
-//    }
+    }, 20);
     
   }
   
@@ -692,15 +741,18 @@ public class DictionaryActivity extends ListActivity {
     getListView().setSelected(true);
   }
 
+  static final Pattern WHITESPACE = Pattern.compile("\\s+");
   final class SearchOperation implements Runnable {
     
     final AtomicBoolean interrupted = new AtomicBoolean(false);
     final String searchText;
+    List<String> searchTokens;  // filled in for multiWord.
     final Index index;
     
     long searchStartMillis;
 
     Index.IndexEntry searchResult;
+    List<RowBase> multiWordSearchResult;
     
     boolean done = false;
     
@@ -717,7 +769,13 @@ public class DictionaryActivity extends ListActivity {
     public void run() {
       try {
         searchStartMillis = System.currentTimeMillis();
-        searchResult = index.findInsertionPoint(searchText, interrupted);
+        final String[] searchTokenArray = WHITESPACE.split(searchText);
+        if (searchTokenArray.length == 1) {
+          searchResult = index.findInsertionPoint(searchText, interrupted);
+        } else {
+          searchTokens = Arrays.asList(searchTokenArray);
+          multiWordSearchResult = index.multiWordSearch(searchTokens, interrupted);
+        }
         Log.d(LOG, "searchText=" + searchText + ", searchDuration="
             + (System.currentTimeMillis() - searchStartMillis) + ", interrupted="
             + interrupted.get());
@@ -746,19 +804,29 @@ public class DictionaryActivity extends ListActivity {
   final class IndexAdapter extends BaseAdapter {
     
     final Index index;
+    final List<RowBase> rows;
+    final Set<String> toHighlight;
 
     IndexAdapter(final Index index) {
       this.index = index;
+      rows = index.rows;
+      this.toHighlight = null;
+    }
+
+    IndexAdapter(final Index index, final List<RowBase> rows, final List<String> toHighlight) {
+      this.index = index;
+      this.rows = rows;
+      this.toHighlight = new LinkedHashSet<String>(toHighlight);
     }
 
     @Override
     public int getCount() {
-      return index.rows.size();
+      return rows.size();
     }
 
     @Override
     public RowBase getItem(int position) {
-      return index.rows.get(position);
+      return rows.get(position);
     }
 
     @Override
@@ -768,7 +836,7 @@ public class DictionaryActivity extends ListActivity {
 
     @Override
     public View getView(int position, final View convertView, ViewGroup parent) {
-      final RowBase row = index.rows.get(position);
+      final RowBase row = getItem(position);
       if (row instanceof PairEntry.Row) {
         return getView(position, (PairEntry.Row) row, parent, convertView);
       } else if (row instanceof TokenRow) {
@@ -820,13 +888,15 @@ public class DictionaryActivity extends ListActivity {
         col2.setText(col2Text, TextView.BufferType.SPANNABLE);
         
         // Bold the token instances in col1.
+        final Set<String> toBold = toHighlight != null ? this.toHighlight : Collections.singleton(row.getTokenRow(true).getToken());
         final Spannable col1Spannable = (Spannable) col1.getText();
-        int startPos = 0;
-        final String token = row.getTokenRow(true).getToken();
-        while ((startPos = col1Text.indexOf(token, startPos)) != -1) {
-          col1Spannable.setSpan(new StyleSpan(Typeface.BOLD), startPos,
-              startPos + token.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
-          startPos += token.length();
+        for (final String token : toBold) {
+          int startPos = 0;
+          while ((startPos = col1Text.indexOf(token, startPos)) != -1) {
+            col1Spannable.setSpan(new StyleSpan(Typeface.BOLD), startPos,
+                startPos + token.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+            startPos += token.length();
+          }
         }
         
         createTokenLinkSpans(col1, col1Spannable, col1Text);
@@ -1013,4 +1083,26 @@ public class DictionaryActivity extends ListActivity {
     }
   }
 
+  // --------------------------------------------------------------------------
+  // Filtered results.
+  // --------------------------------------------------------------------------
+
+  boolean isFiltered() {
+    return rowsToShow != null;
+  }
+
+  void setFiltered(final SearchOperation searchOperation) {
+    ((Button) findViewById(R.id.UpButton)).setEnabled(false);
+    ((Button) findViewById(R.id.DownButton)).setEnabled(false);
+    rowsToShow = searchOperation.multiWordSearchResult;
+    setListAdapter(new IndexAdapter(index, rowsToShow, searchOperation.searchTokens));
+  }
+
+  void clearFiltered() {
+    ((Button) findViewById(R.id.UpButton)).setEnabled(true);
+    ((Button) findViewById(R.id.DownButton)).setEnabled(true);
+    setListAdapter(new IndexAdapter(index));
+    rowsToShow = null;
+  }
+
 }
diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java
index c2379ee..eb201c3 100644
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -225,6 +225,7 @@ public class DictionaryApplication extends Application {
     final List<DictionaryInfo> toAddSorted = new ArrayList<DictionaryInfo>();
     final File[] dictDirFiles = DICT_DIR.listFiles();
     for (final File file : dictDirFiles) {
+      // TODO: delete zip files here.
       if (!file.getName().endsWith(".quickdic")) {
         continue;
       }
diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index 1ba06fc..f055b8e 100644
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -221,6 +221,17 @@ public class DictionaryManagerActivity extends ListActivity {
       row.setOrientation(LinearLayout.HORIZONTAL);
       result.addView(row);
 
+      {
+      final TextView textView = new TextView(parent.getContext());
+      final String name = application.getDictionaryName(dictionaryInfo.uncompressedFilename);
+      textView.setText(name);
+      textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 22);
+      row.addView(textView);
+      LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT);
+      layoutParams.weight = 1.0f;
+      textView.setLayoutParams(layoutParams);
+      }
+      
       final boolean updateAvailable = application.updateAvailable(dictionaryInfo);
       final DictionaryInfo downloadable = application.getDownloadable(dictionaryInfo.uncompressedFilename); 
       if ((!application.isDictionaryOnDevice(dictionaryInfo.uncompressedFilename) || updateAvailable) && downloadable != null) {
@@ -242,16 +253,10 @@ public class DictionaryManagerActivity extends ListActivity {
         row.addView(downloadButton);
       } else {
         final ImageView checkMark = new ImageView(parent.getContext());
-        checkMark.setImageResource(android.R.drawable.checkbox_on_background);
+        checkMark.setImageResource(R.drawable.btn_check_buttonless_on);
         row.addView(checkMark);
       }
 
-      final TextView textView = new TextView(parent.getContext());
-      final String name = application.getDictionaryName(dictionaryInfo.uncompressedFilename);
-      textView.setText(name);
-      textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 22);
-      row.addView(textView);
-      
       // Add the information about each index.
       final LinearLayout row2 = new LinearLayout(parent.getContext());
       row2.setOrientation(LinearLayout.HORIZONTAL);
diff --git a/src/com/hughes/android/dictionary/DownloadActivity.java b/src/com/hughes/android/dictionary/DownloadActivity.java
index ce41dd1..513340f 100644
--- a/src/com/hughes/android/dictionary/DownloadActivity.java
+++ b/src/com/hughes/android/dictionary/DownloadActivity.java
@@ -98,7 +98,9 @@ public class DownloadActivity extends Activity {
 
         try {
           final File destFile = new File(dest);
-          destFile.getParentFile().mkdirs();
+          if (destFile.getAbsoluteFile().getParent() != null) {
+            destFile.getAbsoluteFile().getParentFile().mkdirs();
+          }
 
           final File destTmpFile = File.createTempFile("dictionaryDownload", "tmp", destFile
               .getParentFile());
diff --git a/src/com/hughes/android/dictionary/engine/Dictionary.java b/src/com/hughes/android/dictionary/engine/Dictionary.java
index 7dfff64..2deb24f 100644
--- a/src/com/hughes/android/dictionary/engine/Dictionary.java
+++ b/src/com/hughes/android/dictionary/engine/Dictionary.java
@@ -32,7 +32,7 @@ public class Dictionary implements RAFSerializable<Dictionary> {
   
   static final int CACHE_SIZE = 5000;
   
-  static final int CURRENT_DICT_VERSION = 3;
+  static final int CURRENT_DICT_VERSION = 4;
   static final String END_OF_DICTIONARY = "END OF DICTIONARY";
   
   // persisted
@@ -71,13 +71,19 @@ public class Dictionary implements RAFSerializable<Dictionary> {
     dictInfo = raf.readUTF();
     
     // Load the sources, then seek past them, because reading them later disrupts the offset.
-    final RAFList<EntrySource> rafSources = RAFList.create(raf, new EntrySource.Serializer(this), raf.getFilePointer());
-    sources = new ArrayList<EntrySource>(rafSources);
-    raf.seek(rafSources.getEndOffset());
-    
-    pairEntries = CachingList.create(RAFList.create(raf, new PairEntry.Serializer(this), raf.getFilePointer()), CACHE_SIZE);
-    textEntries = CachingList.create(RAFList.create(raf, new TextEntry.Serializer(this), raf.getFilePointer()), CACHE_SIZE);
-    indices = CachingList.createFullyCached(RAFList.create(raf, indexSerializer, raf.getFilePointer()));
+    try {
+      final RAFList<EntrySource> rafSources = RAFList.create(raf, new EntrySource.Serializer(this), raf.getFilePointer());
+      sources = new ArrayList<EntrySource>(rafSources);
+      raf.seek(rafSources.getEndOffset());
+      
+      pairEntries = CachingList.create(RAFList.create(raf, new PairEntry.Serializer(this), raf.getFilePointer()), CACHE_SIZE);
+      textEntries = CachingList.create(RAFList.create(raf, new TextEntry.Serializer(this), raf.getFilePointer()), CACHE_SIZE);
+      indices = CachingList.createFullyCached(RAFList.create(raf, indexSerializer, raf.getFilePointer()));
+    } catch (RuntimeException e) {
+      final IOException ioe = new IOException("RuntimeException loading dictionary");
+      ioe.initCause(e);
+      throw ioe;
+    }
     final String end = raf.readUTF(); 
     if (!end.equals(END_OF_DICTIONARY)) {
       throw new IOException("Dictionary seems corrupt: " + end);
diff --git a/src/com/hughes/android/dictionary/engine/Index.java b/src/com/hughes/android/dictionary/engine/Index.java
index 6107b8b..3c772a1 100644
--- a/src/com/hughes/android/dictionary/engine/Index.java
+++ b/src/com/hughes/android/dictionary/engine/Index.java
@@ -22,12 +22,14 @@ import java.io.PrintStream;
 import java.io.RandomAccessFile;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.EnumMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.regex.Pattern;
 
 import com.hughes.android.dictionary.DictionaryInfo;
 import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
@@ -35,6 +37,7 @@ import com.hughes.util.CachingList;
 import com.hughes.util.raf.RAFList;
 import com.hughes.util.raf.RAFSerializable;
 import com.hughes.util.raf.RAFSerializer;
+import com.hughes.util.raf.SerializableSerializer;
 import com.hughes.util.raf.UniformRAFList;
 import com.ibm.icu.text.Collator;
 import com.ibm.icu.text.Transliterator;
@@ -57,6 +60,9 @@ public final class Index implements RAFSerializable<Index> {
     
   // persisted
   public final List<IndexEntry> sortedIndexEntries;
+  
+  // persisted.
+  public final Set<String> stoplist;
 
   // One big list!
   // Various sub-types.
@@ -69,7 +75,7 @@ public final class Index implements RAFSerializable<Index> {
   
   // --------------------------------------------------------------------------
   
-  public Index(final Dictionary dict, final String shortName, final String longName, final Language sortLanguage, final String normalizerRules, final boolean swapPairEntries) {
+  public Index(final Dictionary dict, final String shortName, final String longName, final Language sortLanguage, final String normalizerRules, final boolean swapPairEntries, final Set<String> stoplist) {
     this.dict = dict;
     this.shortName = shortName;
     this.longName = longName;
@@ -77,6 +83,7 @@ public final class Index implements RAFSerializable<Index> {
     this.normalizerRules = normalizerRules;
     this.swapPairEntries = swapPairEntries;
     sortedIndexEntries = new ArrayList<IndexEntry>();
+    this.stoplist = stoplist;
     rows = new ArrayList<RowBase>();
     
     normalizer = null;
@@ -104,6 +111,11 @@ public final class Index implements RAFSerializable<Index> {
       mainTokenCount = raf.readInt();
     }
     sortedIndexEntries = CachingList.create(RAFList.create(raf, IndexEntry.SERIALIZER, raf.getFilePointer()), CACHE_SIZE);
+    if (dict.dictFileVersion >= 4) {
+      stoplist = new SerializableSerializer<Set<String>>().read(raf);
+    } else {
+      stoplist = Collections.emptySet();
+    }
     rows = CachingList.create(UniformRAFList.create(raf, new RowBase.Serializer(this), raf.getFilePointer()), CACHE_SIZE);
   }
   
@@ -118,6 +130,7 @@ public final class Index implements RAFSerializable<Index> {
       raf.writeInt(mainTokenCount);
     }
     RAFList.write(raf, sortedIndexEntries, IndexEntry.SERIALIZER);
+    new SerializableSerializer<Set<String>>().write(raf, stoplist);
     UniformRAFList.write(raf, (Collection<RowBase>) rows, new RowBase.Serializer(this), 5);
   }
 
@@ -233,57 +246,107 @@ public final class Index implements RAFSerializable<Index> {
     return new DictionaryInfo.IndexInfo(shortName, sortedIndexEntries.size(), mainTokenCount);
   }
   
-  final List<RowBase> multiWordSearch(final List<String> searchTokens, final AtomicBoolean interrupted) {
+  public final List<RowBase> multiWordSearch(final List<String> searchTokens, final AtomicBoolean interrupted) {
     final List<RowBase> result = new ArrayList<RowBase>();
-
-    // Heuristic: use the longest searchToken as the base.
-    String searchToken = null;
+    
+    final Set<String> normalizedNonStoplist = new LinkedHashSet<String>();
+    
+    final StringBuilder regex = new StringBuilder();
     for (int i = 0; i < searchTokens.size(); ++i) {
-      if (interrupted.get()) { return null; }
+      final String searchToken = searchTokens.get(i);
       final String normalized = normalizeToken(searchTokens.get(i));
       // Normalize them all.
       searchTokens.set(i, normalized);
-      if (searchToken == null || normalized.length() > searchToken.length()) {
-        searchToken = normalized;
+
+      if (!stoplist.contains(searchToken)) {
+        normalizedNonStoplist.add(normalized);
       }
+
+      if (regex.length() > 0) {
+        regex.append("[\\s]*");
+      }
+      regex.append(Pattern.quote(normalized));
     }
+    final Pattern pattern = Pattern.compile(regex.toString());
     
-    final int insertionPointIndex = findInsertionPointIndex(searchToken, interrupted);
-    if (insertionPointIndex == -1 || interrupted.get()) {
-      return null;
-    }
-    
+
     // The things that match.
-    // TODO: use a key
-    final Map<RowMatchType,Set<RowBase>> matches = new EnumMap<RowMatchType, Set<RowBase>>(RowMatchType.class);
+    final Map<RowMatchType,List<RowBase>> matches = new EnumMap<RowMatchType, List<RowBase>>(RowMatchType.class);
     for (final RowMatchType rowMatchType : RowMatchType.values()) {
-      matches.put(rowMatchType, new LinkedHashSet<RowBase>());
+      if (rowMatchType != RowMatchType.NO_MATCH) {
+        matches.put(rowMatchType, new ArrayList<RowBase>());
+      }
     }
     
-    for (int index = insertionPointIndex; index < sortedIndexEntries.size(); ++index) {
+    int bestRowCount = Integer.MAX_VALUE;
+    String bestToken = null;
+    for (final String searchToken : normalizedNonStoplist) {
+      final int insertionPointIndex = findInsertionPointIndex(searchToken, interrupted);
       if (interrupted.get()) { return null; }
-      final IndexEntry indexEntry = sortedIndexEntries.get(index);
-      if (!indexEntry.normalizedToken.equals(searchToken)) {
-        break;
+      if (insertionPointIndex == -1) {
+        // If we've typed "train statio", don't fail just because the index
+        // doesn't contain "statio".
+        continue;
       }
-      
-      for (int rowIndex = indexEntry.startRow; rowIndex < indexEntry.startRow + indexEntry.numRows; ++rowIndex) {
+
+      int rowCount = 0;
+      for (int index = insertionPointIndex; index < sortedIndexEntries.size(); ++index) {
         if (interrupted.get()) { return null; }
-        final RowBase row = rows.get(rowIndex);
-        final RowMatchType matchType = row.matches(searchTokens, normalizer, swapPairEntries);
-        if (matchType != RowMatchType.NO_MATCH) {
-          matches.get(matchType).add(row);
+        final IndexEntry indexEntry = sortedIndexEntries.get(index);
+        if (!indexEntry.normalizedToken.equals(searchToken)) {
+          break;
         }
+        rowCount += indexEntry.numRows;
+      }
+      
+      //System.out.println(searchToken + ", rowCount=" + rowCount);
+      if (rowCount < bestRowCount) {
+        bestRowCount = rowCount;
+        bestToken = searchToken;
       }
     }
     
-    for (final Set<RowBase> rows : matches.values()) {
-      result.addAll(rows);
+    final String searchToken = bestToken != null ? bestToken : searchTokens.get(0);
+    
+//    for (final String searchToken : searchTokens) {
+    
+    final int insertionPointIndex = findInsertionPointIndex(searchToken, interrupted);
+    if (interrupted.get()) { return null; }
+
+      
+//      System.out.println("Searching token: " + searchToken);
+
+  
+      for (int index = insertionPointIndex; index < sortedIndexEntries.size(); ++index) {
+        if (interrupted.get()) { return null; }
+        final IndexEntry indexEntry = sortedIndexEntries.get(index);
+        if (!indexEntry.normalizedToken.equals(searchToken)) {
+          break;
+        }
+
+//        System.out.println("Searching indexEntry: " + indexEntry.token);
+
+        for (int rowIndex = indexEntry.startRow; rowIndex < indexEntry.startRow + indexEntry.numRows; ++rowIndex) {
+          if (interrupted.get()) { return null; }
+          final RowBase row = rows.get(rowIndex);
+          final RowMatchType matchType = row.matches(searchTokens, pattern, normalizer(), swapPairEntries);
+          if (matchType != RowMatchType.NO_MATCH) {
+            matches.get(matchType).add(row);
+          }
+        }
+      }
+//    }  // searchTokens
+  
+    final RowBase.LengthComparator lengthComparator = new RowBase.LengthComparator(swapPairEntries);
+    for (final Collection<RowBase> rows : matches.values()) {
+      final List<RowBase> ordered = new ArrayList<RowBase>(rows);
+      Collections.sort(ordered, lengthComparator);
+      result.addAll(ordered);
     }
     
     return result;
   }
-
+  
   private String normalizeToken(final String searchToken) {
     if (TransliteratorManager.init(null)) {
       final Transliterator normalizer = normalizer();
diff --git a/src/com/hughes/android/dictionary/engine/Language.java b/src/com/hughes/android/dictionary/engine/Language.java
index 74130c1..c8c7938 100644
--- a/src/com/hughes/android/dictionary/engine/Language.java
+++ b/src/com/hughes/android/dictionary/engine/Language.java
@@ -91,8 +91,17 @@ public class Language {
     isoCodeToResourceId.put("CI", R.string.CI);
     isoCodeToResourceId.put("YI", R.string.YI);
     isoCodeToResourceId.put("ZU", R.string.ZU);
-    
-    
+
+    isoCodeToResourceId.put("AZ", R.string.AZ);
+    isoCodeToResourceId.put("EU", R.string.EU);
+    isoCodeToResourceId.put("BR", R.string.BR);
+    isoCodeToResourceId.put("MR", R.string.MR);
+    isoCodeToResourceId.put("FO", R.string.FO);
+    isoCodeToResourceId.put("GL", R.string.GL);
+    isoCodeToResourceId.put("HT", R.string.HT);
+    isoCodeToResourceId.put("LB", R.string.LB);
+    isoCodeToResourceId.put("MK", R.string.MK);
+
     // Hack to allow lower-case ISO codes to work:
     for (final String isoCode : new ArrayList<String>(isoCodeToResourceId.keySet())) {
       isoCodeToResourceId.put(isoCode.toLowerCase(), isoCodeToResourceId.get(isoCode));
@@ -143,10 +152,16 @@ public class Language {
    */
   private static final String rtlChars =
       "\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC";
-  private static final Pattern RTL_TOKEN = Pattern.compile("[" + rtlChars + "]");
+
+  private static final String puncChars =
+      "\\[\\]\\(\\)\\{\\}\\=";
+
+  private static final Pattern RTL_LEFT_BOUNDARY = Pattern.compile("(["+ puncChars +"])([" + rtlChars + "])");
+  private static final Pattern RTL_RIGHT_BOUNDARY = Pattern.compile("([" + rtlChars + "])(["+ puncChars +"])");
   
-  public static String fixBidiText(final String text) {
-    // TODO: fix me!, use me!
+  public static String fixBidiText(String text) {
+//    text = RTL_LEFT_BOUNDARY.matcher(text).replaceAll("$1\u200e $2");
+//    text = RTL_RIGHT_BOUNDARY.matcher(text).replaceAll("$1 \u200e$2");
     return text;
   }
   
diff --git a/src/com/hughes/android/dictionary/engine/PairEntry.java b/src/com/hughes/android/dictionary/engine/PairEntry.java
index e836a5c..02d72b9 100644
--- a/src/com/hughes/android/dictionary/engine/PairEntry.java
+++ b/src/com/hughes/android/dictionary/engine/PairEntry.java
@@ -125,7 +125,7 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
     }
 
     @Override
-    public RowMatchType matches(final List<String> searchTokens, final Transliterator normalizer, final boolean swapPairEntries) {
+    public RowMatchType matches(final List<String> searchTokens, final Pattern orderedMatchPattern, final Transliterator normalizer, final boolean swapPairEntries) {
       final int side = swapPairEntries ? 1 : 0;
       final List<Pair> pairs = getEntry().pairs;
       final String[] pairSides = new String[pairs.size()];
@@ -142,21 +142,23 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
           return RowMatchType.NO_MATCH;
         }
       }
-      final StringBuilder regex = new StringBuilder();
-      for (final String searchToken : searchTokens) {
-        if (regex.length() > 0) {
-          regex.append("[\\s]*");
-        }
-        regex.append(Pattern.quote(searchToken));
-      }
-      final Pattern pattern = Pattern.compile(regex.toString());
       for (final String pairSide : pairSides) {
-        if (pattern.matcher(pairSide).matches()) {
+        if (orderedMatchPattern.matcher(pairSide).find()) {
           return RowMatchType.ORDERED_MATCH;
         }
       }
       return RowMatchType.BAG_OF_WORDS_MATCH;
     }
+    
+    @Override
+    public int getSideLength(boolean swapPairEntries) {
+      int result = 0;
+      final int side = swapPairEntries ? 1 : 0;
+      for (final Pair pair : getEntry().pairs) {
+        result += pair.get(side).length();
+      }
+      return result;
+    }
   
   }
 
diff --git a/src/com/hughes/android/dictionary/engine/RowBase.java b/src/com/hughes/android/dictionary/engine/RowBase.java
index e84eb73..8896c88 100644
--- a/src/com/hughes/android/dictionary/engine/RowBase.java
+++ b/src/com/hughes/android/dictionary/engine/RowBase.java
@@ -17,7 +17,9 @@ package com.hughes.android.dictionary.engine;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.RandomAccessFile;
+import java.util.Comparator;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import com.hughes.util.IndexedObject;
 import com.hughes.util.raf.RAFListSerializer;
@@ -50,6 +52,34 @@ public abstract class RowBase extends IndexedObject {
     this.index = index;
     this.referenceIndex = referenceIndex;
   }
+  
+  static final class RowKey {
+    final Class<? extends RowBase> rowClass;
+    final int referenceIndex;
+    
+    private RowKey(Class<? extends RowBase> rowClass, int referenceIndex) {
+      this.rowClass = rowClass;
+      this.referenceIndex = referenceIndex;
+    }
+    
+    @Override
+    public boolean equals(Object o) {
+      if (!(o instanceof RowKey)) {
+        return false;
+      }
+      final RowKey that = (RowKey) o;
+      return this.referenceIndex == that.referenceIndex && this.rowClass.equals(that.rowClass);
+    }
+    
+    @Override
+    public int hashCode() {
+      return rowClass.hashCode() + referenceIndex;
+    }
+  }
+  
+  public RowKey getRowKey() {
+    return new RowKey(this.getClass(), referenceIndex);
+  }
 
   /**
    * @return the TokenRow that this row is "filed under".
@@ -100,7 +130,7 @@ public abstract class RowBase extends IndexedObject {
 
   public abstract String getRawText(final boolean compact);
   
-  public abstract RowMatchType matches(final List<String> searchTokens, final Transliterator normalizer, boolean swapPairEntries);
+  public abstract RowMatchType matches(final List<String> searchTokens, final Pattern orderedMatch, final Transliterator normalizer, boolean swapPairEntries);
 
   // RowBase must manage "disk-based" polymorphism.  All other polymorphism is
   // dealt with in the normal manner.
@@ -139,4 +169,24 @@ public abstract class RowBase extends IndexedObject {
     }
   }
   
+  public static final class LengthComparator implements Comparator<RowBase> {
+    
+    final boolean swapPairEntries;
+
+    public LengthComparator(boolean swapPairEntries) {
+      this.swapPairEntries = swapPairEntries;
+    }
+
+    @Override
+    public int compare(RowBase row1, RowBase row2) {
+      final int l1 = row1.getSideLength(swapPairEntries);
+      final int l2 = row2.getSideLength(swapPairEntries);
+      return l1 < l2 ? -1 : l1 == l2 ? 0 : 1;
+    }
+  }
+
+  public int getSideLength(boolean swapPairEntries) {
+    return getRawText(false).length();
+  }
+  
 }
diff --git a/src/com/hughes/android/dictionary/engine/TextEntry.java b/src/com/hughes/android/dictionary/engine/TextEntry.java
index ec5bc39..8d878dd 100644
--- a/src/com/hughes/android/dictionary/engine/TextEntry.java
+++ b/src/com/hughes/android/dictionary/engine/TextEntry.java
@@ -18,6 +18,7 @@ import java.io.IOException;
 import java.io.PrintStream;
 import java.io.RandomAccessFile;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import com.hughes.util.raf.RAFSerializable;
 import com.hughes.util.raf.RAFSerializer;
@@ -86,7 +87,7 @@ public class TextEntry extends AbstractEntry implements RAFSerializable<TextEntr
     }
     
     @Override
-    public RowMatchType matches(List<String> searchTokens, Transliterator normalizer, boolean swapPairEntries) {
+    public RowMatchType matches(final List<String> searchTokens, final Pattern orderedMatchPattern, Transliterator normalizer, boolean swapPairEntries) {
       return null;
     }
   }
diff --git a/src/com/hughes/android/dictionary/engine/TokenRow.java b/src/com/hughes/android/dictionary/engine/TokenRow.java
index 7b7736c..29a23bc 100644
--- a/src/com/hughes/android/dictionary/engine/TokenRow.java
+++ b/src/com/hughes/android/dictionary/engine/TokenRow.java
@@ -18,6 +18,7 @@ import java.io.IOException;
 import java.io.PrintStream;
 import java.io.RandomAccessFile;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import com.ibm.icu.text.Transliterator;
 
@@ -65,7 +66,7 @@ public class TokenRow extends RowBase {
   }
 
   @Override
-  public RowMatchType matches(List<String> searchTokens, Transliterator normalizer, boolean swapPairEntries) {
+  public RowMatchType matches(List<String> searchTokens, final Pattern orderedMatchPattern, Transliterator normalizer, boolean swapPairEntries) {
     return RowMatchType.NO_MATCH;
   }
 
diff --git a/src/com/hughes/android/util/PersistentObjectCache.java b/src/com/hughes/android/util/PersistentObjectCache.java
index 262e599..2a3a527 100644
--- a/src/com/hughes/android/util/PersistentObjectCache.java
+++ b/src/com/hughes/android/util/PersistentObjectCache.java
@@ -22,7 +22,11 @@ import java.io.ObjectOutputStream;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import com.hughes.android.dictionary.DictionaryApplication;
+
+import android.app.Application;
 import android.content.Context;
+import android.os.Environment;
 import android.util.Log;
 
 public class PersistentObjectCache {
@@ -70,9 +74,10 @@ public class PersistentObjectCache {
   }
 
   private PersistentObjectCache(final Context context) {
-    dir = context.getFilesDir();
+    final File filesDir = context.getFilesDir();
+    dir = filesDir != null ? filesDir : Environment.getExternalStorageDirectory();
     if (dir == null) {
-      throw new RuntimeException("context.getFilesDir() == null");
+      throw new RuntimeException("context.getFilesDir() == " + context.getFilesDir() + ", Environment.getExternalStorageDirectory()=" + Environment.getExternalStorageDirectory());
     }
   }
   
-- 
2.43.0