v2.9.3.1

400_xowa/.classpath

@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src_060_utl"/>
-	<classpathentry kind="src" path="src_120_wiki"/>
-	<classpathentry kind="src" path="src_140_lang"/>
-	<classpathentry kind="src" path="src_200_bldr"/>
-	<classpathentry kind="src" path="src_210_bldr_core"/>
-	<classpathentry kind="src" path="xtn"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/100_core"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/150_gfui"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/100_core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/140_dbs"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/150_gfui"/>
 	<classpathentry kind="lib" path="lib/luaj_xowa.jar"/>
 	<classpathentry kind="lib" path="lib/jtidy_xowa.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

400_xowa/src/gplx/core/brys/Bit_.java

@@ -30,6 +30,7 @@ public class Bit_ {
 		rv[i] = bits[i] ? Byte_ascii.Num_1 : Byte_ascii.Num_0;
     		return String_.new_a7(rv);
 	}
+	public static int Get_flag(int i) {return Base2_ary[i];}
 	public static int[] Bld_pow_ary(int... seg_ary) {
 		int seg_ary_len = seg_ary.length;
 		int pow = 0;

400_xowa/src/gplx/core/btries/Btrie_u8_mgr_tst.java

@@ -45,9 +45,9 @@ public class Btrie_u8_mgr_tst {
 	}
 	@Test  public void Uft8_asymmetric() {
 		fxt.Init_add(Bry_.new_u8("İ")	, "1");
-		fxt.Test_match("İ"	, "1");				// exact=y; İ = Bry_.ints_(196,176)
-		fxt.Test_match("i"	, "1");				// lower=y; i = Bry_.ints_(105)
-		fxt.Test_match("I"	, null);			// upper=n; I = Bry_.ints_( 73); see Btrie_u8_itm and rv.asymmetric_bry
+		fxt.Test_match("İ"	, "1");				// exact=y; İ = Bry_.new_ints(196,176)
+		fxt.Test_match("i"	, "1");				// lower=y; i = Bry_.new_ints(105)
+		fxt.Test_match("I"	, null);			// upper=n; I = Bry_.new_ints( 73); see Btrie_u8_itm and rv.asymmetric_bry
 
 		fxt.Clear();
 		fxt.Init_add(Bry_.new_u8("i")	, "1");

400_xowa/src/gplx/core/caches/GfoCacheMgr_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.core.caches; import gplx.*; import gplx.core.*;
 import org.junit.*;
 public class GfoCacheMgr_tst {
 	@Before public void init() {fxt = new GfoCacheMgr_fxt();} GfoCacheMgr_fxt fxt;

400_xowa/src/gplx/core/caches/Gfo_cache_mgr.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.core.caches; import gplx.*; import gplx.core.*;
 import gplx.core.consoles.*;
 public class Gfo_cache_mgr {
 	private Ordered_hash hash = Ordered_hash_.new_bry_();
@@ -26,12 +26,12 @@ public class Gfo_cache_mgr {
 	public int Count() {return hash.Count();}
 	public void Clear() {hash.Clear(); recent.Clear(); cur_size = 0;}
 	@gplx.Internal protected Object Get_at(int i) {
-		Gfo_cache_itm rv = (Gfo_cache_itm)hash.Get_at(i);
+		Gfo_cache_data rv = (Gfo_cache_data)hash.Get_at(i);
 		return rv.Val();
 	}
 	public Object Get_by_key(byte[] key) {
 		Object o = hash.Get_by(key); if (o == null) return null;
-		Gfo_cache_itm rv = (Gfo_cache_itm)o;
+		Gfo_cache_data rv = (Gfo_cache_data)o;
 		rv.Timestamp_update();
 		Object recent_itm = recent.Get_by(key);
 		if (recent_itm == null) recent.Add(key, rv);
@@ -39,7 +39,7 @@ public class Gfo_cache_mgr {
 	}
 	public void Del(byte[] key) {
 		Object o = hash.Get_by(key); if (o == null) return;
-		Gfo_cache_itm itm = (Gfo_cache_itm)o;
+		Gfo_cache_data itm = (Gfo_cache_data)o;
 		cur_size -= itm.Size();
 		hash.Del(itm.Key());
 		itm.Rls();
@@ -51,7 +51,7 @@ public class Gfo_cache_mgr {
 		if (o == null)
 			Add(key, val, size);
 		else {
-			Gfo_cache_itm itm = (Gfo_cache_itm)o;
+			Gfo_cache_data itm = (Gfo_cache_data)o;
 			cur_size -= itm.Size();
 			cur_size += size;
 			itm.Replace(val, size);
@@ -61,14 +61,14 @@ public class Gfo_cache_mgr {
 //			if (cur_size + size > 600000000) ReduceCache();
 		cur_size += size;
 //			++cur_size;
-		Gfo_cache_itm itm = new Gfo_cache_itm(key, val, size);
+		Gfo_cache_data itm = new Gfo_cache_data(key, val, size);
 		hash.Add(key, itm);
 	}
 	public void Reduce_recent() {
 //			Console_adp__sys.I.WriteLine("reducing");
 		int len = recent.Count();
 		for (int i = 0; i < len; i++) {
-			Gfo_cache_itm itm = (Gfo_cache_itm)recent.Get_at(i);
+			Gfo_cache_data itm = (Gfo_cache_data)recent.Get_at(i);
 			itm.Rls();	// releases root
 		}
 		recent.Clear();
@@ -80,7 +80,7 @@ public class Gfo_cache_mgr {
 //			List_adp deleted = List_adp_.new_();
 //			int deleted_size = 0, deleted_count = 0;
 //			for (int i = 0; i < len; i++) {
-//				Gfo_cache_itm itm = (Gfo_cache_itm)hash.Get_at(i);
+//				Gfo_cache_data itm = (Gfo_cache_data)hash.Get_at(i);
 //				int new_deleted_size = deleted_size + 1;//itm.Size();
 //				if (new_deleted_size > 4000 && deleted_count > 0) break;
 //				deleted.Add(itm);
@@ -89,7 +89,7 @@ public class Gfo_cache_mgr {
 //			}
 //			len = deleted.Count();
 //			for (int i = 0; i < len; i++) {
-//				Gfo_cache_itm itm = (Gfo_cache_itm)deleted.Get_at(i);
+//				Gfo_cache_data itm = (Gfo_cache_data)deleted.Get_at(i);
 //				cur_size --;
 //				hash.Del(bry_ref.Val_(itm.Key()));
 //				itm.Rls();
@@ -98,21 +98,21 @@ public class Gfo_cache_mgr {
 
 		int len = hash.Count();
 		for (int i = 0; i < len; i++) {
-			Gfo_cache_itm itm = (Gfo_cache_itm)hash.Get_at(i);
+			Gfo_cache_data itm = (Gfo_cache_data)hash.Get_at(i);
 //				hash.Del(bry_ref.Val_(itm.Key()));
 			itm.Rls();
 		}
 	}
 }
-class Gfo_cache_itm implements gplx.CompareAble, RlsAble {
-	public Gfo_cache_itm(byte[] key, RlsAble val, int size) {this.key = key; this.val = val; this.size = size; this.timestamp = Env_.TickCount();}
+class Gfo_cache_data implements gplx.CompareAble, RlsAble {
+	public Gfo_cache_data(byte[] key, RlsAble val, int size) {this.key = key; this.val = val; this.size = size; this.timestamp = Env_.TickCount();}
 	public byte[] Key() {return key;} private byte[] key;
 	public RlsAble Val() {return val;} private RlsAble val;
 	public int Size() {return size;} private int size;
 	public void Replace(RlsAble val, int size) {this.val = val; this.size = size;}
 	public long Timestamp() {return timestamp;} public void Timestamp_update() {timestamp = Env_.TickCount();} private long timestamp;
 	public int compareTo(Object obj) {
-		Gfo_cache_itm comp = (Gfo_cache_itm)obj;
+		Gfo_cache_data comp = (Gfo_cache_data)obj;
 		return Long_.Compare(timestamp, comp.timestamp);
 	}
 	public void Rls() {

400_xowa/src/gplx/core/caches/Gfo_cache_mgr_base.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.cache; import gplx.*;
+package gplx.core.caches; import gplx.*; import gplx.core.*;
 public class Gfo_cache_mgr_base {
 	private Ordered_hash hash = Ordered_hash_.new_bry_();
 	public int Compress_max() {return compress_max;} public void Compress_max_(int v) {compress_max = v;} private int compress_max = 16;

400_xowa/src/gplx/core/caches/Gfo_cache_mgr_bry.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.cache; import gplx.*;
+package gplx.core.caches; import gplx.*; import gplx.core.*;
 import gplx.core.primitives.*;
 public class Gfo_cache_mgr_bry extends Gfo_cache_mgr_base {
 	public Object Get_or_null(byte[] key) {return Base_get_or_null(key);}
@@ -38,7 +38,7 @@ class Gfo_cache_itm_comparer implements gplx.lists.ComparerAble {
 	public static final Gfo_cache_itm_comparer Touched_asc = new Gfo_cache_itm_comparer(); 
 }
 class Io_url_exists_mgr {
-	private gplx.cache.Gfo_cache_mgr_bry cache_mgr = new gplx.cache.Gfo_cache_mgr_bry();
+	private gplx.core.caches.Gfo_cache_mgr_bry cache_mgr = new gplx.core.caches.Gfo_cache_mgr_bry();
 	public Io_url_exists_mgr() {
 		cache_mgr.Compress_max_(Int_.Max_value);
 	}

400_xowa/src/gplx/core/consoles/App_cmd_arg.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.core.consoles; import gplx.*; import gplx.core.*;
 public class App_cmd_arg {
 	App_cmd_arg(byte tid, byte val_tid, String key, boolean reqd) {this.tid = tid; this.val_tid = val_tid; this.key = key; this.reqd = reqd;}
 	public byte Tid() {return tid;} private byte tid;

400_xowa/src/gplx/core/consoles/App_cmd_mgr.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.core.consoles; import gplx.*; import gplx.core.*;
 import gplx.core.strings.*;
 public class App_cmd_mgr {
 	private Ordered_hash expd_args = Ordered_hash_.new_(), actl_args = Ordered_hash_.new_(); 

400_xowa/src/gplx/core/consoles/App_cmd_mgr_tst.java

@@ -15,8 +15,8 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
-import org.junit.*;
+package gplx.core.consoles; import gplx.*; import gplx.core.*;
+import org.junit.*; import gplx.core.tests.*;
 public class App_cmd_mgr_tst {
 	App_cmd_mgr_fxt fxt = new App_cmd_mgr_fxt();
 	@Before public void init() {fxt.Clear();}

400_xowa/src/gplx/core/flds/Gfo_fld_rdr.java

@@ -54,7 +54,7 @@ public class Gfo_fld_rdr extends Gfo_fld_base {
 		f += (data[fld_bgn + 16] - Byte_ascii.Num_0) *  100;
 		f += (data[fld_bgn + 17] - Byte_ascii.Num_0) *   10;
 		f += (data[fld_bgn + 18] - Byte_ascii.Num_0);
-		if (data[fld_bgn + 19] != fld_dlm) throw Err_.new_wo_type("csv date is invalid", "txt", String_.new_u8_by_len(data, fld_bgn, 20));
+		if (data[fld_bgn + 19] != fld_dlm) throw Err_.new_wo_type("csv date is invalid", "txt", String_.new_u8__by_len(data, fld_bgn, 20));
 		fld_end = pos + 20;
 		pos = fld_end + 1; ++fld_idx;
 		return DateAdp_.new_(y, M, d, H, m, s, f);

400_xowa/src/gplx/core/intls/Gfo_app.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.intl; import gplx.*;
+package gplx.core.intls; import gplx.*; import gplx.core.*;
 public class Gfo_app {
 	public Gfo_i18n_mgr I18n_mgr() {return i18n_mgr;} private Gfo_i18n_mgr i18n_mgr = new Gfo_i18n_mgr();
 }

400_xowa/src/gplx/core/intls/Gfo_i18n_itm.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.intl; import gplx.*;
+package gplx.core.intls; import gplx.*; import gplx.core.*;
 class Gfo_i18n_itm {
 	public Gfo_i18n_itm(int src, byte[] key, byte[] val, boolean val_fmt_exists, Gfo_i18n_val_cmd val_cmd) {
 		this.src = src; this.key = key; this.val = val; this.val_fmt_exists = val_fmt_exists; this.val_cmd = val_cmd;

400_xowa/src/gplx/core/intls/Gfo_i18n_mgr.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.intl; import gplx.*;
+package gplx.core.intls; import gplx.*; import gplx.core.*;
 public class Gfo_i18n_mgr {
 	public String Dflt() {return dflt;} private String dflt = "en";
 	public Gfo_i18n_mgr Add_txt_dflt(String key, String val) {return this;}

400_xowa/src/gplx/core/intls/Gfo_i18n_val_cmd.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.intl; import gplx.*;
+package gplx.core.intls; import gplx.*; import gplx.core.*;
 interface Gfo_i18n_val_cmd {
 	byte[] Process(int src, byte[] key, byte[] val);
 }

400_xowa/src/gplx/core/intls/String_surrogate_utl.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.intl; import gplx.*;
+package gplx.core.intls; import gplx.*; import gplx.core.*;
 public class String_surrogate_utl {
 	public int Byte_pos() {return byte_pos;} int byte_pos;
 	public int Count_surrogates__char_idx(byte[] src, int src_len, int byte_bgn, int char_idx)				{return Count_surrogates(src, src_len, byte_bgn, Bool_.Y, char_idx);}	
@@ -27,7 +27,7 @@ public class String_surrogate_utl {
 			if (	stop_idx == (stop_idx_is_char ? char_count : codepoint_count)		// requested # of chars found
 				||	byte_pos >= src_len													// eos reached; DATE:2014-09-02
 				) return codepoint_count - char_count;
-			int char_len_in_bytes = gplx.intl.Utf8_.Len_of_char_by_1st_byte(src[byte_pos]);
+			int char_len_in_bytes = gplx.core.intls.Utf8_.Len_of_char_by_1st_byte(src[byte_pos]);
 			++char_count;												// char_count always incremented by 1
 			codepoint_count += (char_len_in_bytes == 4) ? 2 : 1;		// codepoint_count incremented by 2 if surrogate pair; else 1
 			byte_pos += char_len_in_bytes;

400_xowa/src/gplx/core/intls/String_surrogate_utl_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.intl; import gplx.*;
+package gplx.core.intls; import gplx.*; import gplx.core.*;
 import org.junit.*;
 public class String_surrogate_utl_tst {
 	@Before public void init() {fxt.Clear();} private String_surrogate_utl_fxt fxt = new String_surrogate_utl_fxt();

400_xowa/src/gplx/core/lists/StatRng.java

@@ -15,8 +15,8 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
-class StatRng_fxt {
+package gplx.core.lists; import gplx.*; import gplx.core.*;
+class StatRng_fxt {	// UNUSED:useful for stat processing
 	StatRng rng;
 	public StatRng_fxt ini_(int lo_ary_len, int hi_ary_len, int... slot_hi_ary) {
 		rng = new StatRng(lo_ary_len, hi_ary_len, slot_hi_ary);

400_xowa/src/gplx/core/lists/StatRng_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.core.lists; import gplx.*; import gplx.core.*;
 import org.junit.*;
 public class StatRng_tst {
 //		Mwl_parser_fxt fx = new Mwl_parser_fxt(); Pf_func_lang_rsc rsc = Pf_func_lang_rsc._;

400_xowa/src/gplx/core/net/Gfo_inet_conn.java

@@ -18,6 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.core.net; import gplx.*; import gplx.core.*;
 public interface Gfo_inet_conn {
 	void		Clear();
-	void		Upload_data(byte[] url, byte[] data);
-	byte[]		Download_data(byte[] url);
+	void		Upload_by_bytes(String url, byte[] data);
+	byte[]		Download_as_bytes_or_null(String url);	// return null instead of throwing exception
 }

400_xowa/src/gplx/core/net/Gfo_inet_conn_.java

@@ -17,18 +17,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.core.net; import gplx.*; import gplx.core.*;
 public class Gfo_inet_conn_ {
-	public static Gfo_inet_conn new_mem_hash() {return new Gfo_inet_conn__mem__hash();}
-	public static Gfo_inet_conn new_mem_pile() {return new Gfo_inet_conn__mem__pile();}
+	public static Gfo_inet_conn new_http()		{return new Gfo_inet_conn__http();}
+	public static Gfo_inet_conn new_mem_hash()	{return new Gfo_inet_conn__mem__hash();}
+	public static Gfo_inet_conn new_mem_pile()	{return new Gfo_inet_conn__mem__pile();}
 }
 class Gfo_inet_conn__mem__hash implements Gfo_inet_conn {
 	private final Hash_adp_bry hash = Hash_adp_bry.cs();
 	public void		Clear() {hash.Clear();}
-	public void		Upload_data(byte[] url, byte[] data) {hash.Add(url, data);}
-	public byte[]	Download_data(byte[] url) {return (byte[])hash.Get_by(url);}
+	public void		Upload_by_bytes(String url, byte[] data) {hash.Add(url, data);}
+	public byte[]	Download_as_bytes_or_null(String url) {return (byte[])hash.Get_by(url);}
 }
 class Gfo_inet_conn__mem__pile implements Gfo_inet_conn {
 	private final List_adp pile = List_adp_.new_();
 	public void		Clear() {pile.Clear();}
-	public void		Upload_data(byte[] url, byte[] data) {pile.Add(data);}
-	public byte[]	Download_data(byte[] url) {return (byte[])List_adp_.Pop_last(pile);}
+	public void		Upload_by_bytes(String url, byte[] data) {pile.Add(data);}
+	public byte[]	Download_as_bytes_or_null(String url) {return (byte[])List_adp_.Pop_last(pile);}
 }

400_xowa/src/gplx/core/net/Gfo_inet_conn__http.java

@@ -15,12 +15,14 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa.langs.vnts; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*;
-public class Vnt_mnu_grp {
-	private final Ordered_hash list = Ordered_hash_.new_bry_();
-	public int Len() {return list.Count();}
-	public boolean Has(byte[] key) {return list.Has(key);}
-	public Vnt_mnu_itm Get_at(int i) {return (Vnt_mnu_itm)list.Get_at(i);}
-	public void Add(Vnt_mnu_itm itm) {list.Add_if_dupe_use_1st(itm.Key(), itm);}
-	public Vnt_mnu_itm Get_by(byte[] key) {return (Vnt_mnu_itm)list.Get_by(key);}
+package gplx.core.net; import gplx.*; import gplx.core.*;
+import gplx.ios.*;
+class Gfo_inet_conn__http implements Gfo_inet_conn {
+	private final IoEngine_xrg_downloadFil downloader = IoEngine_xrg_downloadFil.new_("", Io_url_.Empty);
+	public void		Clear()										{throw Err_.new_unsupported();}
+	public void		Upload_by_bytes(String url, byte[] data)	{throw Err_.new_unsupported();}
+	public byte[]	Download_as_bytes_or_null(String url) {
+		try {return downloader.Exec_as_bry(url);}
+		catch (Exception e) {Err_.Noop(e); return null;}
+	}
 }

400_xowa/src/gplx/core/net/Gfo_qarg_mgr.java

@@ -16,6 +16,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.core.net; import gplx.*; import gplx.core.*;
+import gplx.langs.htmls.encoders.*;
 public class Gfo_qarg_mgr {
 	private final List_adp list = List_adp_.new_();
 	private final Hash_adp hash = Hash_adp_bry.cs();

400_xowa/src/gplx/core/net/Gfo_url_parser.java

@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.core.net; import gplx.*; import gplx.core.*;
-import gplx.core.primitives.*; import gplx.core.btries.*;
+import gplx.core.primitives.*; import gplx.core.btries.*; import gplx.langs.htmls.encoders.*;
 public class Gfo_url_parser {
 	private final Btrie_slim_mgr protocols = Btrie_slim_mgr.ci_a7();	// ASCII:url_protocol; EX:"http:", "ftp:", etc
 	private final Bry_ary segs_ary = new Bry_ary(4), qargs = new Bry_ary(4);
@@ -46,7 +46,7 @@ public class Gfo_url_parser {
 			rel = true;
 		}
 		if (!rel) {	// search for ":"; NOTE: only search if not rel; i.e.: "//"
-			int colon_pos = Bry_finder.Find_fwd(src, Byte_ascii.Colon, pos, src_end);	// no colon found; EX: "//a.org/b"; "a.org/b"
+			int colon_pos = Bry_find_.Find_fwd(src, Byte_ascii.Colon, pos, src_end);	// no colon found; EX: "//a.org/b"; "a.org/b"
 			if (colon_pos != Bry_.NotFound)											// colon found; EX: "http://" or "https://"
 				pos = colon_pos + Int_.Const_dlm_len;
 			if (pos < src_end && src[pos] == Byte_ascii.Slash) {					// skip slash after colon
@@ -55,7 +55,7 @@ public class Gfo_url_parser {
 					pos += 1;
 			}
 		}
-		int slash_pos = Bry_finder.Find_fwd(src, Byte_ascii.Slash, pos, src_end);
+		int slash_pos = Bry_find_.Find_fwd(src, Byte_ascii.Slash, pos, src_end);
 		if (slash_pos == Bry_.NotFound)												// no terminating slash; EX: http://a.org
 			slash_pos = src_end;
 		slash_pos = Bry_.Trim_end_pos(src, slash_pos);
@@ -79,7 +79,7 @@ public class Gfo_url_parser {
 		int pos = src_bgn;
 		Object protocol_obj = protocols.Match_bgn(src, src_bgn, src_end);
 		pos = protocols.Match_pos();
-		pos = Bry_finder.Find_fwd_while(src, pos, src_end, Byte_ascii.Slash);
+		pos = Bry_find_.Find_fwd_while(src, pos, src_end, Byte_ascii.Slash);
 		if (protocol_obj == null) {
 			this.protocol_tid = Gfo_protocol_itm.Tid_unknown;
 		}
@@ -130,7 +130,7 @@ public class Gfo_url_parser {
 			case Area__qarg_key_1st:
 			case Area__qarg_key_nth:
 				if (anch_nth_bgn == -1)
-					anch_nth_bgn = Bry_finder.Find_bwd(src, Byte_ascii.Hash, src_end);
+					anch_nth_bgn = Bry_find_.Find_bwd(src, Byte_ascii.Hash, src_end);
 				if (pos == anch_nth_bgn) {
 					End_area(pos, b);
 					area = Area__anch;

400_xowa/src/gplx/core/net/Http_request_parser.java

@@ -64,7 +64,7 @@ public class Http_request_parser {
 					server_wtr.Write_str_w_nl(String_.Format("http.request.parser; unknown line; line={0} request={1}", line_str, To_str()));
 					continue;
 				}
-				int val_bgn = Bry_finder.Find_fwd_while_ws(line, trie.Match_pos(), line_len);	// skip ws after key; EX: "Host: "
+				int val_bgn = Bry_find_.Find_fwd_while_ws(line, trie.Match_pos(), line_len);	// skip ws after key; EX: "Host: "
 				int tid = ((Int_obj_val)o).Val();
 				switch (tid) {
 					case Tid_get:
@@ -91,7 +91,7 @@ public class Http_request_parser {
 		}
 	}
 	private void Parse_type(int tid, int val_bgn, byte[] line, int line_len) {	// EX: "POST /xowa-cmd:exec_as_json HTTP/1.1"
-		int url_end = Bry_finder.Find_bwd(line, Byte_ascii.Space, line_len); if (url_end == Bry_finder.Not_found) throw Err_.new_wo_type("invalid protocol", "line", line, "request", To_str());
+		int url_end = Bry_find_.Find_bwd(line, Byte_ascii.Space, line_len); if (url_end == Bry_find_.Not_found) throw Err_.new_wo_type("invalid protocol", "line", line, "request", To_str());
 		switch (tid) {
 			case Tid_get	: this.type = Http_request_itm.Type_get; break;
 			case Tid_post	: this.type = Http_request_itm.Type_post; break;
@@ -102,8 +102,8 @@ public class Http_request_parser {
 	}
 	private void Parse_content_type(int val_bgn, byte[] line, int line_len) {	// EX: Content-Type: multipart/form-data; boundary=---------------------------72432484930026
 		// handle wolfram and other clients; DATE:2015-08-03
-		int boundary_bgn = Bry_finder.Find_fwd(line, Tkn_boundary, val_bgn, line_len); if (boundary_bgn == Bry_finder.Not_found) return; // PURPOSE: ignore content-type for GET calls like by Mathematica server; DATE:2015-08-04 // throw Err_.new_wo_type("invalid content_type", "line", line, "request", To_str());
-		int content_type_end = Bry_finder.Find_bwd(line, Byte_ascii.Semic, boundary_bgn);
+		int boundary_bgn = Bry_find_.Find_fwd(line, Tkn_boundary, val_bgn, line_len); if (boundary_bgn == Bry_find_.Not_found) return; // PURPOSE: ignore content-type for GET calls like by Mathematica server; DATE:2015-08-04 // throw Err_.new_wo_type("invalid content_type", "line", line, "request", To_str());
+		int content_type_end = Bry_find_.Find_bwd(line, Byte_ascii.Semic, boundary_bgn);
 		this.content_type = Bry_.Mid(line, val_bgn, content_type_end);
 		this.content_type_boundary = Bry_.Add(Tkn_content_type_boundary_end, Bry_.Mid(line, boundary_bgn += Tkn_boundary.length, line_len));
 	}
@@ -142,7 +142,7 @@ public class Http_request_parser {
 		int tkn_len = tkn.length;
 		if (!Bry_.Match(src, src_pos, src_pos + tkn_len, tkn)) throw Err_.new_wo_type("http.request.parser; invalid form_data line", "tkn", tkn, "line", src, "request", To_str());
 		int rv = src_pos += tkn_len;
-		return Bry_finder.Find_fwd_while_ws(src, rv, src_len);
+		return Bry_find_.Find_fwd_while_ws(src, rv, src_len);
 	}
 	private String To_str() {return Make_request_itm().To_str(tmp_bfr, Bool_.N);}
 	private static final int Tid_get = 1, Tid_post = 2, Tid_host = 3, Tid_user_agent = 4, Tid_accept = 5, Tid_accept_language = 6, Tid_accept_encoding = 7, Tid_dnt = 8

400_xowa/src/gplx/core/primitives/Int_ary.java

@@ -46,6 +46,10 @@ public class Int_ary {
 		ary[len] = v;
 		++len;
 	}
+	public int Pop_or_fail() {
+		if (len == 0) throw Err_.new_("core.int_ary", "stack is empty");
+		return Pop_or(-1);
+	}
 	public int Pop_or(int or) {
 		if (len == 0) return or;
 		int rv = ary[len - 1];

400_xowa/src/gplx/core/primitives/Int_ary_bldr.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.ints; import gplx.*; import gplx.core.*;
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
 public class Int_ary_bldr {
 	public Int_ary_bldr(int len) {ary = new int[len];}
 	public Int_ary_bldr Set(int idx, int val) {ary[idx] = val; return this;}

400_xowa/src/gplx/core/primitives/Int_pool.java

@@ -0,0 +1,59 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
+public class Int_pool {
+	private final List_adp available_list = List_adp_.new_(); private int available_len;
+	private int uid_max = -1;
+	public void Clear() {
+		available_list.Clear();
+		available_len = 0;
+		uid_max = -1;
+	}
+	public int Get_next() {
+		synchronized (available_list) {
+			if (available_len == 0)
+				return ++uid_max;
+			else {
+				Int_obj_val val = (Int_obj_val)List_adp_.Pop_last(available_list);
+				--available_len;
+				return val.Val();
+			}
+		}
+	}
+	public void Del(int v) {
+		if (v > uid_max) throw Err_.new_("core", "value is greater than range", "value", v, "max", uid_max);
+		synchronized (available_list) {
+			if (available_len == 0 && v == uid_max) {
+				--this.uid_max;
+				return;
+			}
+			if (available_len == uid_max) {
+				available_list.Sort();
+				for (int i = 0; i < available_len; ++i) {
+					Int_obj_val itm = (Int_obj_val)available_list.Get_at(i);
+					if (i != itm.Val()) throw Err_.new_("core", "available_list out of order", "contents", available_list.To_str());
+				}
+				this.Clear();
+			}
+			else {
+				available_list.Add(Int_obj_val.new_(v));
+				++available_len;
+			}
+		}
+	}
+}

400_xowa/src/gplx/core/primitives/Int_pool_tst.java

@@ -0,0 +1,67 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
+import org.junit.*;
+public class Int_pool_tst {
+	private final Int_pool_tstr tstr = new Int_pool_tstr();
+	@Before public void init() {tstr.Clear();}
+	@Test  public void Get__one() {
+		tstr.Test_get(0);
+	}
+	@Test  public void Get__many() {
+		tstr.Test_get(0);
+		tstr.Test_get(1);
+		tstr.Test_get(2);
+	}
+	@Test  public void Del__one() {
+		tstr.Test_get(0);
+		tstr.Exec_del(0);
+		tstr.Test_get(0);
+	}
+	@Test  public void Del__sequential() {
+		tstr.Test_get(0);
+		tstr.Test_get(1);
+		tstr.Test_get(2);
+		tstr.Exec_del(2).Test_get(2);
+		tstr.Exec_del(2);
+		tstr.Exec_del(1);
+		tstr.Exec_del(0).Test_get(0);
+	}
+	@Test  public void Del__out_of_order() {
+		tstr.Test_get(0);
+		tstr.Test_get(1);
+		tstr.Test_get(2);
+		tstr.Exec_del(0).Test_get(0);
+		tstr.Exec_del(0);
+		tstr.Exec_del(1);
+		tstr.Exec_del(2);
+		tstr.Test_get(0);
+	}
+}
+class Int_pool_tstr {
+	private final Int_pool pool = new Int_pool();
+	public void Clear() {pool.Clear();}
+	public Int_pool_tstr Test_get(int expd) {
+		Tfds.Eq(expd, pool.Get_next());
+		return this;
+	}
+	public Int_pool_tstr Exec_del(int val) {
+		pool.Del(val);
+		return this;
+	}
+}

400_xowa/src/gplx/core/primitives/Number_parser.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
 public class Number_parser {
 	public int				Rv_as_int() {return (int)int_val;} private long int_val = 0;
 	public Decimal_adp		Rv_as_dec() {return dec_val == null ? Decimal_adp_.long_(int_val) : dec_val;} private Decimal_adp dec_val = null;

400_xowa/src/gplx/core/primitives/Number_parser_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
 import org.junit.*;
 public class Number_parser_tst {
 	private final Number_parser_fxt fxt = new Number_parser_fxt();

400_xowa/src/gplx/core/primitives/Obj_ary_parser_base.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
 public abstract class Obj_ary_parser_base {
 	int pos_len = 4; int[] pos;
 	protected abstract void Ary_len_(int v);

400_xowa/src/gplx/core/tests/Tst_chkr.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.core.tests; import gplx.*; import gplx.core.*;
 public interface Tst_chkr {
 	Class<?> TypeOf();
 	int Chk(Tst_mgr mgr, String path, Object actl);

400_xowa/src/gplx/core/tests/Tst_mgr.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.core.tests; import gplx.*; import gplx.core.*;
 import gplx.core.strings.*;
 public class Tst_mgr {
 	public Tst_mgr ThrowError_n_() {throwError = false; return this;} private boolean throwError = true;

400_xowa/src/gplx/fsdb/data/Fsd_fil_tbl.java

@@ -88,7 +88,7 @@ public class Fsd_fil_tbl implements RlsAble {
 		}
 		finally {rdr.Rls();}
 	}
-	public void Select_all(Bry_bfr key_bfr, gplx.cache.Gfo_cache_mgr_bry cache) {
+	public void Select_all(Bry_bfr key_bfr, gplx.core.caches.Gfo_cache_mgr_bry cache) {
 		Db_rdr rdr = conn.Stmt_select(tbl_name, flds, Db_meta_fld.Ary_empty).Exec_select__rls_auto();
 		try {
 			while (rdr.Move_next()) {

400_xowa/src/gplx/fsdb/meta/Fsm_atr_fil.java

@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.fsdb.meta; import gplx.*; import gplx.fsdb.*;
-import gplx.core.primitives.*; import gplx.cache.*; import gplx.ios.*;
+import gplx.core.primitives.*; import gplx.core.caches.*; import gplx.ios.*;
 import gplx.dbs.*; import gplx.dbs.engines.sqlite.*; import gplx.fsdb.data.*;
 public class Fsm_atr_fil {
 	private final Fsm_mnt_itm mnt_itm; private final int mnt_id;

400_xowa/src/gplx/gfui/Gfui_bnd_parser.java

@@ -102,7 +102,7 @@ public class Gfui_bnd_parser {
 		if (is_numeric) {	// EX: "key.#10" or "#10"
 			int tkn_bgn = itm_bgn;
 			if (src_is_gfui) {	// remove "key." in "key.#10"
-				tkn_bgn = Bry_finder.Move_fwd(src, Byte_ascii.Dot, itm_bgn, itm_end);
+				tkn_bgn = Bry_find_.Move_fwd(src, Byte_ascii.Dot, itm_bgn, itm_end);
 				if (tkn_bgn == -1) throw Err_.new_wo_type("invalid keycode.dot", "keycode", Bry_.Mid(src, tkn_bgn, itm_end));
 				++tkn_bgn;		// skip #
 			}

400_xowa/src/gplx/ios/Io_buffer_rdr.java

@@ -60,7 +60,7 @@ public class Io_buffer_rdr implements RlsAble {
 		if (rdr != null) rdr.Rls();
 	}
 	@gplx.Internal protected void Dump_to_file(int bgn, int len, String url_str, String msg) {	// DBG:
-		String text = String_.new_u8_by_len(bfr, bgn, len);
+		String text = String_.new_u8__by_len(bfr, bgn, len);
 		Io_mgr.I.AppendFilStr(Io_url_.new_any_(url_str), msg + text + "\n");
 	}
 	public static Io_buffer_rdr new_(Io_stream_rdr rdr, int bfr_len) {

400_xowa/src/gplx/ios/Io_fil_chkr.java

@@ -16,6 +16,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.ios; import gplx.*;
+import gplx.core.tests.*;
 public class Io_fil_chkr implements Tst_chkr {
 	public Io_fil_chkr(Io_url url, String data) {this.expd_url = url; this.expd_data = data;}
 	public Io_url Expd_url() {return expd_url;} public Io_fil_chkr Expd_url_(Io_url v) {expd_url = v; return this;} Io_url expd_url;

400_xowa/src/gplx/ios/Io_line_rdr.java

@@ -42,7 +42,7 @@ public class Io_line_rdr {
 	public Io_line_rdr_key_gen Key_gen() {return key_gen;} public Io_line_rdr Key_gen_(Io_line_rdr_key_gen v) {key_gen = v; return this;} Io_line_rdr_key_gen key_gen = Io_line_rdr_key_gen_.first_pipe;
 	public void Truncate(int pos) {
 		this.Read_next();
-		int end = Bry_finder.Find_fwd(bfr, Byte_ascii.Null); if (end == -1) end = bfr.length;
+		int end = Bry_find_.Find_fwd(bfr, Byte_ascii.Null); if (end == -1) end = bfr.length;
 		bfr = Bry_.Mid(bfr, pos, end);
 		bfr_len = bfr.length;
 		bfr_last_read = 0;
@@ -139,7 +139,7 @@ public class Io_line_rdr {
 		if (file_skip_line0) {
 			byte[] stream_bry = Io_mgr.I.LoadFilBry(url);
 			int stream_bry_len = stream_bry.length;
-			int nl_pos = Bry_finder.Find_fwd(stream_bry, Byte_ascii.Nl, 0, stream_bry_len);
+			int nl_pos = Bry_find_.Find_fwd(stream_bry, Byte_ascii.Nl, 0, stream_bry_len);
 			if (nl_pos == Bry_.NotFound)
 				stream_bry = Bry_.Empty;
 			else

400_xowa/src/gplx/langs/dsvs/Dsv_fld_parser.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.srls.dsvs; import gplx.*; import gplx.srls.*;
+package gplx.langs.dsvs; import gplx.*; import gplx.langs.*;
 public interface Dsv_fld_parser {
 	void Init(byte fld_dlm, byte row_dlm);
 	int Parse(Dsv_tbl_parser tbl_parser, Dsv_wkr_base mgr, byte[] src, int pos, int src_len, int fld_idx, int fld_bgn);

400_xowa/src/gplx/langs/dsvs/Dsv_fld_parser_.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.srls.dsvs; import gplx.*; import gplx.srls.*;
+package gplx.langs.dsvs; import gplx.*; import gplx.langs.*;
 public class Dsv_fld_parser_ {
 	public static final Dsv_fld_parser Bry_parser = Dsv_fld_parser_bry._;
 	public static final Dsv_fld_parser Int_parser = Dsv_fld_parser_int._;
@@ -35,8 +35,8 @@ class Dsv_fld_parser_line implements Dsv_fld_parser {
 			boolean pos_is_last = pos == src_len;				
 			byte b = pos_is_last ? row_dlm : src[pos];
 			if		(b == comment_dlm) {
-				pos = Bry_finder.Find_fwd_until(src, pos, src_len, row_dlm);
-				if (pos == Bry_finder.Not_found)
+				pos = Bry_find_.Find_fwd_until(src, pos, src_len, row_dlm);
+				if (pos == Bry_find_.Not_found)
 					pos = src_len;
 			}
 			else if (b == row_dlm) {

400_xowa/src/gplx/langs/dsvs/Dsv_tbl_parser.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.srls.dsvs; import gplx.*; import gplx.srls.*;
+package gplx.langs.dsvs; import gplx.*; import gplx.langs.*;
 public class Dsv_tbl_parser implements GfoInvkAble, RlsAble {
 	private Dsv_wkr_base mgr;
 	private Dsv_fld_parser[] fld_parsers = new Dsv_fld_parser[2];

400_xowa/src/gplx/langs/dsvs/Dsv_tbl_parser_int_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.srls.dsvs; import gplx.*; import gplx.srls.*;
+package gplx.langs.dsvs; import gplx.*; import gplx.langs.*;
 import org.junit.*;
 public class Dsv_tbl_parser_int_tst {		
 	private Dsv_mok_fxt fxt = new Dsv_mok_fxt();

400_xowa/src/gplx/langs/dsvs/Dsv_tbl_parser_str_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.srls.dsvs; import gplx.*; import gplx.srls.*;
+package gplx.langs.dsvs; import gplx.*; import gplx.langs.*;
 import org.junit.*;
 public class Dsv_tbl_parser_str_tst {
 	private Dsv_mok_fxt fxt = new Dsv_mok_fxt();

400_xowa/src/gplx/langs/dsvs/Dsv_wkr_base.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.srls.dsvs; import gplx.*; import gplx.srls.*;
+package gplx.langs.dsvs; import gplx.*; import gplx.langs.*;
 public abstract class Dsv_wkr_base implements GfoInvkAble {
 	public abstract Dsv_fld_parser[] Fld_parsers();
 	public byte[] Src() {return src;} private byte[] src;

400_xowa/src/gplx/langs/gfss/Gfs_lxr.java

@@ -15,13 +15,13 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.gfs; import gplx.*;
+package gplx.langs.gfss; import gplx.*; import gplx.langs.*;
 interface Gfs_lxr {
-	byte Lxr_tid();
+	int Lxr_tid();
 	int Process(Gfs_parser_ctx ctx, int bgn, int end);
 }
 class Gfs_lxr_whitespace implements Gfs_lxr {
-	public byte Lxr_tid() {return Gfs_lxr_.Tid_whitespace;}
+	public int Lxr_tid() {return Gfs_lxr_.Tid_whitespace;}
 	public int Process(Gfs_parser_ctx ctx, int bgn, int end) {
 		byte[] src = ctx.Src(); int src_len = ctx.Src_len();
 		int rv = Gfs_lxr_.Rv_eos, cur_pos;
@@ -52,10 +52,10 @@ class Gfs_lxr_comment_flat implements Gfs_lxr {
 		this.bgn_bry = bgn_bry; this.bgn_bry_len = bgn_bry.length;
 		this.end_bry = end_bry; this.end_bry_len = end_bry.length;
 	} 	byte[] bgn_bry, end_bry; int bgn_bry_len, end_bry_len;
-	public byte Lxr_tid() {return Gfs_lxr_.Tid_comment;}
+	public int Lxr_tid() {return Gfs_lxr_.Tid_comment;}
 	public int Process(Gfs_parser_ctx ctx, int lxr_bgn, int lxr_end) {
 		byte[] src = ctx.Src(); int src_len = ctx.Src_len();
-		int end_pos = Bry_finder.Find_fwd(src, end_bry, lxr_end, src_len);
+		int end_pos = Bry_find_.Find_fwd(src, end_bry, lxr_end, src_len);
 		// if (end_pos == Bry_.NotFound) throw Err_.new_fmt_("comment is not closed: {0}", String_.new_u8(end_bry));	
 		return (end_pos == Bry_.NotFound) 
 			? src_len						// allow eos to terminate flat comment; needed for "tidy-always-adds-nl-in-textarea" fix; NOTE: DATE:2014-06-21
@@ -63,7 +63,7 @@ class Gfs_lxr_comment_flat implements Gfs_lxr {
 	}
 }
 class Gfs_lxr_identifier implements Gfs_lxr {
-	public byte Lxr_tid() {return Gfs_lxr_.Tid_identifier;}
+	public int Lxr_tid() {return Gfs_lxr_.Tid_identifier;}
 	public int Process(Gfs_parser_ctx ctx, int bgn, int end) {
 		byte[] src = ctx.Src(); int src_len = ctx.Src_len();
 		int pos, rv = Gfs_lxr_.Rv_eos;
@@ -92,7 +92,7 @@ class Gfs_lxr_identifier implements Gfs_lxr {
 	public static final Gfs_lxr_identifier _ = new Gfs_lxr_identifier(); Gfs_lxr_identifier() {}
 }
 class Gfs_lxr_semic implements Gfs_lxr {
-	public byte Lxr_tid() {return Gfs_lxr_.Tid_semic;}
+	public int Lxr_tid() {return Gfs_lxr_.Tid_semic;}
 	public int Process(Gfs_parser_ctx ctx, int bgn, int end) {
 		switch (ctx.Prv_lxr()) {
 			case Gfs_lxr_.Tid_identifier:	ctx.Make_nde(bgn, end); ctx.Cur_nde_from_stack(); break;		// a;
@@ -106,7 +106,7 @@ class Gfs_lxr_semic implements Gfs_lxr {
 	public static final Gfs_lxr_semic _ = new Gfs_lxr_semic(); Gfs_lxr_semic() {}
 }
 class Gfs_lxr_dot implements Gfs_lxr {
-	public byte Lxr_tid() {return Gfs_lxr_.Tid_dot;}
+	public int Lxr_tid() {return Gfs_lxr_.Tid_dot;}
 	public int Process(Gfs_parser_ctx ctx, int bgn, int end) {
 		switch (ctx.Prv_lxr()) {
 			case Gfs_lxr_.Tid_identifier:	ctx.Make_nde(bgn, end); break;		// a.
@@ -118,7 +118,7 @@ class Gfs_lxr_dot implements Gfs_lxr {
 	public static final Gfs_lxr_dot _ = new Gfs_lxr_dot(); Gfs_lxr_dot() {}
 }
 class Gfs_lxr_paren_bgn implements Gfs_lxr {
-	public byte Lxr_tid() {return Gfs_lxr_.Tid_paren_bgn;}
+	public int Lxr_tid() {return Gfs_lxr_.Tid_paren_bgn;}
 	public int Process(Gfs_parser_ctx ctx, int bgn, int end) {
 		switch (ctx.Prv_lxr()) {
 			case Gfs_lxr_.Tid_identifier:	ctx.Make_nde(bgn, end); break;						// a(;
@@ -129,7 +129,7 @@ class Gfs_lxr_paren_bgn implements Gfs_lxr {
 	public static final Gfs_lxr_paren_bgn _ = new Gfs_lxr_paren_bgn(); Gfs_lxr_paren_bgn() {}
 }
 class Gfs_lxr_paren_end implements Gfs_lxr {
-	public byte Lxr_tid() {return Gfs_lxr_.Tid_paren_end;}
+	public int Lxr_tid() {return Gfs_lxr_.Tid_paren_end;}
 	public int Process(Gfs_parser_ctx ctx, int bgn, int end) {
 		switch (ctx.Prv_lxr()) {
 			case Gfs_lxr_.Tid_paren_bgn:
@@ -146,10 +146,10 @@ class Gfs_lxr_quote implements Gfs_lxr {
 		this.bgn_bry_len = bgn_bry.length;
 		this.end_bry = end_bry; this.end_bry_len = end_bry.length;
 	}	private byte[] end_bry; private int bgn_bry_len, end_bry_len;
-	public byte Lxr_tid() {return Gfs_lxr_.Tid_quote;}
+	public int Lxr_tid() {return Gfs_lxr_.Tid_quote;}
 	public int Process(Gfs_parser_ctx ctx, int lxr_bgn, int lxr_end) {
 		byte[] src = ctx.Src(); int src_len = ctx.Src_len();
-		int end_pos = Bry_finder.Find_fwd(src, end_bry, lxr_end, src_len);
+		int end_pos = Bry_find_.Find_fwd(src, end_bry, lxr_end, src_len);
 		if (end_pos == Bry_.NotFound) throw Err_.new_wo_type("quote is not closed", "end", String_.new_u8(end_bry));
 		Bry_bfr bfr = ctx.Tmp_bfr().Clear();
 		int prv_pos = lxr_end;
@@ -159,7 +159,7 @@ class Gfs_lxr_quote implements Gfs_lxr {
 				bfr.Add_mid(src, prv_pos, end_pos);		// add everything up to end_bry
 				bfr.Add(end_bry);						// add end_bry
 				prv_pos = nxt_pos + end_bry_len;		// set prv_pos to after doubled end_bry
-				end_pos = Bry_finder.Find_fwd(src, end_bry, prv_pos, src_len);
+				end_pos = Bry_find_.Find_fwd(src, end_bry, prv_pos, src_len);
 				if (end_pos == Bry_.NotFound) throw Err_.new_wo_type("quote is not closed", "end", String_.new_u8(end_bry));
 				nxt_pos = end_pos + end_bry_len;
 				if (!Bry_.Match(src, nxt_pos, nxt_pos + end_bry_len, end_bry)) {
@@ -175,7 +175,7 @@ class Gfs_lxr_quote implements Gfs_lxr {
 	}
 }
 class Gfs_lxr_curly_bgn implements Gfs_lxr {
-	public byte Lxr_tid() {return Gfs_lxr_.Tid_curly_bgn;}
+	public int Lxr_tid() {return Gfs_lxr_.Tid_curly_bgn;}
 	public int Process(Gfs_parser_ctx ctx, int bgn, int end) {
 		switch (ctx.Prv_lxr()) {
 			case Gfs_lxr_.Tid_identifier:		ctx.Make_nde(bgn, end); ctx.Stack_add(); break;		// a{;
@@ -187,7 +187,7 @@ class Gfs_lxr_curly_bgn implements Gfs_lxr {
 	public static final Gfs_lxr_curly_bgn _ = new Gfs_lxr_curly_bgn(); Gfs_lxr_curly_bgn() {}
 }
 class Gfs_lxr_curly_end implements Gfs_lxr {
-	public byte Lxr_tid() {return Gfs_lxr_.Tid_curly_end;}
+	public int Lxr_tid() {return Gfs_lxr_.Tid_curly_end;}
 	public int Process(Gfs_parser_ctx ctx, int bgn, int end) {
 		ctx.Stack_pop(bgn);
 		return end;
@@ -195,7 +195,7 @@ class Gfs_lxr_curly_end implements Gfs_lxr {
 	public static final Gfs_lxr_curly_end _ = new Gfs_lxr_curly_end(); Gfs_lxr_curly_end() {}
 }
 class Gfs_lxr_equal implements Gfs_lxr {
-	public byte Lxr_tid() {return Gfs_lxr_.Tid_eq;}
+	public int Lxr_tid() {return Gfs_lxr_.Tid_eq;}
 	public int Process(Gfs_parser_ctx ctx, int bgn, int end) {
 		ctx.Make_nde(bgn, end).Op_tid_(Gfs_nde.Op_tid_assign);
 		return end;
@@ -203,7 +203,7 @@ class Gfs_lxr_equal implements Gfs_lxr {
 	public static final Gfs_lxr_equal _ = new Gfs_lxr_equal(); Gfs_lxr_equal() {}
 }
 class Gfs_lxr_comma implements Gfs_lxr {
-	public byte Lxr_tid() {return Gfs_lxr_.Tid_comma;}
+	public int Lxr_tid() {return Gfs_lxr_.Tid_comma;}
 	public int Process(Gfs_parser_ctx ctx, int bgn, int end) {
 		switch (ctx.Prv_lxr()) {
 			case Gfs_lxr_.Tid_identifier:	ctx.Make_atr_by_idf(); break;			// 123,

400_xowa/src/gplx/langs/gfss/Gfs_lxr_.java

@@ -15,11 +15,11 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.gfs; import gplx.*;
+package gplx.langs.gfss; import gplx.*; import gplx.langs.*;
 class Gfs_lxr_ {
 	public static final int Rv_init = -1, Rv_null = -2, Rv_eos = -3, Rv_lxr = -4;
-	public static final byte Tid_identifier = 1, Tid_dot = 2, Tid_semic = 3, Tid_paren_bgn = 4, Tid_paren_end = 5, Tid_curly_bgn = 6, Tid_curly_end = 7, Tid_quote = 8, Tid_comma = 9, Tid_whitespace = 10, Tid_comment = 11, Tid_eq = 12;
-	public static String Tid__name(byte tid) {
+	public static final int Tid_identifier = 1, Tid_dot = 2, Tid_semic = 3, Tid_paren_bgn = 4, Tid_paren_end = 5, Tid_curly_bgn = 6, Tid_curly_end = 7, Tid_quote = 8, Tid_comma = 9, Tid_whitespace = 10, Tid_comment = 11, Tid_eq = 12;
+	public static String Tid__name(int tid) {
 		switch (tid) {
 			case Tid_identifier:		return "identifier";
 			case Tid_dot:				return "dot";

400_xowa/src/gplx/langs/gfss/Gfs_msg_bldr.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.gfs; import gplx.*;
+package gplx.langs.gfss; import gplx.*; import gplx.langs.*;
 public class Gfs_msg_bldr implements GfoMsgParser {
 	Gfs_parser parser = new Gfs_parser();
 	public GfoMsg ParseToMsg(String s) {return Bld(s);}

400_xowa/src/gplx/langs/gfss/Gfs_msg_bldr_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.gfs; import gplx.*;
+package gplx.langs.gfss; import gplx.*; import gplx.langs.*;
 import org.junit.*; import gplx.core.strings.*;
 public class Gfs_msg_bldr_tst {
 	@Before public void init() {fxt.Clear();} Gfs_msg_bldr_fxt fxt = new Gfs_msg_bldr_fxt();

400_xowa/src/gplx/langs/gfss/Gfs_nde.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.gfs; import gplx.*;
+package gplx.langs.gfss; import gplx.*; import gplx.langs.*;
 public class Gfs_nde {
 	public byte[] Name_bry(byte[] src) {return name == null ? Bry_.Mid(src, name_bgn, name_end) : name;}
 	public byte[] Name() {return name;} public Gfs_nde Name_(byte[] v) {name = v; return this;} private byte[] name;

400_xowa/src/gplx/langs/gfss/Gfs_parser.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.gfs; import gplx.*;
+package gplx.langs.gfss; import gplx.*; import gplx.langs.*;
 import gplx.core.btries.*;
 public class Gfs_parser {
 	Btrie_fast_mgr trie = Gfs_parser_.trie_();

400_xowa/src/gplx/langs/gfss/Gfs_parser_ctx.java

@@ -15,14 +15,14 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.gfs; import gplx.*;
+package gplx.langs.gfss; import gplx.*; import gplx.langs.*;
 import gplx.core.btries.*;
 class Gfs_parser_ctx {
 	public Btrie_fast_mgr Trie() {return trie;} Btrie_fast_mgr trie;
 	public Gfs_nde Root() {return root;} Gfs_nde root = new Gfs_nde();
 	public byte[] Src() {return src;} private byte[] src;
 	public int Src_len() {return src_len;} private int src_len;
-	public byte Prv_lxr() {return prv_lxr;} public Gfs_parser_ctx Prv_lxr_(byte v) {prv_lxr = v; return this;} private byte prv_lxr;
+	public int Prv_lxr() {return prv_lxr;} public Gfs_parser_ctx Prv_lxr_(int v) {prv_lxr = v; return this;} private int prv_lxr;
 	public Gfs_nde Cur_nde() {return cur_nde;} Gfs_nde cur_nde;
 	public int Nxt_pos() {return nxt_pos;} private int nxt_pos;
 	public Gfs_lxr Nxt_lxr() {return nxt_lxr;} Gfs_lxr nxt_lxr;
@@ -68,8 +68,8 @@ class Gfs_err_mgr {
 	public void Fail_eos(Gfs_parser_ctx ctx) {Fail(ctx, Fail_msg_eos, ctx.Src_len());}
 	public void Fail_unknown_char(Gfs_parser_ctx ctx, int pos, byte c) {Fail(ctx, Fail_msg_unknown_char, pos, KeyVal_.new_("char", Char_.To_str((char)c)));}
 	public void Fail_nde_stack_empty(Gfs_parser_ctx ctx, int pos) {Fail(ctx, Fail_msg_nde_stack_empty, pos);}
-	public void Fail_invalid_lxr(Gfs_parser_ctx ctx, int pos, byte cur_lxr, byte c) {
-		Fail(ctx, Fail_msg_invalid_lxr, pos, KeyVal_.new_("char", Char_.To_str((char)c)), KeyVal_.new_("cur_lxr", Gfs_lxr_.Tid__name(cur_lxr)), KeyVal_.new_("prv_lxr", Gfs_lxr_.Tid__name(ctx.Prv_lxr())));
+	public void Fail_invalid_lxr(Gfs_parser_ctx ctx, int pos, int lxr_tid, byte c) {
+		Fail(ctx, Fail_msg_invalid_lxr, pos, KeyVal_.new_("char", Char_.To_str((char)c)), KeyVal_.new_("cur_lxr", Gfs_lxr_.Tid__name(lxr_tid)), KeyVal_.new_("prv_lxr", Gfs_lxr_.Tid__name(ctx.Prv_lxr())));
 	}
 	private void Fail(Gfs_parser_ctx ctx, String msg, int pos, KeyVal... args) {
 		byte[] src = ctx.Src(); int src_len = ctx.Src_len(); 

400_xowa/src/gplx/langs/gfss/Gfs_parser_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.gfs; import gplx.*;
+package gplx.langs.gfss; import gplx.*; import gplx.langs.*;
 import org.junit.*;
 public class Gfs_parser_tst {		
 	@Before public void init() {fxt.Clear();} Gfs_parser_fxt fxt = new Gfs_parser_fxt();

400_xowa/src/gplx/langs/gfss/Gfs_wtr.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.gfs; import gplx.*;
+package gplx.langs.gfss; import gplx.*; import gplx.langs.*;
 public class Gfs_wtr {		
 	public byte Quote_char() {return quote_char;} public Gfs_wtr Quote_char_(byte v) {quote_char = v; return this;} private byte quote_char = Byte_ascii.Apos;
 	public Bry_bfr Bfr() {return bfr;} private Bry_bfr bfr = Bry_bfr.reset_(255);

400_xowa/src/gplx/langs/htmls/Html_atr_.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.html; import gplx.*;
+package gplx.langs.htmls; import gplx.*; import gplx.langs.*;
 public class Html_atr_ {
 	public static final String
 	  Src_str = "src"

400_xowa/src/gplx/langs/htmls/Html_entity_.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.html; import gplx.*;
+package gplx.langs.htmls; import gplx.*; import gplx.langs.*;
 public class Html_entity_ {
 	public static final String 
 	  Nl_str = "&#10;"

400_xowa/src/gplx/langs/htmls/Html_nde.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.html; import gplx.*;
+package gplx.langs.htmls; import gplx.*; import gplx.langs.*;
 public class Html_nde {
 	public Html_nde(byte[] src, boolean tag_tid_is_inline, int tag_lhs_bgn, int tag_lhs_end, int tag_rhs_bgn, int tag_rhs_end, int name_bgn, int name_end, int[] cur_atrs, int atrs_idx) {
 		this.src = src;

400_xowa/src/gplx/langs/htmls/Html_parser.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.html; import gplx.*;
+package gplx.langs.htmls; import gplx.*; import gplx.langs.*;
 import gplx.core.brys.*;
 public class Html_parser {
 	public Html_parser() {

400_xowa/src/gplx/langs/htmls/Html_parser_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.html; import gplx.*;
+package gplx.langs.htmls; import gplx.*; import gplx.langs.*;
 import org.junit.*;
 public class Html_parser_tst {		
 	@Before public void init() {fxt.Clear();} private Xoh_parser_fxt fxt = new Xoh_parser_fxt();

400_xowa/src/gplx/langs/htmls/Html_selecter.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.html; import gplx.*;
+package gplx.langs.htmls; import gplx.*; import gplx.langs.*;
 public class Html_selecter {
 	public static Html_nde[] Select(byte[] src, Html_nde[] ary, Hash_adp_bry hash) {
 		List_adp list = List_adp_.new_();

400_xowa/src/gplx/langs/htmls/Html_tag_.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.html; import gplx.*;
+package gplx.langs.htmls; import gplx.*; import gplx.langs.*;
 public class Html_tag_ {
 	public static final byte[]
 	  Ul_name_bry		= Bry_.new_a7("ul")

400_xowa/src/gplx/langs/htmls/Html_utl.java

@@ -15,8 +15,8 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.html; import gplx.*;
-import gplx.core.primitives.*; import gplx.core.btries.*;
+package gplx.langs.htmls; import gplx.*; import gplx.langs.*;
+import gplx.core.primitives.*; import gplx.core.btries.*; import gplx.langs.htmls.encoders.*;
 public class Html_utl {
 	private static final Url_encoder encoder_id = Url_encoder.new_html_id_(); private static final Bry_bfr tmp_bfr = Bry_bfr.reset_(255);
 	public static String Encode_id_as_str(byte[] key) {return String_.new_u8(Encode_id_as_bry(key));}
@@ -162,13 +162,13 @@ public class Html_utl {
 	public static byte[] Del_comments(Bry_bfr bfr, byte[] src, int pos, int end) {
 		while (true) {
 			if (pos >= end) break;
-			int comm_bgn = Bry_finder.Find_fwd(src, Html_tag_.Comm_bgn, pos);											// look for <!--
-			if (comm_bgn == Bry_finder.Not_found) {																		// not found; consume rest
+			int comm_bgn = Bry_find_.Find_fwd(src, Html_tag_.Comm_bgn, pos);											// look for <!--
+			if (comm_bgn == Bry_find_.Not_found) {																		// not found; consume rest
 				bfr.Add_mid(src, pos, end);
 				break;
 			}
-			int comm_end = Bry_finder.Find_fwd(src, Html_tag_.Comm_end, comm_bgn + Html_tag_.Comm_bgn_len);			// look for -->
-			if (comm_end == Bry_finder.Not_found) {																		// not found; consume rest
+			int comm_end = Bry_find_.Find_fwd(src, Html_tag_.Comm_end, comm_bgn + Html_tag_.Comm_bgn_len);			// look for -->
+			if (comm_end == Bry_find_.Not_found) {																		// not found; consume rest
 				bfr.Add_mid(src, pos, end);
 				break;
 			}

400_xowa/src/gplx/langs/htmls/Html_utl_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.html; import gplx.*;
+package gplx.langs.htmls; import gplx.*; import gplx.langs.*;
 import org.junit.*;
 public class Html_utl_tst {		
 	@Before public void init() {fxt.Clear();} private Html_utl_fxt fxt = new Html_utl_fxt();

400_xowa/src/gplx/langs/htmls/Html_wtr.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.html; import gplx.*;
+package gplx.langs.htmls; import gplx.*; import gplx.langs.*;
 public class Html_wtr {
 	private Bry_bfr bfr = Bry_bfr.reset_(255);
 	private List_adp nde_stack = List_adp_.new_();

400_xowa/src/gplx/langs/htmls/encoders/Url_encoder.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.langs.htmls.encoders; import gplx.*; import gplx.langs.*; import gplx.langs.htmls.*;
 import gplx.core.btries.*;
 import gplx.xowa.parsers.amps.*;
 public class Url_encoder implements Url_encoder_interface {

400_xowa/src/gplx/langs/htmls/encoders/Url_encoder_mgr.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa.urls.encoders; import gplx.*; import gplx.xowa.*; import gplx.xowa.urls.*;
+package gplx.langs.htmls.encoders; import gplx.*; import gplx.langs.*; import gplx.langs.htmls.*;
 public class Url_encoder_mgr {
 	public Url_encoder	File()			{return file;}			private final Url_encoder file			= Url_encoder.new_file_();
 	public Url_encoder	Http_url()		{return http_url;}		private final Url_encoder http_url		= Url_encoder.new_http_url_();

400_xowa/src/gplx/langs/htmls/encoders/Url_encoder_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.langs.htmls.encoders; import gplx.*; import gplx.langs.*; import gplx.langs.htmls.*;
 import org.junit.*;
 public class Url_encoder_tst {
 	@Before public void init() {fxt = new Url_encoder_fxt();} Url_encoder_fxt fxt;

400_xowa/src/gplx/langs/htmls/parsers/Gfo_html_node.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.html.parsers; import gplx.*; import gplx.core.*; import gplx.core.html.*;
+package gplx.langs.htmls.parsers; import gplx.*; import gplx.langs.*; import gplx.langs.htmls.*;
 class Gfo_html_node {
 	public Gfo_html_node(byte[] src, int bgn, int end) {this.src = src; this.bgn = bgn; this.end = end;}
 	public byte[] Src() {return src;} private final byte[] src;

400_xowa/src/gplx/langs/htmls/parsers/Gfo_html_parser.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.html.parsers; import gplx.*; import gplx.core.*; import gplx.core.html.*;
+package gplx.langs.htmls.parsers; import gplx.*; import gplx.langs.*; import gplx.langs.htmls.*;
 import gplx.core.btries.*; import gplx.core.primitives.*;
 import gplx.xowa.*;
 import gplx.xowa.parsers.xndes.*;
@@ -28,9 +28,9 @@ class Gfo_html_parser {
 //			int css_find_bgn_len = Css_find_bgn.length;
 //			byte[] protocol_prefix_bry = Bry_.new_u8(protocol_prefix);
 //			while (true) {
-//				int url_bgn = Bry_finder.Find_fwd(src, Css_find_bgn, prv_pos);	 				if (url_bgn == Bry_.NotFound) break;	// nothing left; stop
+//				int url_bgn = Bry_find_.Find_fwd(src, Css_find_bgn, prv_pos);	 				if (url_bgn == Bry_.NotFound) break;	// nothing left; stop
 //				url_bgn += css_find_bgn_len;
-//				int url_end = Bry_finder.Find_fwd(src, Byte_ascii.Quote, url_bgn, src_len); 	if (url_end == Bry_.NotFound) {usr_dlg.Warn_many("", "main_page.css_parse", "could not find css; pos='~{0}' text='~{1}'", url_bgn, String_.new_u8_by_len(src, url_bgn, url_bgn + 32)); break;}
+//				int url_end = Bry_find_.Find_fwd(src, Byte_ascii.Quote, url_bgn, src_len); 	if (url_end == Bry_.NotFound) {usr_dlg.Warn_many("", "main_page.css_parse", "could not find css; pos='~{0}' text='~{1}'", url_bgn, String_.new_u8__by_len(src, url_bgn, url_bgn + 32)); break;}
 //				byte[] css_url_bry = Bry_.Mid(src, url_bgn, url_end);
 //				css_url_bry = Bry_.Replace(css_url_bry, Css_amp_find, Css_amp_repl);		// &amp; -> &
 //				css_url_bry = url_encoder.Decode(css_url_bry);								// %2C ->		%7C -> |
@@ -54,13 +54,13 @@ class Gfo_html_parser {
 	}
 	private int Parse_node(Gfo_html_wkr handler, byte[] src, int end, int tkn_bgn, int tkn_end) {
 		int name_bgn = tkn_end;
-		int name_end = Bry_finder.Find_fwd_until_ws(src, name_bgn, end);
-		if (name_end == Bry_finder.Not_found) return end;	// EOS; EX: "<abcEOS"
+		int name_end = Bry_find_.Find_fwd_until_ws(src, name_bgn, end);
+		if (name_end == Bry_find_.Not_found) return end;	// EOS; EX: "<abcEOS"
 		if (name_bgn == name_end) return tkn_end;			// ws; EX: "< "
 		Object o = handler.Get_or_null(src, name_bgn, name_end);
 		if (o == null) return name_end;						// unknown name: EX: "<unknown >"
-		int node_end = Bry_finder.Find_fwd(src, Byte_ascii.Angle_end, name_end, end);
-		if (node_end == Bry_finder.Not_found) return end;	// EOS; EX: "<name lots_of_text_but_no_gt EOS"
+		int node_end = Bry_find_.Find_fwd(src, Byte_ascii.Angle_end, name_end, end);
+		if (node_end == Bry_find_.Not_found) return end;	// EOS; EX: "<name lots_of_text_but_no_gt EOS"
 		Xop_xatr_itm[] xatr_ary = xatr_parser.Parse(msg_log, src, name_end, node_end);
 		Gfo_html_tkn tkn = (Gfo_html_tkn)o;
 		tkn.Process(src, Xop_xatr_hash.new_ary(src, xatr_ary));

400_xowa/src/gplx/langs/htmls/parsers/Gfo_html_wkr.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.html.parsers; import gplx.*; import gplx.core.*; import gplx.core.html.*;
+package gplx.langs.htmls.parsers; import gplx.*; import gplx.langs.*; import gplx.langs.htmls.*;
 interface Gfo_html_wkr {
 	Gfo_html_tkn Get_or_null(byte[] src, int bgn, int end);
 	void Process(Gfo_html_node node);

400_xowa/src/gplx/langs/htmls/parsers/Xob_html_tkn.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.html.parsers; import gplx.*; import gplx.core.*; import gplx.core.html.*;
+package gplx.langs.htmls.parsers; import gplx.*; import gplx.langs.*; import gplx.langs.htmls.*;
 import gplx.xowa.*;
 import gplx.xowa.parsers.xndes.*;
 interface Gfo_html_tkn {

400_xowa/src/gplx/langs/jsons/Json_ary.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 public class Json_ary extends Json_itm_base implements Json_grp {
 	public Json_ary(int src_bgn, int src_end) {this.Ctor(src_bgn, src_end);}
 	@Override public byte Tid() {return Json_itm_.Tid__ary;}

400_xowa/src/gplx/langs/jsons/Json_doc.java

@@ -15,7 +15,8 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
+import gplx.core.primitives.*;
 public class Json_doc {
 	private final byte[][] tmp_qry_bry = new byte[1][];
 	public void Ctor(byte[] src, Json_grp new_root) {

400_xowa/src/gplx/langs/jsons/Json_doc_bldr.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 public class Json_doc_bldr {
 	public Json_nde Nde(Json_doc jdoc) {return factory.Nde(jdoc, -1);}
 	public Json_nde Nde(Json_doc jdoc, Json_grp owner) {

400_xowa/src/gplx/langs/jsons/Json_doc_srl.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 public class Json_doc_srl {
 	private int indent = -1;
 	private Bry_bfr bfr = Bry_bfr.reset_(255);

400_xowa/src/gplx/langs/jsons/Json_doc_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 import org.junit.*;
 public class Json_doc_tst {
 	private final Json_qry_mgr_fxt fxt = new Json_qry_mgr_fxt();
@@ -40,7 +40,7 @@ class Json_qry_mgr_fxt {
 	private final Json_parser json_parser = new Json_parser();
 	public Json_doc Make_json(String... ary) {return json_parser.Parse_by_apos_ary(ary);}
 	public void Test_get_val_as_str(Json_doc doc, String qry, String expd){
-		byte[][] qry_bry = Bry_.Split(Bry_.new_u8(qry), Byte_ascii.Slash);
+		byte[][] qry_bry = Bry_split_.Split(Bry_.new_u8(qry), Byte_ascii.Slash);
 		Tfds.Eq(expd, doc.Get_val_as_str_or(qry_bry, null));
 	}
 }

400_xowa/src/gplx/langs/jsons/Json_doc_wtr.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 public class Json_doc_wtr {
 	private int indent = -2;
 	private Bry_bfr bfr = Bry_bfr.reset_(255);

400_xowa/src/gplx/langs/jsons/Json_factory.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 public class Json_factory {
 	public Json_itm		Null()												{return Json_itm_null.Null;}
 	public Json_itm		Bool_n()											{return Json_itm_bool.Bool_n;}

400_xowa/src/gplx/langs/jsons/Json_grp.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 public interface Json_grp extends Json_itm {
 	void Src_end_(int v);
 	int Len();

400_xowa/src/gplx/langs/jsons/Json_itm.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 public interface Json_itm {
 	byte		Tid();
 	int			Src_bgn();

400_xowa/src/gplx/langs/jsons/Json_itm_.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 public class Json_itm_ {
 	public static final Json_itm[] Ary_empty = new Json_itm[0];
 	public static final byte Tid__unknown = 0, Tid__null = 1, Tid__bool = 2, Tid__int = 3, Tid__decimal = 4, Tid__str = 5, Tid__kv = 6, Tid__ary = 7, Tid__nde = 8;

400_xowa/src/gplx/langs/jsons/Json_itm_base.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 public abstract class Json_itm_base implements Json_itm {
 	public abstract byte Tid();
 	public void Ctor(int src_bgn, int src_end) {this.src_bgn = src_bgn; this.src_end = src_end;}

400_xowa/src/gplx/langs/jsons/Json_itm_int.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 public class Json_itm_int extends Json_itm_base {
 	private final Json_doc doc;
 	private byte[] data_bry; private int data; private boolean data_is_null = true;

400_xowa/src/gplx/langs/jsons/Json_itm_str.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 class Json_itm_str extends Json_itm_base {
 	private final boolean exact; private final Json_doc doc;
 	private String data_str; private byte[] data_bry = null;
@@ -23,7 +23,7 @@ class Json_itm_str extends Json_itm_base {
 	@Override public byte Tid() {return Json_itm_.Tid__str;}
 	@Override public void Print_as_json(Bry_bfr bfr, int depth) {
 		bfr.Add_byte(Byte_ascii.Quote);
-		gplx.html.Html_utl.Escape_html_to_bfr(bfr, doc.Src(), this.Src_bgn(), this.Src_end(), true, true, true, true, false);	// false to apos for backwards compatibility
+		gplx.langs.htmls.Html_utl.Escape_html_to_bfr(bfr, doc.Src(), this.Src_bgn(), this.Src_end(), true, true, true, true, false);	// false to apos for backwards compatibility
 		bfr.Add_byte(Byte_ascii.Quote);
 	}
 	@Override public Object Data() {
@@ -36,7 +36,7 @@ class Json_itm_str extends Json_itm_base {
 	}
 	@Override public byte[] Data_bry() {if (data_bry == null) data_bry = Data_make_bry(); return data_bry;}
 	@Override public boolean Data_eq(byte[] comp) {
-		if (exact) return Bry_.Eq(comp, doc.Src(), this.Src_bgn(), this.Src_end());
+		if (exact) return Bry_.Eq(doc.Src(), this.Src_bgn(), this.Src_end(), comp);
 		if (data_bry == null) data_bry = Data_make_bry();
 		return Bry_.Match(data_bry, comp);
 	}
@@ -58,7 +58,7 @@ class Json_itm_str extends Json_itm_base {
 						case Byte_ascii.Ltr_f:				bfr.Add_byte(Byte_ascii.Formfeed); break;
 						case Byte_ascii.Ltr_u:
 							int utf8_val = gplx.texts.HexDecUtl.parse_or(src, i + 1, i + 5, -1);
-							int len = gplx.intl.Utf16_.Encode_int(utf8_val, utf8_bry, 0);
+							int len = gplx.core.intls.Utf16_.Encode_int(utf8_val, utf8_bry, 0);
 							bfr.Add_mid(utf8_bry, 0, len);
 							i += 4;
 							break;	// \uFFFF	4 hex-dec

400_xowa/src/gplx/langs/jsons/Json_itm_tmp.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 public class Json_itm_tmp implements Json_itm {	// TEST:
 	public Json_itm_tmp(byte tid, String data) {this.tid = tid; this.data = data;}
 	public byte Tid() {return tid;} private byte tid;

400_xowa/src/gplx/langs/jsons/Json_kv.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 public class Json_kv extends Json_itm_base {
 	public Json_kv(Json_itm key, Json_itm val) {this.key = key; this.val = val;}
 	@Override public byte Tid() {return Json_itm_.Tid__kv;}

400_xowa/src/gplx/langs/jsons/Json_kv_ary_srl.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 public class Json_kv_ary_srl {
 	public static KeyVal Kv_by_itm(Json_itm itm) {
 		switch (itm.Tid()) {

400_xowa/src/gplx/langs/jsons/Json_kv_ary_srl_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 import org.junit.*;
 public class Json_kv_ary_srl_tst {
 	@Before public void init() {fxt.Clear();} private Json_kv_ary_srl_fxt fxt = new Json_kv_ary_srl_fxt();

400_xowa/src/gplx/langs/jsons/Json_nde.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 public class Json_nde extends Json_itm_base implements Json_grp {		
 	private Json_itm[] subs = Json_itm_.Ary_empty; private int subs_len = 0, subs_max = 0;
 	public Json_nde(Json_doc jdoc, int src_bgn) {this.jdoc = jdoc; this.Ctor(src_bgn, -1);}

400_xowa/src/gplx/langs/jsons/Json_parser.java

@@ -15,7 +15,8 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
+import gplx.core.primitives.*;
 public class Json_parser {
 	private byte[] src; private int src_len, pos; private final Number_parser num_parser = new Number_parser();
 	public Json_factory Factory() {return factory;} private final Json_factory factory = new Json_factory();
@@ -90,7 +91,7 @@ public class Json_parser {
 	private Json_itm Make_literal(byte[] remainder, int remainder_len, Json_itm singleton) {
 		++pos;	// 1st char
 		int literal_end = pos + remainder_len;
-		if (Bry_.Eq(remainder, src, pos, literal_end)) {
+		if (Bry_.Eq(src, pos, literal_end, remainder)) {
 			pos = literal_end;
 			return singleton;
 		}
@@ -173,7 +174,7 @@ public class Json_parser {
 	}
 	private Err err_(byte[] src, int bgn, String fmt, Object... args) {return err_(src, bgn, src.length, fmt, args);}
 	private Err err_(byte[] src, int bgn, int src_len, String fmt, Object... args) {
-		String msg = String_.Format(fmt, args) + " " + Int_.Xto_str(bgn) + " " + String_.new_u8_by_len(src, bgn, 20);
+		String msg = String_.Format(fmt, args) + " " + Int_.Xto_str(bgn) + " " + String_.new_u8__by_len(src, bgn, 20);
 		return Err_.new_wo_type(msg);
 	}
 	private static final byte[] Bry_bool_rue = Bry_.new_a7("rue"), Bry_bool_alse = Bry_.new_a7("alse"), Bry_null_ull = Bry_.new_a7("ull");

400_xowa/src/gplx/langs/jsons/Json_parser__itm__base.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 import gplx.core.primitives.*;
 public abstract class Json_parser__itm__base {
 	protected String context;

400_xowa/src/gplx/langs/jsons/Json_parser__list_nde__base.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 import gplx.core.primitives.*;
 public class Json_parser__list_nde__base extends Json_parser__itm__base {
 	public void Parse_grp(String context, Json_grp grp) {

400_xowa/src/gplx/langs/jsons/Json_parser_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 import org.junit.*;
 public class Json_parser_tst {
 	private final Json_parser_fxt fxt = new Json_parser_fxt();

400_xowa/src/gplx/langs/jsons/Json_wtr.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 import gplx.core.primitives.*;
 public class Json_wtr {
 	private final Bry_bfr bfr = Bry_bfr.new_(255);

400_xowa/src/gplx/langs/jsons/Json_wtr_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
+package gplx.langs.jsons; import gplx.*; import gplx.langs.*;
 import org.junit.*;
 public class Json_wtr_tst {
 	@Before public void init() {fxt.Clear();} private final Json_wtr_fxt fxt = new Json_wtr_fxt();

400_xowa/src/gplx/langs/phps/Php_ctx.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.php; import gplx.*;
+package gplx.langs.phps; import gplx.*; import gplx.langs.*;
 public class Php_ctx {
 	public byte[] Src() {return src;} public Php_ctx Src_(byte[] v) {this.src = v; return this;} private byte[] src;
 }

400_xowa/src/gplx/langs/phps/Php_evaluator.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.php; import gplx.*;
+package gplx.langs.phps; import gplx.*; import gplx.langs.*;
 /*
 NOTE: naive implementation of PHP evaluator. intended only for parsing Messages**.php files in MediaWiki. Specifically, it assumes the following:
 - all lines are assignment lines: EX: $a = b;

400_xowa/src/gplx/langs/phps/Php_itm.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.php; import gplx.*;
+package gplx.langs.phps; import gplx.*; import gplx.langs.*;
 public interface Php_itm {
 	byte Itm_tid();
 	byte[] Val_obj_bry();

400_xowa/src/gplx/langs/phps/Php_itm_.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.php; import gplx.*;
+package gplx.langs.phps; import gplx.*; import gplx.langs.*;
 public class Php_itm_ {
 	public static final byte Tid_null = 0, Tid_bool_false = 1, Tid_bool_true = 2, Tid_int = 3, Tid_quote = 4, Tid_ary = 5, Tid_kv = 6, Tid_var = 7;
 	public static int Parse_int_or(Php_itm itm, int or) {